rails_apps_composer 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b78cbb2b0aaf25d2504ad546a9b6aef6d291a4
-  data.tar.gz: f9f0be56ed436fe84f196b17eb9f9149131482c8
+  metadata.gz: 97d8113d3d1bea42b32172a4ec80da7104371d93
+  data.tar.gz: dde1c7158345a9e058e9fb3ad7e2d9675cbc9065
 SHA512:
-  metadata.gz: e2d89bad9e85e2cd9f8beb0ef8c12bf2925ed073b0eb45f10e79a1a40bd1f4f4cf8a78649198fa1f342ded8c800b6195fdf4349b22cdf5d85a691ce4db63ae6e
-  data.tar.gz: a0114b8a6749ce753c5801897c5b3008d9b405812138a234a5c1faa43d432b51d68e698f8bea6221606bf14b468970fbdc2145a863903c543db23355735c3295
+  metadata.gz: 77b28c8a85269f83849d59fe7e2b292e02c05c63c2c10ca1b6442241556df486daddb8be4ae967692490c626743f974cdaf76705f653750cd9720ce949623e7a
+  data.tar.gz: 7c8abdc3d88e5853e884b522353a44635112b384479b8ee24b28a98efad20342c8736fb3921a181686919f6508f89db432f155968aa1906b52da94da8ad3bd6d

data/lib/rails_wizard/command.rb

@@ -11,12 +11,17 @@ module RailsWizard
     method_option :no_default_recipes, :type => :boolean, :aliases => "-L"
     method_option :template_root, :type => :string, :aliases => '-t'
     method_option :quiet, :type => :boolean, :aliases => "-q", :default => false
+    method_option :verbose, :type => :boolean, :aliases => "-V", :default => false
     def new(name)
       add_recipes
       recipes, defaults = load_defaults
+      (print "\ndefaults: "; p defaults) if options[:verbose]
       args = ask_for_args(defaults)
+      (print "\nargs: "; p args) if options[:verbose]
       recipes = ask_for_recipes(recipes)
+      (print "\nrecipes: "; p recipes) if options[:verbose]
       gems = ask_for_gems(defaults)
+      (print "\ngems: "; p gems) if options[:verbose]
       run_template(name, recipes, gems, args, defaults, nil)
     end
 
@@ -27,6 +32,7 @@ module RailsWizard
     method_option :no_default_recipes, :type => :boolean, :aliases => "-L"
     method_option :template_root, :type => :string, :aliases => '-t'
     method_option :quiet, :type => :boolean, :aliases => "-q", :default => false
+    method_option :verbose, :type => :boolean, :aliases => "-V", :default => false
     def template(template_name)
       add_recipes
       recipes, defaults = load_defaults

data/recipes/extras.rb

@@ -11,7 +11,7 @@ if File.exist?('.ruby-gemset')
   rvmrc_file = File.read('.ruby-gemset')
   rvmrc_detected = rvmrc_file.include? app_name
 end
-unless rvmrc_detected || prefs[:rvmrc]
+unless rvmrc_detected || (prefs.has_key? :rvmrc)
   prefs[:rvmrc] = yes_wizard? "Use or create a project-specific rvm gemset?"
 end
 if prefs[:rvmrc]
@@ -91,7 +91,7 @@ end
 if prefs[:better_errors]
   say_wizard "recipe adding better_errors gem"
   add_gem 'better_errors', :group => :development
-  add_gem 'binding_of_caller', :group => :development, :platforms => [:mri_19, :rbx]
+  add_gem 'binding_of_caller', :group => :development, :platforms => [:mri_19, :mri_20, :rbx]
 end
 
 ## BAN SPIDERS

data/recipes/gems.rb

@@ -36,7 +36,11 @@ end
 unless prefer :database, 'default'
   gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
 end
-add_gem 'mongoid' if prefer :orm, 'mongoid'
+if rails_4?
+  add_gem 'mongoid', '~> 4', github: 'mongoid/mongoid' if prefer :orm, 'mongoid'
+else
+  add_gem 'mongoid' if prefer :orm, 'mongoid'
+end
 gsub_file 'Gemfile', /gem 'pg'.*/, ''
 add_gem 'pg' if prefer :database, 'postgresql'
 gsub_file 'Gemfile', /gem 'mysql2'.*/, ''
@@ -59,9 +63,13 @@ end
 if prefer :unit_test, 'rspec'
   add_gem 'rspec-rails', :group => [:development, :test]
   add_gem 'capybara', :group => :test if prefer :integration, 'rspec-capybara'
-  add_gem 'database_cleaner', :group => :test
+  add_gem 'database_cleaner', '1.0.1', :group => :test
   if prefer :orm, 'mongoid'
-    add_gem 'mongoid-rspec', :group => :test
+    if rails_4?
+      add_gem 'mongoid-rspec', '>= 1.6.0', github: 'evansagge/mongoid-rspec', :group => :test
+    else
+      add_gem 'mongoid-rspec', :group => :test
+    end
   end
   add_gem 'email_spec', :group => :test
 end
@@ -72,7 +80,7 @@ if prefer :unit_test, 'minitest'
 end
 if prefer :integration, 'cucumber'
   add_gem 'cucumber-rails', :group => :test, :require => false
-  add_gem 'database_cleaner', :group => :test unless prefer :unit_test, 'rspec'
+  add_gem 'database_cleaner', '1.0.1', :group => :test unless prefer :unit_test, 'rspec'
   add_gem 'launchy', :group => :test
   add_gem 'capybara', :group => :test
 end
@@ -200,8 +208,8 @@ after_bundler do
       gsub_file "config/database.yml", /database: myapp_production/,  "database: #{app_name}_production"
     end
     unless prefer :database, 'sqlite'
-      affirm = yes_wizard? "Drop any existing databases named #{app_name}?"
-      if affirm
+      if (prefs.has_key? :drop_database) ? prefs[:drop_database] :
+          (yes_wizard? "Drop any existing databases named #{app_name}?")
         run 'bundle exec rake db:drop'
       else
         raise "aborted at user's request"

data/recipes/railsapps.rb

@@ -1,6 +1,14 @@
 # Application template recipe for the rails_apps_composer. Change the recipe here:
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/railsapps.rb
 
+raise if (defined? defaults) || (defined? preferences) # Shouldn't happen.
+if options[:verbose]
+  print "\nrecipes: ";p recipes
+  print "\ngems: "   ;p gems
+  print "\nprefs: "  ;p prefs
+  print "\nconfig: " ;p config
+end
+
 case Rails::VERSION::MAJOR.to_s
 when "3"
   prefs[:railsapps] = multiple_choice "Install an example application for Rails 3.2?",
@@ -148,12 +156,20 @@ case prefs[:railsapps]
     prefs[:local_env_file] = true
     prefs[:better_errors] = true
     if prefer :git, true
-      prefs[:prelaunch_branch] = multiple_choice "Git branch for the prelaunch app?", [["wip (work-in-progress)", "wip"], ["master", "master"], ["prelaunch", "prelaunch"], ["staging", "staging"]]
-      if prefs[:prelaunch_branch] == 'master'
-        prefs[:main_branch] = multiple_choice "Git branch for the main app?", [["None", "none"], ["wip (work-in-progress)", "wip"], ["edge", "edge"]]
+      prefs[:prelaunch_branch] = multiple_choice "Git branch for the prelaunch app?",
+        [["wip (work-in-progress)", "wip"],
+        ["master", "master"],
+        ["prelaunch", "prelaunch"],
+        ["staging", "staging"]] unless prefs.has_key? :prelaunch_branch
+
+      prefs[:main_branch] = unless 'master' == prefs[:prelaunch_branch]
+        'master'
       else
-        prefs[:main_branch] = 'master'
-      end
+        multiple_choice "Git branch for the main app?",
+          [["None", "none"],
+          ["wip (work-in-progress)", "wip"],
+          ["edge", "edge"]]
+      end unless prefs.has_key? :main_branch
     end
   when 'rails3-bootstrap-devise-cancan'
     prefs[:git] = true

data/templates/layout.erb

@@ -205,13 +205,13 @@ say_wizard "importing html2haml and haml2slim conversion tools"
   require 'html2haml'
   require 'haml2slim'
 end
-@after_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; b[1].call}
+@after_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; puts @current_recipe; b[1].call}
 
 # >-----------------------------[ Run 'After Everything' Callbacks ]-------------------------------<
 
 @current_recipe = nil
 say_wizard "Running 'after everything' callbacks."
-@after_everything_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; b[1].call}
+@after_everything_blocks.each{|b| config = @configs[b[0]] || {}; @current_recipe = b[0]; puts @current_recipe; b[1].call}
 
 @current_recipe = nil
 if diagnostics[:recipes] == 'success'

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.5"
+  VERSION = "2.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails_apps_composer
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.