rails_apps_composer 2.4.28 → 2.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f21d1f64ae3399cfd7cb4c5160d10fc38c7756ac
-  data.tar.gz: 45ef061f9670ee078816adf26d9f8663c265faa4
+  metadata.gz: 4049365587388cda87244bc3e327179ce7b1301c
+  data.tar.gz: c05599a6a23bb672bd6400bde16b6d794bc3a34e
 SHA512:
-  metadata.gz: 8853c2c9052aae02133b38e7e0a5e302096d3c7a0a7f6cc97301430cd39dae306e5cb43a99e0d616de85a806458862b2dcf0e2d9c960fdf41ee87c4061d98ac1
-  data.tar.gz: 31bcb556faa602fa524d9c3e70d81140b8ae5138689c8f9b3a45b472f7b2d836c331b00978a9bc7eb61a2e963e8cbf008b941b1f1465863e2061283d2d8f9fa3
+  metadata.gz: 3f14205a03748de93235ed6e39250baa06842b1e4c7dd7538ee808f64d3ee26791e413104b1ae62c77176f80ae0f17da799d97fa9e4a6147e2d4b2e574982a32
+  data.tar.gz: f57a9f504ccf1d47f7f5dccc568c8c52cb4598a9b1266bc560de37abd89d48ac5825f4075ccc6646f8c48b105d11a7567765a7db23e8071054893fb4c8984869

data/recipes/apps4.rb

@@ -159,12 +159,6 @@ if prefer :apps4, 'rails-devise'
     say_wizard "recipe running after 'bundle install'"
     repo = 'https://raw.github.com/RailsApps/rails-devise/master/'
 
-    # >-------------------------------[ Init ]--------------------------------<
-
-    copy_from_repo 'config/application.yml', :repo => repo
-    remove_file 'config/application.example.yml'
-    copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
-
     # >-------------------------------[ Controllers ]--------------------------------<
 
     copy_from_repo 'app/controllers/home_controller.rb', :repo => repo
@@ -220,12 +214,6 @@ if prefer :apps4, 'rails-omniauth'
     say_wizard "recipe running after 'bundle install'"
     repo = 'https://raw.github.com/RailsApps/rails-omniauth/master/'
 
-    # >-------------------------------[ Init ]--------------------------------<
-
-    copy_from_repo 'config/application.yml', :repo => repo
-    remove_file 'config/application.example.yml'
-    copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
-
     # >-------------------------------[ Models ]--------------------------------<
 
     copy_from_repo 'app/models/user.rb', :repo => repo

data/recipes/extras.rb

@@ -84,9 +84,13 @@ if config['local_env_file']
     prefs[:local_env_file] = 'foreman'
   end
 end
-if prefer :local_env_file, 'figaro' and not rails_4_1?
+if prefer :local_env_file, 'figaro'
   say_wizard "recipe creating application.yml file for environment variables with figaro"
-  add_gem 'figaro'
+  if rails_4_1?
+    add_gem 'figaro', :github => 'laserlemon/figaro'
+  else
+    add_gem 'figaro'
+  end
 elsif prefer :local_env_file, 'foreman'
   say_wizard "recipe creating .env file for development environment variables with foreman"
   add_gem 'foreman', :group => :development
@@ -191,8 +195,8 @@ config:
       prompt: Create a GitHub repository?
   - local_env_file:
       type: multiple_choice
-      prompt: Use file for environment variables?
-      choices: [ [None, none], [Use application.yml with Figaro, figaro], [Use .env with Foreman, foreman] ]
+      prompt: Add gem and file for environment variables?
+      choices: [ [None, none], [Add .env with Foreman, foreman], [Add application.yml with Figaro, figaro]]
   - quiet_assets:
       type: boolean
       prompt: Reduce assets logger noise during development?

data/recipes/gems.rb

@@ -255,7 +255,7 @@ after_bundler do
     end
   end
   ## Figaro Gem
-  if prefer :local_env_file, 'figaro' and not rails_4_1?
+  if prefer :local_env_file, 'figaro'
     generate 'figaro:install'
     gsub_file 'config/application.yml', /# PUSHER_.*\n/, ''
     gsub_file 'config/application.yml', /# STRIPE_.*\n/, ''
@@ -263,7 +263,7 @@ after_bundler do
 # Add account credentials and API keys here.
 # See http://railsapps.github.io/rails-environment-variables.html
 # This file should be listed in .gitignore to keep your settings secret!
-# Each entry sets a local environment variable and overrides ENV variables in the Unix shell.
+# Each entry sets a local environment variable.
 # For example, setting:
 # GMAIL_USERNAME: Your_Gmail_Username
 # makes 'Your_Gmail_Username' available as ENV["GMAIL_USERNAME"]
@@ -276,7 +276,7 @@ FILE
     create_file '.env' do <<-FILE
 # Add account credentials and API keys here.
 # This file should be listed in .gitignore to keep your settings secret!
-# Each entry sets a local environment variable and overrides ENV variables in the Unix shell.
+# Each entry sets a local environment variable.
 # For example, setting:
 # GMAIL_USERNAME=Your_Gmail_Username
 # makes 'Your_Gmail_Username' available as ENV["GMAIL_USERNAME"]

data/recipes/init.rb

@@ -3,77 +3,77 @@
 
 after_everything do
   say_wizard "recipe running after everything"
-  ### CONFIGURATION FILE ###
-  ## EMAIL
   case prefs[:email]
     when 'none'
-      credentials = ''
+      secrets_d_email = secrets_p_email = foreman_email = ''
     when 'smtp'
-      credentials = ''
+      secrets_d_email = foreman_email = ''
     when 'gmail'
-      credentials = "GMAIL_USERNAME: Your_Username\nGMAIL_PASSWORD: Your_Password\n"
+      secrets_d_email = "  gmail_username: Your_Username\n  gmail_password: Your_Password\n"
+      secrets_p_email = "  gmail_username: <%= ENV[\"GMAIL_USERNAME\"] %>\n  gmail_password: <%= ENV[\"GMAIL_PASSWORD\"] %>\n"
+      foreman_email = "GMAIL_USERNAME=Your_Username\nGMAIL_PASSWORD=Your_Password\n"
     when 'sendgrid'
-      credentials = "SENDGRID_USERNAME: Your_Username\nSENDGRID_PASSWORD: Your_Password\n"
+      secrets_d_email = "  sendgrid_username: Your_Username\n  sendgrid_password: Your_Password\n"
+      secrets_p_email = "  sendgrid_username: <%= ENV[\"SENDGRID_USERNAME\"] %>\n  sendgrid_password: <%= ENV[\"SENDGRID_PASSWORD\"] %>\n"
+      foreman_email = "SENDGRID_USERNAME=Your_Username\nSENDGRID_PASSWORD=Your_Password\n"
     when 'mandrill'
-      credentials = "MANDRILL_USERNAME: Your_Username\nMANDRILL_APIKEY: Your_API_Key\n"
+      secrets_d_email = "  mandrill_username: Your_Username\n  mandrill_apikey: Your_API_Key\n"
+      secrets_p_email = "  mandrill_username: <%= ENV[\"MANDRILL_USERNAME\"] %>\n  mandrill_apikey: <%= ENV[\"MANDRILL_APIKEY\"] %>\n"
+      foreman_email = "MANDRILL_USERNAME=Your_Username\nMANDRILL_APIKEY=Your_API_Key\n"
   end
-  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' and not rails_4_1?
-    ## DEFAULT USER
-    unless prefer :starter_app, false
-      append_file 'config/application.yml' do <<-FILE
-ADMIN_NAME: First User
-ADMIN_EMAIL: user@example.com
-ADMIN_PASSWORD: changeme
-FILE
-      end
-    end
-    ## AUTHENTICATION
-    if prefer :authentication, 'omniauth'
-      append_file 'config/application.yml' do <<-FILE
-OMNIAUTH_PROVIDER_KEY: Your_OmniAuth_Provider_Key
-OMNIAUTH_PROVIDER_SECRET: Your_OmniAuth_Provider_Secret
-FILE
-      end
-    end
-    ## AUTHORIZATION
-    if (prefer :authorization, 'cancan')
-      append_file 'config/application.yml', "ROLES: [admin, user, VIP]\n"
-    end
-  elsif prefer :local_env_file, 'foreman'
-    ## DEFAULT USER
-    unless prefer :starter_app, false
-      append_file '.env' do <<-FILE
-ADMIN_NAME=First User
-ADMIN_EMAIL=user@example.com
-ADMIN_PASSWORD=changeme
-FILE
-      end
-    end
-    ## AUTHENTICATION
-    if prefer :authentication, 'omniauth'
-      append_file '.env' do <<-FILE
-OMNIAUTH_PROVIDER_KEY=Your_OmniAuth_Provider_Key
-OMNIAUTH_PROVIDER_SECRET=Your_OmniAuth_Provider_Secret
-FILE
-      end
-    end
-    ## AUTHORIZATION
-    if (prefer :authorization, 'cancan')
-      append_file '.env', "ROLES=[admin, user, VIP]\n"
-    end
+  figaro_email  = foreman_email.gsub('=', ': ')
+  secrets_d_devise = "  admin_name: First User\n  admin_email: user@example.com\n  admin_password: changeme\n"
+  secrets_p_devise = "  admin_name: <%= ENV[\"ADMIN_NAME\"] %>\n  admin_email: <%= ENV[\"ADMIN_EMAIL\"] %>\n  admin_password: <%= ENV[\"ADMIN_PASSWORD\"] %>\n"
+  foreman_devise = "ADMIN_NAME=First User\nADMIN_EMAIL=user@example.com\nADMIN_PASSWORD=changeme\n"
+  figaro_devise  = foreman_devise.gsub('=', ': ')
+  secrets_d_omniauth = "  omniauth_provider_key: Your_Provider_Key\n  omniauth_provider_secret: Your_Provider_Secret\n"
+  secrets_p_omniauth = "  omniauth_provider_key: <%= ENV[\"OMNIAUTH_PROVIDER_KEY\"] %>\n  omniauth_provider_secret: <%= ENV[\"OMNIAUTH_PROVIDER_SECRET\"] %>\n"
+  foreman_omniauth = "OMNIAUTH_PROVIDER_KEY: Your_Provider_Key\nOMNIAUTH_PROVIDER_SECRET: Your_Provider_Secret\n"
+  figaro_omniauth  = foreman_omniauth.gsub('=', ': ')
+  secrets_d_cancan = "  roles: [admin, user, VIP]\n" # unnecessary? CanCan will not be used with Rails 4.1?
+  secrets_p_cancan = "  roles: <%= ENV[\"ROLES\"] %>\n" # unnecessary? CanCan will not be used with Rails 4.1?
+  foreman_cancan = "ROLES=[admin, user, VIP]\n\n"
+  figaro_cancan = foreman_cancan.gsub('=', ': ')
+  ## EMAIL
+  inject_into_file 'config/secrets.yml', secrets_d_email, :after => "development:\n" if rails_4_1?
+  inject_into_file 'config/secrets.yml', secrets_p_email, :after => "production:\n" if rails_4_1?
+  append_file '.env', foreman_email if prefer :local_env_file, 'foreman'
+  append_file 'config/application.yml', figaro_email if prefer :local_env_file, 'figaro'
+  ## DEVISE
+  if prefer :authentication, 'devise'
+    inject_into_file 'config/secrets.yml', secrets_d_devise, :after => "development:\n" if rails_4_1?
+    inject_into_file 'config/secrets.yml', secrets_p_devise, :after => "production:\n" if rails_4_1?
+    append_file '.env', foreman_devise if prefer :local_env_file, 'foreman'
+    append_file 'config/application.yml', figaro_devise if prefer :local_env_file, 'figaro'
+  end
+  ## OMNIAUTH
+  if prefer :authentication, 'omniauth'
+    inject_into_file 'config/secrets.yml', secrets_d_omniauth, :after => "development:\n" if rails_4_1?
+    inject_into_file 'config/secrets.yml', secrets_p_omniauth, :after => "production:\n" if rails_4_1?
+    append_file '.env', foreman_omniauth if prefer :local_env_file, 'foreman'
+    append_file 'config/application.yml', figaro_omniauth if prefer :local_env_file, 'figaro'
   end
-  ### SUBDOMAINS ###
+  ## CANCAN
+  if (prefer :authorization, 'cancan')
+    inject_into_file 'config/secrets.yml', secrets_d_cancan, :after => "development:\n" if rails_4_1?
+    inject_into_file 'config/secrets.yml', secrets_p_cancan, :after => "production:\n" if rails_4_1?
+    append_file '.env', foreman_cancan if prefer :local_env_file, 'foreman'
+    append_file 'config/application.yml', figaro_cancan if prefer :local_env_file, 'figaro'
+  end
+  ### SUBDOMAINS (FIGARO ONLY) ###
   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' and not rails_4_1?
+  ### EXAMPLE FILE FOR FOREMAN AND FIGARO ###
+  if prefer :local_env_file, 'figaro'
     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' and not rails_4_1?
+  if (prefer :authentication, 'devise') and (rails_4_1?)
+    copy_from_repo 'db/seeds.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise/master/'
+    copy_from_repo 'app/services/create_admin_service.rb', :repo => 'https://raw.github.com/RailsApps/rails-devise/master/'
+  end
+  if prefer :local_env_file, 'figaro'
     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
@@ -109,21 +109,11 @@ FILE
     end
   end
   ## DEVISE-DEFAULT
-  if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise')
+  if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise') and (not rails_4_1?)
     append_file 'db/seeds.rb' do <<-FILE
 puts 'DEFAULT USERS'
 user = User.find_or_create_by_email :name => ENV['ADMIN_NAME'].dup, :email => ENV['ADMIN_EMAIL'].dup, :password => ENV['ADMIN_PASSWORD'].dup, :password_confirmation => ENV['ADMIN_PASSWORD'].dup
 puts 'user: ' << user.name
-FILE
-    end
-    # Mongoid doesn't have a 'find_or_create_by' method
-    gsub_file 'db/seeds.rb', /find_or_create_by_email/, 'create!' if prefer :orm, 'mongoid'
-  end
-  if prefer :apps4, 'rails-devise'
-    append_file 'db/seeds.rb' do <<-FILE
-puts 'DEFAULT USERS'
-user = User.find_or_create_by_email :email => ENV['ADMIN_EMAIL'].dup, :password => ENV['ADMIN_PASSWORD'].dup, :password_confirmation => ENV['ADMIN_PASSWORD'].dup
-puts 'user: ' << user.email
 FILE
     end
     # Mongoid doesn't have a 'find_or_create_by' method
@@ -152,10 +142,8 @@ FILE
       say_wizard "applying migrations and seeding the database"
       if prefer :local_env_file, 'foreman'
         run 'foreman run bundle exec rake db:migrate'
-        run 'foreman run bundle exec rake db:test:prepare'
       else
         run 'bundle exec rake db:migrate'
-        run 'bundle exec rake db:test:prepare'
       end
     end
   else

data/recipes/prelaunch.rb

@@ -50,7 +50,6 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
     copy_from_repo 'db/seeds.rb', :repo => repo
     run 'bundle exec rake db:seed'
-    run 'bundle exec rake db:test:prepare'
 
     # >-------------------------------[ Controllers ]--------------------------------<
 

data/recipes/railsapps.rb

@@ -27,12 +27,16 @@ when "4"
     ["I want to build my own application", "none"]] unless prefs.has_key? :apps4
   case prefs[:apps4]
     when 'railsapps'
-      prefs[:apps4] = multiple_choice "Starter apps for Rails 4.0. More to come.",
-        [["learn-rails", "learn-rails"],
-        ["rails-bootstrap", "rails-bootstrap"],
-        ["rails-foundation", "rails-foundation"],
-        ["rails-devise", "rails-devise"],
-        ["rails-omniauth", "rails-omniauth"]]
+      if rails_4_1?
+      prefs[:apps4] = multiple_choice "Starter apps for Rails 4.1. More to come.",
+        [["rails-devise", "rails-devise"]]
+      else
+        prefs[:apps4] = multiple_choice "Starter apps for Rails 4.0. More to come.",
+          [["learn-rails", "learn-rails"],
+          ["rails-bootstrap", "rails-bootstrap"],
+          ["rails-foundation", "rails-foundation"],
+          ["rails-omniauth", "rails-omniauth"]]
+      end
     when 'contributed_app'
       prefs[:apps4] = multiple_choice "No contributed applications are available.",
         [["continue", "none"]]
@@ -118,7 +122,7 @@ case prefs[:apps4]
     prefs[:authorization] = false
     prefs[:starter_app] = false
     prefs[:quiet_assets] = true
-    prefs[:local_env_file] = 'figaro'
+    prefs[:local_env_file] = false
     prefs[:better_errors] = true
   when 'rails-omniauth'
     prefs[:git] = true

data/recipes/saas.rb

@@ -40,7 +40,6 @@ if prefer :railsapps, 'rails-stripe-membership-saas'
     copy_from_repo 'db/seeds.rb', :repo => repo
     copy_from_repo 'config/initializers/stripe.rb', :repo => repo
     run 'bundle exec rake db:seed'
-    run 'bundle exec rake db:test:prepare'
 
     # >-------------------------------[ Controllers ]--------------------------------<
     copy_from_repo 'app/controllers/home_controller.rb', :repo => repo
@@ -143,7 +142,6 @@ if prefer :railsapps, 'rails-recurly-subscription-saas'
     copy_from_repo 'db/seeds.rb', :repo => repo
     copy_from_repo 'config/initializers/recurly.rb', :repo => repo
     run 'bundle exec rake db:seed'
-    run 'bundle exec rake db:test:prepare'
 
     # >-------------------------------[ Controllers ]--------------------------------<
     copy_from_repo 'app/controllers/home_controller.rb', :repo => repo

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.28"
+  VERSION = "2.4.29"
 end

metadata

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