rails_apps_composer 3.0.17 → 3.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b273698316da5ea8f633adf38d600ddff8f120
-  data.tar.gz: 13e024dde62bf0922ac315b27d76dda800677e37
+  metadata.gz: 4df1af2afa0029ec54403a46b19ae1ad15fecb44
+  data.tar.gz: 61439b4feec799cd43d9fdeef7474bdefae7eeb2
 SHA512:
-  metadata.gz: 4b9f484edcc9d2f9f13e60652bb51b7056e2fb03d7f8723b16a7d53325e791f62dc0d881db8bffaece3ac8d1ae91cfd42bdcc980cff8876cb6daf1760d74a2dc
-  data.tar.gz: 0e68af3c8b34a9ab0482a57ac6c0a93b1ab7b01ef4b1a42ba945a0b9bf06c4daa8e84515728f8480e0d0d0812547e564bedc6f0119640bcf228c787375d9326c
+  metadata.gz: 66036729f25cc78711230e547bf07aad188f686822683e8904731c758bb83fcc3f12f41c47b2dea2f452c98d93e33d9ee1c901b434a91a48a7162285ef45613c
+  data.tar.gz: 46f97fb1380308756fd0acb0a9b9484a8ad5539b418317f6ae924bf40f85eb5817bd58e6272beaa678d9a6e6f2cee11e7633248b0c38702a3f24639a75abceba

data/recipes/deployment.rb

@@ -1,13 +1,84 @@
 # Application template recipe for the rails_apps_composer. Change the recipe here:
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/deployment.rb
 
-case config['deployment']
-when 'capistrano3'
-  prefs[:deployment] = 'capistrano3'
+prefs[:deployment] = multiple_choice "Prepare for deployment?", [["no", "none"],
+    ["Heroku", "heroku"],
+    ["Capistrano", "capistrano3"]] unless prefs.has_key? :deployment
+
+if prefer :deployment, 'heroku'
+  say_wizard "installing gems for Heroku"
+  gsub_file 'Gemfile', /.*gem 'sqlite3'\n/, '' if prefer :database, 'sqlite'
+  add_gem 'sqlite3', group: [:development, :test] if prefer :database, 'sqlite'
+  add_gem 'pg', group: :production
+  add_gem 'rails_12factor', group: :production
+  stage_three do
+    say_wizard "recipe stage three"
+    say_wizard "precompiling assets for Heroku"
+    run 'RAILS_ENV=production rake assets:precompile'
+    say_wizard "creating app.json file for Heroku Button"
+    create_file 'app.json' do <<-TEXT
+{
+  "name": "#{app_name.humanize.titleize}",
+  "description": "Starter application generated by Rails Composer",
+  "logo": "https://avatars3.githubusercontent.com/u/788200",
+  "keywords": [
+    "Ruby #{RUBY_VERSION}",
+    "Rails #{Rails::VERSION::STRING}"
+  ],
+  "scripts": {},
+  "env": {
+    "RAILS_ENV": "production",
+    "ADMIN_EMAIL": {
+      "description": "The administrator's email address.",
+      "value": "user@example.com",
+      "required": true
+    },
+    "ADMIN_PASSWORD": {
+      "description": "The administrator's password.",
+      "value": "changeme",
+      "required": true
+    },
+    "GMAIL_USERNAME": {
+      "description": "Your Gmail address.",
+      "value": "user@example.com",
+      "required": false
+    },
+    "GMAIL_PASSWORD": {
+      "description": "Your Gmail password.",
+      "value": "changeme",
+      "required": false
+    },
+    "OWNER_EMAIL": {
+      "description": "Destination for messages sent from the app's contact form.",
+      "value": "user@example.com",
+      "required": false
+    },
+    "DOMAIN_NAME": {
+      "description": "Required for sending mail. Use the app name you've given.",
+      "value": "myapp.herokuapp.com",
+      "required": false
+    }
+  }
+}
+TEXT
+    end
+    if File.exists?('db/migrate')
+      gsub_file 'app.json', /"scripts": {/,
+          "\"scripts\": {\"postdeploy\": \"bundle exec rake db:migrate; bundle exec rake db:seed\""
+    end
+    gsub_file 'config/database.yml', /production:.*$\n.*$\n.*$/, ""
+    append_file 'config/database.yml' do <<-TEXT
+production:
+  <<: *default
+  adapter: postgresql
+  encoding: unicode
+TEXT
+    end
+  end
 end
 
 if prefer :deployment, 'capistrano3'
-  say_wizard "recipe adding capistrano gems"
+  say_wizard "installing gems for Capistrano"
   add_gem 'capistrano', '~> 3.0.1', group: :development
   add_gem 'capistrano-rvm', '~> 0.1.1', group: :development
   add_gem 'capistrano-bundler', group: :development
@@ -15,24 +86,23 @@ if prefer :deployment, 'capistrano3'
   add_gem 'capistrano-rails-console', group: :development
   stage_two do
     say_wizard "recipe stage two"
-    say_wizard 'recipe capistrano file'
+    say_wizard "installing Capistrano files"
     run 'bundle exec cap install'
   end
 end
 
+stage_three do
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: prepare for deployment"' if prefer :git, true
+end
+
 __END__
 
 name: deployment
-description: "Capistrano3-deployment - more options can be added later"
-author: zealot128
+description: "Prepare for deployment"
+author: RailsApps
 
-category: development
 requires: [setup]
 run_after: [init]
-args: -T
-
-config:
-  - deployment:
-      type: multiple_choice
-      prompt: Add a deployment mechanism?
-      choices: [["None", "none"], ["Capistrano3", "capistrano3"] ]
+category: development

data/recipes/extras.rb

@@ -162,6 +162,8 @@ stage_three do
   # thanks to https://github.com/perfectline/template-bucket/blob/master/cleanup.rb
   gsub_file 'Gemfile', /#.*\n/, "\n"
   gsub_file 'Gemfile', /\n^\s*\n/, "\n"
+  remove_file 'Gemfile.lock'
+  run 'bundle install --without production'
   # remove commented lines and multiple blank lines from config/routes.rb
   gsub_file 'config/routes.rb', /  #.*\n/, "\n"
   gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"

data/recipes/gems.rb

@@ -31,8 +31,8 @@ else
 end
 
 ## Database Adapter
-unless prefer :database, 'default'
-  gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
+unless prefer :database, 'sqlite'
+  gsub_file 'Gemfile', /gem 'sqlite3'\n/, ''
 end
 gsub_file 'Gemfile', /gem 'pg'.*/, ''
 add_gem 'pg' if prefer :database, 'postgresql'
@@ -140,7 +140,7 @@ git :commit => '-qm "rails_apps_composer: Gemfile"' if prefer :git, true
 stage_two do
   say_wizard "recipe stage two"
   say_wizard "configuring database"
-  unless prefer :database, 'default'
+  unless prefer :database, 'sqlite'
     copy_from_repo 'config/database-postgresql.yml', :prefs => 'postgresql'
     copy_from_repo 'config/database-mysql.yml', :prefs => 'mysql'
     if prefer :database, 'postgresql'

data/recipes/init.rb

@@ -104,7 +104,7 @@ FILE
     generate 'devise_invitable user'
   end
   ### APPLY DATABASE SEED ###
-  unless prefer :database, 'default'
+  if File.exists?('db/migrate')
     ## ACTIVE_RECORD
     say_wizard "applying migrations and seeding the database"
     if prefer :local_env_file, 'foreman'

data/recipes/learn_rails.rb

@@ -9,8 +9,8 @@ if prefer :apps4, 'learn-rails'
   prefs[:dashboard] = 'none'
   prefs[:ban_spiders] = false
   prefs[:better_errors] = true
-  prefs[:database] = 'default'
-  prefs[:deployment] = 'none'
+  prefs[:database] = 'sqlite'
+  prefs[:deployment] = 'heroku'
   prefs[:devise_modules] = false
   prefs[:dev_webserver] = 'webrick'
   prefs[:email] = 'gmail'

data/recipes/rails_bootstrap.rb

@@ -6,8 +6,7 @@ if prefer :apps4, 'rails-bootstrap'
   prefs[:authorization] = false
   prefs[:dashboard] = 'none'
   prefs[:better_errors] = true
-  prefs[:database] = 'default'
-  prefs[:deployment] = 'none'
+  prefs[:database] = 'sqlite'
   prefs[:devise_modules] = false
   prefs[:email] = 'none'
   prefs[:form_builder] = false

data/recipes/rails_devise.rb

@@ -6,7 +6,6 @@ if prefer :apps4, 'rails-devise'
   prefs[:authorization] = false
   prefs[:dashboard] = 'none'
   prefs[:better_errors] = true
-  prefs[:deployment] = 'none'
   prefs[:git] = true
   prefs[:local_env_file] = false
   prefs[:pry] = false

data/recipes/rails_devise_pundit.rb

@@ -5,7 +5,6 @@ if prefer :apps4, 'rails-devise-pundit'
   prefs[:authentication] = 'devise'
   prefs[:authorization] = 'pundit'
   prefs[:better_errors] = true
-  prefs[:deployment] = 'none'
   prefs[:git] = true
   prefs[:local_env_file] = false
   prefs[:pry] = false

data/recipes/rails_devise_roles.rb

@@ -5,7 +5,6 @@ if prefer :apps4, 'rails-devise-roles'
   prefs[:authentication] = 'devise'
   prefs[:authorization] = 'roles'
   prefs[:better_errors] = true
-  prefs[:deployment] = 'none'
   prefs[:git] = true
   prefs[:local_env_file] = false
   prefs[:pry] = false

data/recipes/rails_foundation.rb

@@ -6,8 +6,7 @@ if prefer :apps4, 'rails-foundation'
   prefs[:authorization] = false
   prefs[:dashboard] = 'none'
   prefs[:better_errors] = true
-  prefs[:database] = 'default'
-  prefs[:deployment] = 'none'
+  prefs[:database] = 'sqlite'
   prefs[:devise_modules] = false
   prefs[:email] = 'none'
   prefs[:form_builder] = false

data/recipes/rails_mailinglist_signup.rb

@@ -6,7 +6,6 @@ if prefer :apps4, 'rails-mailinglist-signup'
   prefs[:authorization] = false
   prefs[:dashboard] = 'none'
   prefs[:better_errors] = true
-  prefs[:deployment] = 'none'
   prefs[:devise_modules] = false
   prefs[:form_builder] = 'simple_form'
   prefs[:git] = true

data/recipes/rails_omniauth.rb

@@ -6,7 +6,6 @@ if prefer :apps4, 'rails-omniauth'
   prefs[:authorization] = 'none'
   prefs[:dashboard] = 'none'
   prefs[:better_errors] = true
-  prefs[:deployment] = 'none'
   prefs[:email] = 'none'
   prefs[:git] = true
   prefs[:local_env_file] = false

data/recipes/rails_signup_download.rb

@@ -5,7 +5,6 @@ if prefer :apps4, 'rails-signup-download'
   prefs[:authentication] = 'devise'
   prefs[:authorization] = 'roles'
   prefs[:better_errors] = true
-  prefs[:deployment] = 'none'
   prefs[:devise_modules] = false
   prefs[:form_builder] = false
   prefs[:git] = true

data/recipes/readme.rb

@@ -104,6 +104,15 @@ TEXT
   end
 
   create_file 'README.md', "#{app_name.humanize.titleize}\n================\n\n"
+
+  if prefer :deployment, 'heroku'
+    append_to_file 'README.md' do <<-TEXT
+[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
+
+TEXT
+    end
+  end
+
   append_to_file 'README.md' do <<-TEXT
 This application was generated with the [rails_apps_composer](https://github.com/RailsApps/rails_apps_composer) gem
 provided by the [RailsApps Project](http://railsapps.github.io/).

data/recipes/setup.rb

@@ -34,6 +34,7 @@ if prefs[:prod_webserver] == 'same'
 end
 
 ## Database Adapter
+prefs[:database] = "sqlite" if prefer :database, 'default'
 prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
   ["MySQL", "mysql"]] unless prefs.has_key? :database
 

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "3.0.17"
+  VERSION = "3.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.18
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n