rails_apps_composer 2.2.10 → 2.2.11

data/README.textile

@@ -32,28 +32,7 @@ h2. What's New
 
 See the "CHANGELOG":https://github.com/RailsApps/rails_apps_composer/blob/master/CHANGELOG.textile for details.
 
-h3. Version 2.1
-
-* optional local recipes
-
-h3. Version 2.0
-
-* the "Guide":http://railsapps.github.com/tutorial-rails-apps-composer.html provides complete documentation
-* diagnostics compare your selected recipes and preferences to known working combinations
-* the generated application README.textile file provides a diagnostics report
-* an improved "quiz" sets preferences
-* a new preferences hash makes preferences available to all recipes
-* recipes and preferences can be set in a defaults file
-* gems can be added at a prompt or from a defaults file (no need to write a recipe for many gems)
-* a new 'copy_from_repo' method adds powerful downloading of files to any recipe
-* downloading of files from the example app repos reduces the complexity of recipes
-* the 'copy_from_repo' method converts ERB files to Haml or Slim 
-* recipes have been reorganized for easier maintenance
-* recipes are based on functionality (e.g., authentication, testing) instead of gems (Devise, RSpec)
-* a prompt sets -T or -O args when generating an application
-* the 'extras' recipe creates a project-specific gemset and .rvmrc file
-
-Most important, many unsupported or outdated recipes have been removed. If your favorite recipe is missing, please update it and test it with version 2.0, then submit a pull request. I'm happy to add new recipes.
+If your favorite recipe is missing, please fork the repo, add the recipe and test it, then submit a pull request. I'm happy to add new recipes.
 
 h2. Who This Is For
 
@@ -196,6 +175,8 @@ Choose the _core_ recipe if you are not sure which recipes to select.
 
 You can specify any gem. Any string you enter will be added as a gem in the starter app Gemfile.
 
+If you want to skip the prompts asking which recipe or gem you'd like to add, use the "quiet flag" parameter on the command line by adding @-q@.
+
 h3. Generate an Application from a List of Recipes
 
 Provide a list of recipes using the @-r@ flag. In this example, the _core_ recipe selects all available core recipes:
@@ -211,7 +192,7 @@ Generating basic application, using:
 "rails new myapp -m <temp_file>"
 </pre>
 
-The program will prompt you for your preferences before generating an application.
+The program will prompt you for your preferences before generating an application (unless you set the "quiet flag" @-q@).
 
 h3. Generate an Application from Defaults
 
@@ -223,6 +204,12 @@ $ rails_apps_composer new myapp -d my_defaults.yaml
 
 Use the @my_defaults.yaml@ file to specify a list of recipes, preferences, and extra gems. You can use any name (and file extension) for the file. See the "Defaults File":http://railsapps.github.com/tutorial-rails-apps-composer.html#Defaults section in the Guide concerning the format of the defaults file.
 
+Use the "quiet flag" @-q@ if you want to skip all prompts:
+
+<pre>
+$ rails_apps_composer new myapp -q -d my_defaults.yaml
+</pre>
+
 h3. Generate an Application Template Interactively
 
 You may want an application template to share with others. For an example, see the "Rails Composer":http://railsapps.github.com/rails-composer/ project which is an application template generated from the rails_apps_composer core recipes.
@@ -262,7 +249,7 @@ Generating and saving application template...
 Done.
 </pre>
 
-The command with the @template@ argument followed by a filename and a list of recipes generates an application template.
+The command with the @template@ argument followed by a filename and a list of recipes generates an application template. Use the "quiet flag" @-q@ if you want to skip all prompts.
 
 h3. Generate an Application Template from Defaults
 
@@ -272,7 +259,7 @@ Generate an application template using a defaults file and the @-d@ flag:
 $ rails_apps_composer template ~/Desktop/template.rb -d my_defaults.yaml
 </pre>
 
-Use the @my_defaults.yaml@ file to specify a list of recipes, preferences, and extra gems. You can use any name (and file extension) for the file. See the "Defaults File":http://railsapps.github.com/tutorial-rails-apps-composer.html#Defaults section in the Guide concerning the format of the defaults file.
+Use the @my_defaults.yaml@ file to specify a list of recipes, preferences, and extra gems. You can use any name (and file extension) for the file. See the "Defaults File":http://railsapps.github.com/tutorial-rails-apps-composer.html#Defaults section in the Guide concerning the format of the defaults file. Use the "quiet flag" @-q@ if you want to skip all prompts.
 
 h3. Generate an Application from a Template
 

data/lib/rails_wizard/command.rb

@@ -8,6 +8,7 @@ module RailsWizard
     method_option :recipes, :type => :array, :aliases => "-r"
     method_option :defaults, :type => :string, :aliases => "-d"
     method_option :recipe_dirs, :type => :array, :aliases => "-l"
+    method_option :quiet, :type => :boolean, :aliases => "-q", :default => false
     def new(name)
       add_recipes
       recipes, defaults = load_defaults
@@ -21,6 +22,7 @@ module RailsWizard
     method_option :recipes, :type => :array, :aliases => "-r"
     method_option :defaults, :type => :string, :aliases => "-d"
     method_option :recipe_dirs, :type => :array, :aliases => "-l"
+    method_option :quiet, :type => :boolean, :aliases => "-q", :default => false
     def template(template_name)
       add_recipes
       recipes, defaults = load_defaults
@@ -83,6 +85,8 @@ module RailsWizard
       def ask_for_recipes(recipes)
         if options[:recipes]
           return recipes + options[:recipes]
+        elsif options[:quiet]
+          return recipes
         end
         while recipe = ask("#{print_recipes(recipes)}#{bold}Which recipe would you like to add? #{clear}#{yellow}(blank to finish)#{clear}")
           if recipe == ''
@@ -101,11 +105,13 @@ module RailsWizard
 
       def ask_for_gems(defaults)
         gems = defaults["gems"] || []
-        while getgem = ask("#{bold}What gem would you like to add? #{clear}#{yellow}(blank to finish)#{clear}")
-          if getgem == ''
-            break
-          else
-            gems << getgem.downcase
+        unless options[:quiet]
+          while getgem = ask("#{bold}What gem would you like to add? #{clear}#{yellow}(blank to finish)#{clear}")
+            if getgem == ''
+              break
+            else
+              gems << getgem.downcase
+            end
           end
         end
         gems

data/recipes/controllers.rb

@@ -48,7 +48,7 @@ RUBY
   copy_from_repo 'app/controllers/profiles_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains_app'
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: controllers'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: controllers"' if prefer :git, true
 end # after_bundler
 
 __END__

data/recipes/email.rb

@@ -88,7 +88,7 @@ TEXT
     end
     ### GIT
     git :add => '-A' if prefer :git, true
-    git :commit => "-qm 'rails_apps_composer: set email accounts'" if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: set email accounts"' if prefer :git, true
 end # after_bundler
 
 __END__

data/recipes/extras.rb

@@ -87,11 +87,14 @@ after_everything do
   gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"
   # GIT
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: extras'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: extras"' if prefer :git, true
 end
 
 ## GITHUB
 if config['github']
+  prefs[:github] = true
+end
+if prefs[:github]
   gem 'hub', '>= 1.10.2', :require => nil, :group => [:development]
   after_everything do
     say_wizard "recipe creating GitHub repository"

data/recipes/frontend.rb

@@ -52,7 +52,7 @@ RUBY
   remove_file 'app/assets/stylesheets/application.css'
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: front-end framework'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: front-end framework"' if prefer :git, true
 end # after_bundler
 
 __END__

data/recipes/gems.rb

@@ -114,7 +114,7 @@ end
 
 ## Git
 git :add => '-A' if prefer :git, true
-git :commit => "-qm 'rails_apps_composer: Gemfile'" if prefer :git, true
+git :commit => '-qm "rails_apps_composer: Gemfile"' if prefer :git, true
 
 ### CREATE DATABASE ###
 after_bundler do
@@ -138,6 +138,9 @@ after_bundler do
     rescue StandardError => e
       raise "unable to create a user for PostgreSQL, reason: #{e}"
     end
+    gsub_file "config/database.yml", /database: myapp_development/, "database: #{app_name}_development"
+    gsub_file "config/database.yml", /database: myapp_test/,        "database: #{app_name}_test"
+    gsub_file "config/database.yml", /database: myapp_production/,  "database: #{app_name}_production"
   end
   if prefer :database, 'mysql'
     mysql_username = ask_wizard("Username for MySQL? (leave blank to use the app name)")
@@ -166,7 +169,7 @@ after_bundler do
   run 'bundle exec rake db:create' if prefer :orm, 'mongoid'
   ## Git
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: create database'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: create database"' if prefer :git, true
 end # after_bundler
 
 ### GENERATORS ###
@@ -185,7 +188,7 @@ after_bundler do
   end
   ## Git
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: generators'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: generators"' if prefer :git, true
 end # after_bundler
 
 __END__

data/recipes/git.rb

@@ -8,7 +8,7 @@ if prefer :git, true
   copy_from 'https://raw.github.com/RailsApps/rails-composer/master/files/gitignore.txt', '.gitignore'
   git :init
   git :add => '-A'
-  git :commit => "-qm 'rails_apps_composer: initial commit'"
+  git :commit => '-qm "rails_apps_composer: initial commit"'
 end
 
 __END__

data/recipes/init.rb

@@ -59,7 +59,7 @@ FILE
   run 'bundle exec rake db:seed'
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: set up database'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: set up database"' if prefer :git, true
 end # after_everything
 
 __END__

data/recipes/models.rb

@@ -90,7 +90,7 @@ RUBY
   end
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: models'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: models"' if prefer :git, true
 end # after_bundler
 
 __END__

data/recipes/prelaunch.rb

@@ -22,7 +22,7 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"
     # GIT
     git :add => '-A' if prefer :git, true
-    git :commit => "-qm 'rails_apps_composer: clean up starter app'" if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: clean up starter app"' if prefer :git, true
 
     # >-------------------------------[ Create a git branch ]--------------------------------<
     if prefer :git, true
@@ -105,7 +105,7 @@ if prefer :railsapps, 'rails-prelaunch-signup'
     
     ### GIT ###
     git :add => '-A' if prefer :git, true
-    git :commit => "-qm 'rails_apps_composer: prelaunch app'" if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: prelaunch app"' if prefer :git, true
   end # after_bundler
 end # rails-prelaunch-signup
 

data/recipes/readme.rb

@@ -72,7 +72,7 @@ after_everything do
   gsub_file "README.textile", /Authorization: None/, "Authorization: CanCan" if prefer :authorization, 'cancan'
 
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: add README files'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: add README files"' if prefer :git, true
   
 end # after_everything
 

data/recipes/routes.rb

@@ -22,7 +22,7 @@ after_bundler do
   gsub_file 'config/routes.rb', /^.*.routes.draw do/, "#{app_const}.routes.draw do"
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: routes'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: routes"' if prefer :git, true
 end # after_bundler
 
 __END__

data/recipes/testing.rb

@@ -87,7 +87,7 @@ RUBY
   end
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: testing framework'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: testing framework"' if prefer :git, true
 end # after_bundler
 
 after_everything do
@@ -145,7 +145,7 @@ after_everything do
     end
     ## GIT
     git :add => '-A' if prefer :git, true
-    git :commit => "-qm 'rails_apps_composer: rspec files'" if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: rspec files"' if prefer :git, true
   end
   ### CUCUMBER ###
   if prefer :integration, 'cucumber'
@@ -215,7 +215,7 @@ RUBY
     end
     ## GIT
     git :add => '-A' if prefer :git, true
-    git :commit => "-qm 'rails_apps_composer: cucumber files'" if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: cucumber files"' if prefer :git, true
   end
 end # after_everything 
   

data/recipes/views.rb

@@ -25,7 +25,7 @@ after_bundler do
   copy_from_repo 'app/views/profiles/show-subdomains_app.html.erb', :prefs => 'subdomains_app'
   ### GIT ###
   git :add => '-A' if prefer :git, true
-  git :commit => "-qm 'rails_apps_composer: views'" if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: views"' if prefer :git, true
 end # after_bundler
 
 __END__

data/templates/helpers.erb

@@ -31,9 +31,9 @@ def no_wizard?(question); !yes_wizard?(question) end
 def multiple_choice(question, choices)
   say_custom('question', question)
   values = {}
-  choices.each_with_index do |choice,i| 
+  choices.each_with_index do |choice,i|
     values[(i + 1).to_s] = choice[1]
-    say_custom (i + 1).to_s + ')', choice[0]
+    say_custom( (i + 1).to_s + ')', choice[0] )
   end
   answer = ask_wizard("Enter your selection:") while !values.keys.include?(answer)
   values[answer]

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.10"
+  VERSION = "2.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1318389471776458398
+      hash: 1592200544975630112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1318389471776458398
+      hash: 1592200544975630112
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24