diff --git a/Gemfile b/Gemfile index 0927808..bf35748 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source "https://rubygems.org" gem "middleman" #, "~>3.3" -gem "awesome_print" gem "json" #, '~> 1.8' gem 'nokogiri' gem 'builder' diff --git a/Gemfile.lock b/Gemfile.lock index 6c1cfd9..4e0a695 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,29 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.9) + activesupport (4.1.10) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - addressable (2.3.6) - awesome_print (1.6.1) + addressable (2.3.7) builder (3.2.2) celluloid (0.16.0) timers (~> 4.0.0) - chunky_png (1.3.3) + chunky_png (1.3.4) coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.8.0) - compass (1.0.1) + coffee-script-source (1.9.1) + compass (1.0.3) chunky_png (~> 1.2) - compass-core (~> 1.0.1) + compass-core (~> 1.0.2) compass-import-once (~> 1.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) sass (>= 3.3.13, < 3.5) - compass-core (1.0.1) + compass-core (1.0.3) multi_json (~> 1.0) sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) @@ -34,11 +33,11 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.4) - execjs (2.2.2) + eventmachine (1.0.7) + execjs (2.4.0) favicon_maker (1.3) docile (~> 1.1) - ffi (1.9.6) + ffi (1.9.8) haml (4.0.6) tilt hike (1.2.3) @@ -46,21 +45,21 @@ GEM hooks (0.4.0) uber (~> 0.0.4) http_parser.rb (0.6.0) - i18n (0.6.11) - json (1.8.1) - kramdown (1.5.0) - listen (2.8.5) + i18n (0.7.0) + json (1.8.2) + kramdown (1.6.0) + listen (2.9.0) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.3.7) + middleman (3.3.10) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.7) + middleman-core (= 3.3.10) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) @@ -68,12 +67,12 @@ GEM addressable (~> 2.3.5) middleman-core (~> 3.2) tzinfo (>= 0.3.0) - middleman-core (3.3.7) + middleman-core (3.3.10) activesupport (~> 4.1.0) bundler (~> 1.1) erubis hooks (~> 0.3) - i18n (~> 0.6.9) + i18n (~> 0.7.0) listen (>= 2.7.9, < 3.0) padrino-helpers (~> 0.12.3) rack (>= 1.4.5, < 2.0) @@ -91,7 +90,7 @@ GEM em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-sprockets (3.4.1) + middleman-sprockets (3.4.2) middleman-core (>= 3.3) sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) @@ -100,31 +99,31 @@ GEM middleman-core (~> 3.2) rouge (~> 1.0) mini_portile (0.6.2) - minitest (5.5.0) - multi_json (1.10.1) + minitest (5.5.1) + multi_json (1.11.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.9.1) - nokogiri (1.6.5) + net-ssh (2.9.2) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - padrino-helpers (0.12.4) + padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.4) + padrino-support (= 0.12.5) tilt (~> 1.4.1) - padrino-support (0.12.4) + padrino-support (0.12.5) activesupport (>= 3.1) ptools (1.3.2) rack (1.6.0) rack-livereload (0.3.15) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.2.2) - rouge (1.7.7) - sass (3.4.9) + rouge (1.8.0) + sass (3.4.13) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -136,14 +135,14 @@ GEM sprockets (~> 2.0) tilt (~> 1.1) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) timers (4.0.1) hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.12) - uglifier (2.7.0) + uber (0.0.13) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -151,7 +150,6 @@ PLATFORMS ruby DEPENDENCIES - awesome_print builder json middleman diff --git a/source/blog/podcasts.html.haml b/source/blog/podcasts.html.haml index 4a11a94..5a7bea2 100644 --- a/source/blog/podcasts.html.haml +++ b/source/blog/podcasts.html.haml @@ -1,7 +1,7 @@ --- title: Podcasts date: 2014-09-20 -edited: 2015-01-08 +edited: 2015-03-20 tags: about poster: /assets/img/stock/coffee.png --- @@ -16,12 +16,12 @@ poster: /assets/img/stock/coffee.png %li= link_to 'Ruby Rogues', 'http://rubyrogues.com' %li= link_to 'Ruby 5', 'http://ruby5.envylabs.com' %li= link_to 'Giant Robots Smashing into Other Giant Robots', 'http://podcasts.thoughtbot.com/giantrobots' - -# %li= link_to 'JS Jabber', 'http://www.devchat.tv/js-jabber' + %li= link_to 'JS Jabber', 'http://www.devchat.tv/js-jabber' %li= link_to 'You Need A Budget', 'http://www.youneedabudget.com/blog/c/podcast/' - %li= link_to '.Net Rocks', 'http://www.dotnetrocks.com' %h4 Past Gems %ul + %li= link_to '.Net Rocks', 'http://www.dotnetrocks.com' %li= link_to 'Back to Work', 'http://5by5.tv/b2w' %li= link_to 'Ruby on Rails Podcast', 'http://5by5.tv/rubyonrails' %li= link_to 'The Poo-edcast', 'http://adamryanmorrison.com/podcast/' diff --git a/source/blog/uncle_bob.html.haml b/source/blog/uncle_bob.html.haml deleted file mode 100644 index 029a662..0000000 --- a/source/blog/uncle_bob.html.haml +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: uncle_bob -date: 2014-09-20 -tags: -poster: /assets/img/bg/brickwall_@2X.png -published: false ---- -.row - .col-sm-12 - - if is_blog_article? - %h2 Uncle Bob - diff --git a/source/contact.html.haml b/source/contact.html.haml index 4f3b414..46fc027 100644 --- a/source/contact.html.haml +++ b/source/contact.html.haml @@ -31,7 +31,7 @@ poster: /assets/img/stock/gulf_iss040e090540.jpg .col-sm-4.side-links %ul %li - = mail_to 'mmoser@fullsight.com' + = mail_to 'markamoser@gmail.com' %ul %li