diff --git a/Gemfile b/Gemfile index e9e62f9..fcaa33b 100644 --- a/Gemfile +++ b/Gemfile @@ -10,28 +10,20 @@ gem "pg" gem "autoprefixer-rails" gem "slim" gem "kramdown" - -group :development, :test do - gem "rack-livereload" - gem "guard", :require => false - gem "guard-livereload", :require => false - gem "rb-fsevent", :require => false - gem "better_errors" - gem "jazz_hands" -end +gem "sass" +gem "sass-rails" # Gems used only for assets and not required # in production environments by default. group :assets do - gem "sass-rails", "~> 3.2.3" gem "coffee-rails", "~> 3.2.1" # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem "therubyracer", :platforms => :ruby + gem "therubyracer", :platforms => :ruby gem "uglifier", ">= 1.0.3" end gem "jquery-rails" -gem "bcrypt-ruby", "~> 3.0.0" +#gem "bcrypt-ruby", ">= 3.0.0" gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index 34572b7..cda84f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,20 +31,7 @@ GEM arel (3.0.2) autoprefixer-rails (1.1.20140430) execjs - awesome_print (1.2.0) - bcrypt-ruby (3.0.1) - better_errors (1.1.0) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) builder (3.0.0) - celluloid (0.15.2) - timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) - coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -52,107 +39,30 @@ GEM coffee-script-source execjs coffee-script-source (1.6.2) - columnize (0.8.9) - coolline (0.4.3) - debug_inspector (0.0.2) - debugger (1.6.6) - columnize (>= 0.3.1) - debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.3.2) - debugger-linecache (1.2.0) - debugger-ruby_core_source (1.3.2) - diff-lcs (1.2.5) - diffy (3.0.4) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) - ffi (1.9.3) - formatador (0.2.4) - grit (2.5.0) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) - guard (2.6.0) - formatador (>= 0.2.4) - listen (~> 2.7) - lumberjack (~> 1.0) - pry (>= 0.9.12) - thor (>= 0.18.1) - guard-livereload (1.4.0) - em-websocket (>= 0.5.0) - guard (>= 1.8.0) - multi_json (~> 1.7) hike (1.2.2) - hirb (0.7.1) - http_parser.rb (0.6.0) i18n (0.6.1) - jazz_hands (0.5.2) - awesome_print (~> 1.2) - coolline (>= 0.4.2) - hirb (~> 0.7.1) - pry (~> 0.9.12) - pry-debugger (~> 0.2.2) - pry-doc (~> 0.4.6) - pry-git (~> 0.2.3) - pry-rails (~> 0.3.2) - pry-remote (>= 0.1.7) - pry-stack_explorer (~> 0.4.9) - railties (>= 3.0, < 5.0) journey (1.0.4) jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) kramdown (1.3.3) - listen (2.7.4) - celluloid (>= 0.15.2) - celluloid-io (>= 0.15.0) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - lumberjack (1.0.5) + libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - method_source (0.8.2) mime-types (1.23) multi_json (1.7.3) - nio4r (1.0.0) pg (0.15.1) polyglot (0.3.3) - posix-spawn (0.3.8) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - pry-debugger (0.2.2) - debugger (~> 1.3) - pry (~> 0.9.10) - pry-doc (0.4.6) - pry (>= 0.9) - yard (>= 0.8) - pry-git (0.2.3) - diffy - grit - pry (>= 0.9.8) - pry-rails (0.3.2) - pry (>= 0.9.10) - pry-remote (0.1.8) - pry (~> 0.9) - slop (~> 3.0) - pry-stack_explorer (0.4.9.1) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) puma (2.8.2) rack (>= 1.1, < 2.0) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-livereload (0.3.15) - rack rack-ssl (1.3.3) rack rack-test (0.6.2) @@ -173,11 +83,9 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (0.9.2.2) - rb-fsevent (0.9.4) - rb-inotify (0.9.4) - ffi (>= 0.5.0) rdoc (3.12) json (~> 1.4) + ref (1.0.5) sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) @@ -186,16 +94,17 @@ GEM slim (2.0.2) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - slop (3.5.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) temple (0.6.7) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref thor (0.18.1) tilt (1.4.1) - timers (1.1.0) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -203,26 +112,20 @@ GEM uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - yard (0.8.7.4) PLATFORMS ruby DEPENDENCIES autoprefixer-rails - bcrypt-ruby (~> 3.0.0) - better_errors coffee-rails (~> 3.2.1) - guard - guard-livereload - jazz_hands jquery-rails kramdown pg puma - rack-livereload rails (= 3.2.13) - rb-fsevent - sass-rails (~> 3.2.3) + sass + sass-rails slim + therubyracer uglifier (>= 1.0.3)