diff --git a/Gemfile b/Gemfile index 4ed680a..e38ba93 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,8 @@ source "http://rubygems.org" gem "compass" -gem "middleman", "< 4.0" -gem "middleman-livereload" -gem "middleman-compass" +gem "middleman", "~>3" +gem "middleman-livereload", "~>3" gem "rb-inotify", require: false gem "rb-fsevent", require: false gem "oily_png" diff --git a/Gemfile.lock b/Gemfile.lock index b4b5c11..d64132a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,22 @@ GEM remote: http://rubygems.org/ specs: - activesupport (5.0.2) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (4.2.8) i18n (~> 0.7) minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - backports (3.6.8) - builder (3.2.3) + capybara (2.4.4) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) chunky_png (1.3.8) - commonjs (0.2.7) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) @@ -24,105 +29,74 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - compass-slickmap (0.4.0) - compass (>= 0.10) - haml (>= 3.0) - concurrent-ruby (1.0.5) - contest (0.1.3) - contracts (0.13.0) - daemons (1.2.4) - diff-lcs (1.3) - dotenv (2.2.0) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) eventmachine (1.2.3) execjs (2.7.0) - extlib (0.9.16) - fancy-buttons (1.2.0) - compass (>= 0.11) - fast_blank (1.0.0) - fastimage (2.1.0) ffi (1.9.17) haml (4.0.7) tilt - hamster (3.0.0) - concurrent-ruby (~> 1.0) - hashie (3.5.5) - highline (1.7.8) + hike (1.2.3) + hooks (0.4.1) + uber (~> 0.0.14) http_parser.rb (0.6.0) - httpclient (2.8.3) i18n (0.7.0) json (2.0.3) - json_pure (2.0.3) - less (2.6.0) - commonjs (~> 0.2.7) + kramdown (1.13.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - memoist (0.15.0) - middleman (0.14.1) - builder - compass (>= 0.10) - compass-slickmap - fancy-buttons - haml (>= 3.0) - json_pure - less - rack - rack-test - shotgun (>= 0.8) - sinatra (>= 1.0) - sinatra-content-for - smusher - sprockets - templater - thin - yui-compressor - middleman-compass (4.0.1) + middleman (3.4.1) + coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) - middleman-core (>= 4.0.0) - middleman-core (4.2.1) - activesupport (>= 4.2, < 5.1) - addressable (~> 2.3) - backports (~> 3.6) - bundler (~> 1.1) - contracts (~> 0.13.0) - dotenv - erubis + compass-import-once (= 1.0.5) execjs (~> 2.0) - fast_blank - fastimage (~> 2.0) - hamster (~> 3.0) - hashie (~> 3.4) + haml (>= 4.0.5) + kramdown (~> 1.2) + middleman-core (= 3.4.1) + middleman-sprockets (>= 3.1.2) + sass (>= 3.4.0, < 4.0) + uglifier (~> 2.5) + middleman-core (3.4.1) + activesupport (~> 4.1) + bundler (~> 1.1) + capybara (~> 2.4.4) + erubis + hooks (~> 0.3) i18n (~> 0.7.0) - listen (~> 3.0.0) - memoist (~> 0.14) - padrino-helpers (~> 0.13.0) - parallel - rack (>= 1.4.5, < 3) - sass (>= 3.4) - servolux - tilt (~> 2.0) - uglifier (~> 3.0) + listen (~> 3.0.3) + padrino-helpers (~> 0.12.3) + rack (>= 1.4.5, < 2.0) + thor (>= 0.15.2, < 2.0) + tilt (~> 1.4.1, < 2.0) middleman-livereload (3.4.6) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) + middleman-sprockets (3.5.0) + middleman-core (>= 3.3) + sprockets (~> 2.12.1) + sprockets-helpers (~> 1.1.0) + sprockets-sass (~> 1.3.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) minitest (5.10.1) multi_json (1.12.1) + nokogiri (1.7.0.1) + mini_portile2 (~> 2.1.0) oily_png (1.2.1) chunky_png (~> 1.3.7) - padrino-helpers (0.13.3.3) + padrino-helpers (0.12.8.1) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.13.3.3) - tilt (>= 1.4.1, < 3) - padrino-support (0.13.3.3) + padrino-support (= 0.12.8.1) + tilt (~> 1.4.1) + padrino-support (0.12.8.1) activesupport (>= 3.1) - parallel (1.10.0) - public_suffix (2.0.5) - rack (2.0.1) + rack (1.6.5) rack-livereload (0.3.16) rack rack-test (0.6.3) @@ -131,58 +105,40 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) - redgreen (1.2.2) - rubyforge (2.0.4) - json_pure (>= 1.1.7) sass (3.4.23) - servolux (0.12.0) - shotgun (0.9.2) - rack (>= 1.0) - sinatra (1.0) - rack (>= 1.0) - sinatra-content-for (0.1) - contest - redgreen - sinatra - sr-mg slim (3.0.7) temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) - smusher (0.4.9) - httpclient (>= 2.2) - json - rake - sprockets (3.7.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sr-mg (0.0.5) - rake - rubyforge - templater (1.0.0) - diff-lcs (>= 1.1.2) - extlib (>= 0.9.5) - highline (>= 1.4.0) + sprockets (2.12.4) + 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) temple (0.7.7) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) + thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (1.4.1) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.1.3) - execjs (>= 0.3.0, < 3) - yui-compressor (0.12.0) + uber (0.0.15) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES compass - middleman (< 4.0) - middleman-compass - middleman-livereload + middleman (~> 3) + middleman-livereload (~> 3) oily_png rake rb-fsevent