rails_apps_composer 3.0.28 → 3.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b136ac931733ffbc75804617d6d20f5ea83018
-  data.tar.gz: d9364ad519af686457d354e13f5375acf959d174
+  metadata.gz: f9ef1e6a4da898ff7d54cb4f6dc2704c3d31fd66
+  data.tar.gz: 148bf7456bb51fd0f10f0d630ba2e2ce09d3c659
 SHA512:
-  metadata.gz: 293e1a9c4019e3750c432754f14228c1bc57b3762491f4a4a1085bd14203b19b25bdf89208f47d73877db28b25e96a6c5c7734f64db73e9e57b13c99523c74d7
-  data.tar.gz: 2d5d798ec1e3ac7b2384dc9de699a46da201ac5aed0a64a8b0c4062b3fcca671aacf7182ef221a30b720edefeb990bb5e9051f042bd67fb960d79575ae5f036d
+  metadata.gz: a3689ccb5f1776afedcba0d35b97dcc2cc60c1b8cd3c04c8ba846b78722e353e07be8ee8b8f0ea85a5f827ea53ee7a0927485312e0af5b42f205d82b98bacb4f
+  data.tar.gz: c01d3c0ffb22815cc662805cbb9183670b23b029ef1393c2f34735d44a6a8fb042d2fcf66cc9ab1951740cc309c4f6a4835ccf7158f5c247bae4bf1856ac658e

data/recipes/extras.rb

@@ -120,6 +120,16 @@ if prefs[:pry]
   add_gem 'pry-rescue', :group => [:development, :test]
 end
 
+## Rubocop
+if config['rubocop']
+  prefs[:rubocop] = true
+end
+if prefs[:rubocop]
+  say_wizard "recipe adding rubocop gem and basic .rubocop.yml"
+  add_gem 'rubocop', :group => [:development, :test]
+  copy_from_repo '.rubocop.yml'
+end
+
 ## BAN SPIDERS
 if config['ban_spiders']
   prefs[:ban_spiders] = true
@@ -222,3 +232,6 @@ config:
   - pry:
       type: boolean
       prompt: Use 'pry' as console replacement during development and test?
+  - rubocop:
+      type: boolean
+      prompt: Use 'rubocop' to ensure that your code conforms to the Ruby style guide?

data/recipes/gems.rb

@@ -8,8 +8,12 @@ insert_into_file('Gemfile', "ruby '#{RUBY_VERSION}'\n", :before => /^ *gem 'rail
 
 ## Cleanup
 # remove the 'sdoc' gem
-gsub_file 'Gemfile', /group :doc do/, ''
-gsub_file 'Gemfile', /\s*gem 'sdoc', require: false\nend/, ''
+if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+  gsub_file 'Gemfile', /gem 'sdoc',\s+'~> 0.4.0',\s+group: :doc/, ''
+else
+  gsub_file 'Gemfile', /group :doc do/, ''
+  gsub_file 'Gemfile', /\s*gem 'sdoc', require: false\nend/, ''
+end
 
 ## Web Server
 if (prefs[:dev_webserver] == prefs[:prod_webserver])

data/recipes/readme.rb

@@ -126,7 +126,7 @@ Need help? Ask on Stack Overflow with the tag 'railsapps.'
 
 Your application contains diagnostics in the README file. Please provide a copy of the README file when reporting any issues.
 
-If the application doesn’t work as expected, please [report an issue](https://github.com/RailsApps/rails_apps_composer/issues)
+If the application doesn't work as expected, please [report an issue](https://github.com/RailsApps/rails_apps_composer/issues)
 and include the diagnostics.
 
 Ruby on Rails

data/recipes/setup.rb

@@ -18,20 +18,7 @@ prefs[:dev_webserver] = multiple_choice "Web server for development?", [["WEBric
 prefs[:prod_webserver] = multiple_choice "Web server for production?", [["Same as development", "same"],
   ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"], ["Phusion Passenger (Apache/Nginx)", "passenger"],
   ["Phusion Passenger (Standalone)", "passenger_standalone"]] unless prefs.has_key? :prod_webserver
-if prefs[:prod_webserver] == 'same'
-  case prefs[:dev_webserver]
-    when 'thin'
-      prefs[:prod_webserver] = 'thin'
-    when 'unicorn'
-      prefs[:prod_webserver] = 'unicorn'
-    when 'puma'
-      prefs[:prod_webserver] = 'puma'
-    when 'passenger'
-      prefs[:prod_webserver] = 'passenger'
-    when 'passenger_standalone'
-      prefs[:prod_webserver] = 'passenger_standalone'
-  end
-end
+prefs[:prod_webserver] = prefs[:dev_webserver] if prefs[:prod_webserver] == 'same'
 
 ## Database Adapter
 prefs[:database] = "sqlite" if prefer :database, 'default'

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "3.0.28"
+  VERSION = "3.0.29"
 end

metadata

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