Fix require dependency

2015-06-09 11:57:59 +02:00
parent 9f225a1e1b
commit c4a7e7c987
10 changed files with 32 additions and 34 deletions
@@ -14,6 +14,10 @@ group :assets do
  #gem 'less-rails'
  gem 'foundation-rails'
  gem 'ace-rails-ap'
+  gem "jquery-rails"
+  gem 'font-awesome-rails'
+  gem 'tinymce-rails'
+  gem 'pickadate-rails'
 end

 gem 'couch_potato' , github: 'bterkuile/couch_potato'
@@ -21,19 +25,15 @@ gem 'simply_stored' , github: 'bterkuile/simply_stored'
 gem 'orm_adapter', github: 'bterkuile/orm_adapter'
 gem 'devise'
 gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
-gem 'tinymce-rails'
 gem 'slim-rails'
 gem 'paperclip'
 gem 'email_validator'
 gem 'actionpack-page_caching'
-gem 'font-awesome-rails'
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.

-# jquery-rails is used by the dummy application
-gem "jquery-rails"
 # To use debugger
 group :test do
  gem 'steak'
@@ -33,17 +33,21 @@ PATH
  remote: .
  specs:
    cmtool (1.0.0)
+      ace-rails-ap
      bourbon
      email_validator
+      font-awesome-rails
+      foundation-rails
      jquery-rails
      paperclip
+      pickadate-rails
      slim-rails
      tinymce-rails

 GEM
  remote: http://rubygems.org/
  specs:
-    ace-rails-ap (3.0.2)
+    ace-rails-ap (3.0.3)
    actionmailer (4.2.0)
      actionpack (= 4.2.0)
      actionview (= 4.2.0)
@@ -83,7 +87,7 @@ GEM
      tzinfo (~> 1.1)
    arel (6.0.0)
    bcrypt (3.1.10)
-    bourbon (4.2.2)
+    bourbon (4.2.3)
      sass (~> 3.4)
      thor
    builder (3.2.2)
@@ -101,13 +105,13 @@ GEM
    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.9.1.1)
    couchrest (1.2.0)
      mime-types (~> 1.15)
      multi_json (~> 1.0)
      rest-client (~> 1.6.1)
    daemons (1.2.2)
-    devise (3.4.1)
+    devise (3.5.1)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 3.2.6, < 5)
@@ -115,11 +119,11 @@ GEM
      thread_safe (~> 0.1)
      warden (~> 1.2.3)
    diff-lcs (1.2.5)
-    email_validator (1.5.0)
+    email_validator (1.6.0)
      activemodel
    erubis (2.7.0)
    eventmachine (1.0.7)
-    execjs (2.5.0)
+    execjs (2.5.2)
    factory_girl (4.5.0)
      activesupport (>= 3.0.0)
    factory_girl_rails (4.5.0)
@@ -127,41 +131,42 @@ GEM
      railties (>= 3.0.0)
    font-awesome-rails (4.3.0.0)
      railties (>= 3.2, < 5.0)
-    foundation-rails (5.5.1.1)
+    foundation-rails (5.5.2.1)
      railties (>= 3.1.0)
      sass (>= 3.3.0, < 3.5)
-    globalid (0.3.4)
+    globalid (0.3.5)
      activesupport (>= 4.1.0)
-    hike (1.2.3)
    i18n (0.7.0)
    jquery-rails (4.0.3)
      rails-dom-testing (~> 1.0)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.2)
      nokogiri (>= 1.5.9)
    mail (2.6.3)
      mime-types (>= 1.16, < 3)
    method_source (0.8.2)
    mime-types (1.25.1)
    mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.7.0)
    multi_json (1.11.0)
    nokogiri (1.6.6.2)
      mini_portile (~> 0.6.0)
-    paperclip (4.2.1)
+    paperclip (4.2.2)
      activemodel (>= 3.0.0)
      activesupport (>= 3.0.0)
      cocaine (~> 0.5.3)
      mime-types
+    pickadate-rails (3.5.5.0)
+      railties (>= 3.1.0)
    pry (0.10.1)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
    pry-rails (0.3.4)
      pry (>= 0.9.10)
-    rack (1.6.0)
+    rack (1.6.1)
    rack-test (0.6.3)
      rack (>= 1.0)
    rails (4.2.0)
@@ -206,7 +211,7 @@ GEM
    rspec-mocks (3.2.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
+    rspec-rails (3.2.3)
      actionpack (>= 3.0, < 4.3)
      activesupport (>= 3.0, < 4.3)
      railties (>= 3.0, < 4.3)
@@ -215,14 +220,14 @@ GEM
      rspec-mocks (~> 3.2.0)
      rspec-support (~> 3.2.0)
    rspec-support (3.2.2)
-    sass (3.4.13)
+    sass (3.4.14)
    sass-rails (5.0.3)
      railties (>= 4.0.0, < 5.0)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (~> 1.1)
-    slim (3.0.3)
+    slim (3.0.6)
      temple (~> 0.7.3)
      tilt (>= 1.3.3, < 2.1)
    slim-rails (3.0.1)
@@ -232,19 +237,16 @@ GEM
      railties (>= 3.1, < 5.0)
      slim (~> 3.0)
    slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.2.0)
      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      sprockets (>= 2.8, < 4.0)
    steak (2.0.0)
      capybara (>= 1.0.0)
      rspec-rails (>= 2.5.0)
-    temple (0.7.5)
+    temple (0.7.6)
    thin (1.6.3)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0)
@@ -280,6 +282,7 @@ DEPENDENCIES
  jquery-rails
  orm_adapter!
  paperclip
+  pickadate-rails
  pry-rails
  rails (= 4.2.0)
  rspec-its
@@ -7,12 +7,7 @@ require "action_mailer/railtie"
 require 'rails/test_unit/railtie'
 require "sprockets/railtie"

-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+Bundler.require(*Rails.groups(assets: %w(development test)))
 require "cmtool"

 module Dummy
@@ -4,7 +4,7 @@ Dummy::Application.configure do
  # In the development environment your application's code is reloaded on
  # every request. This slows down response time but is perfect for development
  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.eager_load = false

  # Log error messages when you accidentally call methods on nil.
  config.whiny_nils = true