rails_apps_composer 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a0c74d9603462a9ad2da976aba6ecf894e1d9b
-  data.tar.gz: 2cd272a7a88382cd4824e6bd1f1e158ad9012d7a
+  metadata.gz: 703f1e12b7cfe4cf6d49748ba045d22573ec9b80
+  data.tar.gz: 3cb586ef0b76e4fe8b5ab0bd5f6bcb27c055f4f3
 SHA512:
-  metadata.gz: b807db8f0b4c6b1ccd4eb2eca534b28acb5352b90c5ca05c8964c8bbf47003269d1b53bdf986d6005494c404e733d79655c8a9c96a081c331b2a366b038b0a73
-  data.tar.gz: ae00741e66fcdf9bdb2abb96edd210f6eaa35770384de4ca11d3e300a57c22c3a6389dc7aa40c60fe2cd7bf2a1c6c93d22f760621f1a2681d99df93b4f14b21d
+  metadata.gz: 961e8aeef87c3190ead0d24aa6bdb17ec9b32e1f54b403c3c59a9e63af8054a49f7d45ec92506cfb6d5d6c64bcaaff03b5eaea16965de64367c851b8288964ff
+  data.tar.gz: 0439cbed49d83a38c75d670bd8ae5d79d4668e483745bc176db812f5ead8de035b85a59dfabc2e5278847763d169016de7538d2e03870651b22f34149dd007ca

data/README.textile

@@ -54,9 +54,7 @@ h2. Dependencies
 Before using the rails_apps_composer gem, you will need:
 
 * The Ruby language (version 2.0.0)
-* Rails 3.2
-
-Rails 4.0.0 will not work due to an unresolved "issue involving a minitest gem version conflict":https://github.com/RailsApps/rails_apps_composer/issues/220.
+* Rails 3.2 or Rails 4.0
 
 The rails_apps_composer program uses the version of Rails that is currently installed when you launch the program. If you want to use the newest Rails version, upgrade before running rails_apps_composer.
 
@@ -70,7 +68,7 @@ h2. Installation and Usage
 
 I recommend installing and using RVM, the "Ruby Version Manager":https://rvm.io/, to create a new gemset for rails_apps_composer. Using an RVM gemset will make it easier to identify and isolate incompatibilities among gems. RVM will install Ruby and set up a global gemset with a minimal set of gems.
 
-Here's how to generate a new Rails application using the Rails Composer tool and RVM:
+Here's how to generate a new Rails application using rails_apps_composer and RVM:
 
 <pre>
 $ mkdir myapp

data/recipes/apps4.rb

@@ -1,14 +1,21 @@
 # Application template recipe for the rails_apps_composer. Change the recipe here:
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/apps4.rb
 
-if prefer :apps4, 'simple-test'
-  after_everything do
-    say_wizard "recipe running after 'bundle install'"
-  end # after_bundler
-end # simple-test
-
 if prefer :apps4, 'learn-rails'
 
+  # >-------------------------------[ Gems ]--------------------------------<
+
+  add_gem 'activerecord-tableless'
+  add_gem 'high_voltage'
+  add_gem 'gibbon'
+  gsub_file 'Gemfile', /gem 'sqlite3'\n/, ''
+  add_gem 'sqlite3', :group => :development
+  add_gem 'pg', :group => :production
+  add_gem 'thin', :group => :production
+  add_gem 'rails_on_heroku', :group => :production
+
+  # >-------------------------------[ after_everything ]--------------------------------<
+
   after_everything do
     say_wizard "recipe running after 'bundle install'"
     repo = 'https://raw.github.com/RailsApps/learn-rails/master/'
@@ -27,17 +34,6 @@ if prefer :apps4, 'learn-rails'
     git :add => '-A' if prefer :git, true
     git :commit => '-qm "rails_apps_composer: clean up starter app"' if prefer :git, true
 
-    # >-------------------------------[ Gems ]--------------------------------<
-
-    add_gem 'activerecord-tableless'
-    add_gem 'high_voltage'
-    add_gem 'gibbon'
-    gsub_file 'Gemfile', /gem 'sqlite3'\n/, ''
-    add_gem 'sqlite3', :group => :development
-    add_gem 'pg', :group => :production
-    add_gem 'thin', :group => :production
-    add_gem 'rails_on_heroku', :group => :production
-
     # >-------------------------------[ Models ]--------------------------------<
 
     copy_from_repo 'app/models/contact.rb', :repo => repo

data/recipes/core.rb

@@ -10,5 +10,5 @@ name: core
 description: "Select all core recipes."
 author: RailsApps
 
-requires: [git, railsapps, setup, readme, gems, testing, email, models, controllers, views, routes, frontend, init, prelaunch, saas, extras]
+requires: [git, railsapps, setup, readme, gems, testing, email, models, controllers, views, routes, frontend, init, apps4, prelaunch, saas, extras]
 category: collections

data/recipes/gems.rb

@@ -4,7 +4,7 @@
 ### GEMFILE ###
 
 ## Ruby on Rails
-insert_into_file('Gemfile', "ruby '#{RUBY_VERSION}'\n", :before => /^ *gem 'rails'/, :force => false) if prefer :deploy, 'heroku'
+insert_into_file('Gemfile', "ruby '#{RUBY_VERSION}'\n", :before => /^ *gem 'rails'/, :force => false)
 
 ## Web Server
 if (prefs[:dev_webserver] == prefs[:prod_webserver])

data/recipes/railsapps.rb

@@ -14,13 +14,12 @@ when "3"
     ["rails3-subdomains", "rails3-subdomains"]] unless prefs.has_key? :railsapps
 when "4"
   prefs[:apps4] = multiple_choice "Install an example application for Rails 4.0?",
-    [["simple-test", "simple-test"],
-    ["I want to build my own application", "none"],
-    ["Build a RailsApps starter application", "railsapps"],
-    ["Build a contributed application", "contributed_app"]] unless prefs.has_key? :apps4
+    [["Build a RailsApps starter application", "railsapps"],
+    ["Build a contributed application", "contributed_app"],
+    ["I want to build my own application", "none"]] unless prefs.has_key? :apps4
   case prefs[:apps4]
     when 'railsapps'
-      prefs[:apps4] = multiple_choice "Only one starter app is currently available.",
+      prefs[:apps4] = multiple_choice "One starter app is available for Rails 4.0. More to come.",
         [["learn-rails", "learn-rails"]]
     when 'contributed_app'
       prefs[:apps4] = multiple_choice "No contributed applications are available.",

data/templates/layout.erb

@@ -133,7 +133,7 @@ when "3"
     raise StandardError.new "Rails #{Rails::VERSION::STRING} is not supported. Try 3.1 or newer."
   end
 when "4"
-  say_wizard "\033[1m\033[36m" + "WARNING! See GitHub for issues with Rails #{Rails::VERSION::STRING}." + "\033[0m"
+  say_wizard "You are using Rails version #{Rails::VERSION::STRING}."
 else
   say_wizard "You are using Rails version #{Rails::VERSION::STRING} which is not supported. Try 3.1 or newer."
   raise StandardError.new "Rails #{Rails::VERSION::STRING} is not supported. Try 3.1 or newer."

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.3.2"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n