rails_apps_composer 2.2.37 → 2.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f89a8b1eb3d99f59bf5db901aa0ae5eaf054bf
-  data.tar.gz: f18df817ab04d06ae6be2ffd9eec8575a0594d4b
+  metadata.gz: 9fd35af76a2a6ce148aa4fdd2a97cda5d6d87623
+  data.tar.gz: 07f247c0dce9d0ccc90d1d5f9d000f70ef5b030e
 SHA512:
-  metadata.gz: 12d7459a716bb887272dc210aeb8e33afd1e5e731f319c4925fd2da283ff3b8d93844bad06ba91f63468ad735fdd98d300f292cbe9ff4334368b377bc11d179c
-  data.tar.gz: dc8206469a13d3b6177207b0b261d1b0c0e34bdd5482042753395fdcaa26ef9bac19af5dd4c4a90bcdf3a14d73a263a62ed900ddc3d64f89dd0fe415f80f0ad2
+  metadata.gz: ce4aa2eb09969a01d968e6abc9500432f4e8dda844a9ddb3795d70e5f5b30db165d09fbc2fc865ffa00cc1b70f089efceafb041f5a9e7271a4f4d90056ec0dcd
+  data.tar.gz: 3176e5117da701bab5bccecb492ee9bd0abe73f01ddb017f5ec9afc42c573e745231e2f2cb508eeddc0f0c4c3e15d71fbd0d216510a8598e0472aa1568bcf741

data/README.textile

@@ -72,12 +72,13 @@ Here's how to generate a new Rails application using the Rails Composer tool and
 <pre>
 $ mkdir myapp
 $ cd myapp
-$ rvm use ruby-2.0.0@myapp --rvmrc --create
+$ rvm use ruby-2.0.0@myapp --ruby-version --create
+$ gem install rails
 $ gem install rails_apps_composer
 $ rails_apps_composer new . -r core
 </pre>
 
-You'll avoid conflicts with outdated gem versions by creating a new folder for your application, then creating a new RVM gemset, installing rails_apps_composer, and then using rails_apps_composer to create a new application.
+This approach avoids conflicts with outdated gem versions that may be active in your shell environment.
 
 h3. Troubleshooting
 

data/recipes/extras.rb

@@ -7,8 +7,12 @@ if File.exist?('.rvmrc')
   rvmrc_file = File.read('.rvmrc')
   rvmrc_detected = rvmrc_file.include? app_name
 end
+if File.exist?('.ruby-gemset')
+  rvmrc_file = File.read('.ruby-gemset')
+  rvmrc_detected = rvmrc_file.include? app_name
+end
 unless rvmrc_detected || prefs[:rvmrc]
-  prefs[:rvmrc] = yes_wizard? "Use or create a project-specific rvm gemset and .rvmrc?"
+  prefs[:rvmrc] = yes_wizard? "Use or create a project-specific rvm gemset?"
 end
 if prefs[:rvmrc]
   if which("rvm")
@@ -47,9 +51,16 @@ if prefs[:rvmrc]
       raise
     end
     run "rvm gemset list"
-    copy_from_repo '.rvmrc'
-    gsub_file '.rvmrc', /App_Name/, "#{app_name}"
-    gsub_file '.rvmrc', /-2.0.0/, "-#{RUBY_VERSION}"
+    if File.exist?('.ruby-version')
+      say_wizard ".ruby-version file already exists"
+    else
+      create_file '.ruby-version', "#{RUBY_VERSION}\n"
+    end
+    if File.exist?('.ruby-gemset')
+      say_wizard ".ruby-gemset file already exists"
+    else
+      create_file '.ruby-gemset', "#{app_name}\n"
+    end
   else
     say_wizard "WARNING! RVM does not appear to be available."
   end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.37"
+  VERSION = "2.2.38"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.37
+  version: 2.2.38
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n