rails_apps_composer 2.4.25 → 2.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae94d7ef1ef1ed3e2c94151d58e9827e9a8b44f7
-  data.tar.gz: bbeb269bd02495aef1bde1695b617f2f6684a72f
+  metadata.gz: 55295ece4918c30d58c8c9cecd2290a79f20c57a
+  data.tar.gz: 1957d5ae9537467f3de66edf3d304ea0afdf9945
 SHA512:
-  metadata.gz: 41d929c187621ef56fe8615ba4d97b22e5850528e7ea9d84a251d90774ab72520986793bf40f36160cb7503902be96211afa4da12aa75139981994e55a725abf
-  data.tar.gz: 03c2df4bff06248139ab11756138d929d44359cc880185aec85e34b4230e41981683bf8ab130d07f07452c5c76890aad047a9da4a2bdd3d4b8209df55e9ba4a9
+  metadata.gz: 4c778245cd0f240d024f05da4214ee4aca9974036d3609da017600293bc2745b586b2ac4db80d2110b4507a752777cd6e82ec434659a5d62ac66a2d56e9a0231
+  data.tar.gz: 5556dedc6d599726bbbe1569bc9868627e18171b2391a2215dab4dfb1ad31e7debf07dac034a0820c894c3fe61ab9541db4f632a0b0354cf7fe251260c00d8d0

data/recipes/extras.rb

@@ -84,7 +84,7 @@ if config['local_env_file']
     prefs[:local_env_file] = 'foreman'
   end
 end
-if prefer :local_env_file, 'figaro'
+if prefer :local_env_file, 'figaro' and not rails_4_1?
   say_wizard "recipe creating application.yml file for environment variables with figaro"
   add_gem 'figaro'
 elsif prefer :local_env_file, 'foreman'

data/recipes/gems.rb

@@ -255,7 +255,7 @@ after_bundler do
     end
   end
   ## Figaro Gem
-  if prefer :local_env_file, 'figaro'
+  if prefer :local_env_file, 'figaro' and not rails_4_1?
     generate 'figaro:install'
     gsub_file 'config/application.yml', /# PUSHER_.*\n/, ''
     gsub_file 'config/application.yml', /# STRIPE_.*\n/, ''

data/recipes/init.rb

@@ -17,9 +17,9 @@ after_everything do
     when 'mandrill'
       credentials = "MANDRILL_USERNAME: Your_Username\nMANDRILL_APIKEY: Your_API_Key\n"
   end
-  append_file 'config/application.yml', credentials if prefer :local_env_file, 'figaro'
+  append_file 'config/application.yml', credentials if prefer :local_env_file, 'figaro' and not rails_4_1?
   append_file '.env', credentials.gsub(': ', '=') if prefer :local_env_file, 'foreman'
-  if prefer :local_env_file, 'figaro'
+  if prefer :local_env_file, 'figaro' and not rails_4_1?
     ## DEFAULT USER
     unless prefer :starter_app, false
       append_file 'config/application.yml' do <<-FILE
@@ -67,13 +67,13 @@ FILE
   ### SUBDOMAINS ###
   copy_from_repo 'config/application.yml', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains_app'
   ### APPLICATION.EXAMPLE.YML ###
-  if prefer :local_env_file, 'figaro'
+  if prefer :local_env_file, 'figaro' and not rails_4_1?
     copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
   elsif prefer :local_env_file, 'foreman'
     copy_file destination_root + '/.env', destination_root + '/.env.example'
   end
   ### DATABASE SEED ###
-  if prefer :local_env_file, 'figaro'
+  if prefer :local_env_file, 'figaro' and not rails_4_1?
     append_file 'db/seeds.rb' do <<-FILE
 # Environment variables (ENV['...']) can be set in the file config/application.yml.
 # See http://railsapps.github.io/rails-environment-variables.html

data/templates/helpers.erb

@@ -14,6 +14,10 @@ def rails_4?
   Rails::VERSION::MAJOR.to_s == "4"
 end
 
+def rails_4_1?
+  Rails::VERSION::MAJOR.to_s == "4" && Rails::VERSION::MINOR.to_s == "1"
+end
+
 def ask_wizard(question)
   ask "\033[1m\033[36m" + (@current_recipe || "prompt").rjust(10) + "\033[1m\033[36m" + "  #{question}\033[0m"
 end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.25"
+  VERSION = "2.4.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.25
+  version: 2.4.26
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n