diff --git a/Gemfile b/Gemfile index bf35748..d3f51f7 100644 --- a/Gemfile +++ b/Gemfile @@ -13,4 +13,4 @@ gem "redcarpet" gem "middleman-syntax" -gem 'middleman-deploy' +# gem 'middleman-deploy' diff --git a/Gemfile.lock b/Gemfile.lock index 4e0a695..71d2c88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,150 +1,127 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.10) - i18n (~> 0.6, >= 0.6.9) + activesupport (4.2.7.1) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.7) + addressable (2.4.0) + backports (3.6.8) builder (3.2.2) - celluloid (0.16.0) - timers (~> 4.0.0) - chunky_png (1.3.4) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - compass (1.0.3) - chunky_png (~> 1.2) - 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.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) + coffee-script-source (1.10.0) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) + concurrent-ruby (1.0.2) + contracts (0.13.0) docile (1.1.5) + dotenv (2.1.1) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.7) - execjs (2.4.0) - favicon_maker (1.3) + eventmachine (1.2.0.1) + execjs (2.7.0) + fast_blank (1.0.0) + fastimage (2.0.0) + addressable (~> 2) + favicon_maker (1.3.1) docile (~> 1.1) - ffi (1.9.8) - haml (4.0.6) + ffi (1.9.14) + haml (4.0.7) tilt - hike (1.2.3) - hitimes (1.2.2) - hooks (0.4.0) - uber (~> 0.0.4) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.4.4) http_parser.rb (0.6.0) 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.10) + json (1.8.3) + kramdown (1.12.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.15.0) + middleman (4.1.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.10) - middleman-sprockets (>= 3.1.2) + middleman-cli (= 4.1.10) + middleman-core (= 4.1.10) sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-blog (3.5.3) - addressable (~> 2.3.5) - middleman-core (~> 3.2) + middleman-blog (4.0.1) + addressable (~> 2.3) + middleman-core (>= 4.0.0) tzinfo (>= 0.3.0) - middleman-core (3.3.10) - activesupport (~> 4.1.0) + middleman-cli (4.1.10) + thor (>= 0.17.0, < 2.0) + middleman-core (4.1.10) + activesupport (~> 4.2) + addressable (~> 2.3) + backports (~> 3.6) bundler (~> 1.1) + contracts (~> 0.13.0) + dotenv erubis - hooks (~> 0.3) + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) i18n (~> 0.7.0) - listen (>= 2.7.9, < 3.0) - padrino-helpers (~> 0.12.3) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.13.0) + parallel rack (>= 1.4.5, < 2.0) - rack-test (~> 0.6.2) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) - middleman-deploy (1.0.0) - middleman-core (>= 3.2) - net-sftp - ptools - middleman-favicon-maker (3.7) - favicon_maker (~> 1.3) - middleman-core (>= 3.0.0) - middleman-livereload (3.4.2) + sass (>= 3.4) + servolux + tilt (~> 1.4.1) + uglifier (~> 3.0) + middleman-favicon-maker (4.0.4) + favicon_maker (~> 1.3, >= 1.3.1) + middleman-core (~> 4.0) + middleman-livereload (3.4.6) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-sprockets (3.4.2) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) - middleman-syntax (2.0.0) - middleman-core (~> 3.2) - rouge (~> 1.0) - mini_portile (0.6.2) - minitest (5.5.1) - multi_json (1.11.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (2.9.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - padrino-helpers (0.12.5) + middleman-syntax (3.0.0) + middleman-core (>= 3.2) + rouge (~> 2.0) + mini_portile2 (2.1.0) + minitest (5.9.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + padrino-helpers (0.13.3.2) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.5) - tilt (~> 1.4.1) - padrino-support (0.12.5) + padrino-support (= 0.13.3.2) + tilt (>= 1.4.1, < 3) + padrino-support (0.13.3.2) activesupport (>= 3.1) - ptools (1.3.2) - rack (1.6.0) - rack-livereload (0.3.15) + parallel (1.9.0) + pkg-config (1.1.7) + rack (1.6.4) + rack-livereload (0.3.16) rack - rack-test (0.6.3) - rack (>= 1.0) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) - redcarpet (3.2.2) - rouge (1.8.0) - sass (3.4.13) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) + redcarpet (3.3.4) + rouge (2.0.6) + sass (3.4.22) + servolux (0.12.0) thor (0.19.1) 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.13) - uglifier (2.7.1) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) PLATFORMS ruby @@ -154,9 +131,11 @@ DEPENDENCIES json middleman middleman-blog - middleman-deploy middleman-favicon-maker middleman-livereload middleman-syntax nokogiri redcarpet + +BUNDLED WITH + 1.12.3 diff --git a/config.rb b/config.rb index 2d763bf..efde8ee 100644 --- a/config.rb +++ b/config.rb @@ -74,13 +74,13 @@ configure :build do # set :http_path, "/Content/images/" end -activate :deploy do |deploy| - deploy.method = :rsync - deploy.host = 'fullsight.com' - deploy.path = 'vhost/markamoser' - deploy.user = 'mmoser' - deploy.port = 6791 - deploy.clean = true # remove orphaned files on remote host, default: false - # deploy.flags = '-rltgoDvzO --no-p --del' # add custom flags, default: -avz - deploy.build_before = true -end +# activate :deploy do |deploy| +# deploy.method = :rsync +# deploy.host = 'fullsight.com' +# deploy.path = 'vhost/markamoser' +# deploy.user = 'mmoser' +# deploy.port = 6791 +# deploy.clean = true # remove orphaned files on remote host, default: false +# # deploy.flags = '-rltgoDvzO --no-p --del' # add custom flags, default: -avz +# deploy.build_before = true +# end diff --git a/data/video.yml b/data/video.yml index 904152b..bfba2ec 100644 --- a/data/video.yml +++ b/data/video.yml @@ -9,7 +9,7 @@ index: autoplay: false preload: "auto" note: "A short sampling of my after effects work. I do love to edit. (download)" - vimeo: "" + vimeo: "" las_invent: file: "LAS_InventYourFuture_720x404.mp4"