From: SHIBATA H. <nul...@cl...> - 2013-07-15 12:00:04
|
SHIBATA Hiroshi 2013-07-15 20:59:40 +0900 (Mon, 15 Jul 2013) New Revision: d566514fe2debe0f63465c6a57df6da7ade6792f https://github.com/tdiary/tdiary-core/commit/d566514fe2debe0f63465c6a57df6da7ade6792f Message: modified sprockets environment and loaded :development env when running on test Modified files: Gemfile.lock tdiary.gemspec tdiary/environment.rb Modified: Gemfile.lock (+8 -0) =================================================================== --- Gemfile.lock 2013-07-15 20:16:16 +0900 (53bcb16) +++ Gemfile.lock 2013-07-15 20:59:40 +0900 (4c6fbcf) @@ -41,6 +41,7 @@ GEM execjs (1.4.0) multi_json (~> 1.0) ffi (1.9.0) + hike (1.2.3) hikidoc (0.0.6) imagesize (0.1.1) jasmine (1.3.2) @@ -100,6 +101,11 @@ GEM simplecov-html (~> 0.7.1) simplecov-html (0.7.1) slop (3.4.5) + sprockets (2.10.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) tapp (1.4.0) thor @@ -109,6 +115,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.18.1) + tilt (1.4.1) twitter-text (1.6.1) unf (~> 0.0.5) unf (0.0.5) @@ -140,6 +147,7 @@ DEPENDENCIES selenium-webdriver sequel simplecov + sprockets sqlite3 tapp tdiary! Modified: tdiary.gemspec (+2 -0) =================================================================== --- tdiary.gemspec 2013-07-15 20:16:16 +0900 (af9716b) +++ tdiary.gemspec 2013-07-15 20:59:40 +0900 (f3e775b) @@ -28,4 +28,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'thor', '~> 0.18' spec.add_dependency "bundler", "~> 1.3" + + spec.add_development_dependency 'sprockets' end Modified: tdiary/environment.rb (+1 -1) =================================================================== --- tdiary/environment.rb 2013-07-15 20:16:16 +0900 (d45851d) +++ tdiary/environment.rb 2013-07-15 20:59:40 +0900 (b8fa216) @@ -7,7 +7,7 @@ require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) if defined?(Bundler) env = [:default] - env << :development if ENV['RACK_ENV'].nil? || ENV['RACK_ENV'].empty? + env << :development unless ENV['RACK_ENV'] == "production" env << ENV['RACK_ENV'].intern if ENV['RACK_ENV'] env = env.reject{|e| Bundler.settings.without.include? e } Bundler.require *env |