rails_apps_composer 2.1.0 → 2.1.1

data/README.textile

@@ -34,7 +34,7 @@ See the "CHANGELOG":https://github.com/RailsApps/rails_apps_composer/blob/master
 
 h3. Version 2.1
 
-* use local recipes
+* optional local recipes
 
 h3. Version 2.0
 
@@ -97,11 +97,13 @@ auth           # Add authentication and authorization.
 controllers    # Add controllers needed for starter apps.
 database       # Set up and initialize database.
 email          # Configure email accounts.
+example        # Example of a recipe
 extras         # Various extras.
 frontend       # Install a front-end framework for HTML5 and CSS.
 gems           # Add the gems your application needs.
+git            # Initialize git for your application.
 models         # Add models needed for starter apps.
-prelaunch      # Generates a Prelaunch Signup App
+railsapps      # Install RailsApps example applications.
 readme         # Build a README file for your application.
 routes         # Add routes needed for starter apps.
 setup          # Make choices for your application.
@@ -135,6 +137,18 @@ When you generate an application template, you will not be asked if you want to
 
 Any recipe can set the @-T@ or @-O@ arguments using the @args@ directive. However, this has no affect on application templates and is only useful when an application is generated interactively.
 
+h3. Using Local Recipes
+
+You can use local recipes you've created yourself by using the @-l@ flag and supplying the name of a directory that contains local recipes. The @-l@ flag can be combined with any other command so you can create applications or application templates, interactively or from a defaults file.
+
+For example, generate an application interactively using local recipes:
+
+<pre>
+$ rails_apps_composer new myapp -l ~/recipes/
+</pre>
+
+If you create local recipes, please consider contributing them to the project.
+
 h3. Generate an Application Interactively
 
 You'll be prompted for recipes and gems:
@@ -146,9 +160,8 @@ Would you like to skip Test::Unit? (yes for RSpec) (y/n)
 Would you like to skip Active Record? (yes for NoSQL) (y/n)
 
 Available Recipes:
-apps: prelaunch
 auth: auth
-configuration: email, gems, readme, setup
+configuration: email, gems, git, railsapps, readme, setup
 example: example
 frontend: frontend
 initialize: database
@@ -169,10 +182,10 @@ You can specify any gem. Any string you enter will be added as a gem in the star
 
 h3. Generate an Application from a List of Recipes
 
-Provide a list of recipes:
+Provide a list of recipes using the @-r@ flag:
 
 <pre>
-$ rails_apps_composer new myapp -r setup readme gems testing auth email models controllers views routes frontend database extras
+$ rails_apps_composer new myapp -r git setup readme gems testing auth email models controllers views routes frontend database extras
 
 Would you like to skip Test::Unit? (yes for RSpec) (y/n)
 Would you like to skip Active Record? (yes for NoSQL) (y/n)
@@ -186,13 +199,13 @@ The program will prompt you for your preferences before generating an applicatio
 
 h3. Generate an Application from Defaults
 
-Use a defaults file for recipes, preferences, and extra gems so you don't have to provide them interactively. Then generate an application with:
+Use a defaults file for recipes, preferences, and extra gems so you don't have to provide them interactively. Then generate an application using the @-d@ flag:
 
 <pre>
-$ rails_apps_composer new myapp --defaults=my_defaults.yaml
+$ rails_apps_composer new myapp -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 to learn about 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 below concerning the format of the defaults file.
 
 h3. Generate an Application Template Interactively
 
@@ -204,9 +217,8 @@ Specify a filename for the template:
 $ rails_apps_composer template ~/Desktop/template.rb
 
 Available Recipes:
-apps: prelaunch
 auth: auth
-configuration: email, gems, readme, setup
+configuration: email, gems, git, railsapps, readme, setup
 example: example
 frontend: frontend
 initialize: database
@@ -227,7 +239,7 @@ h3. Generate an Application Template from a List of Recipes
 Specify a filename for the template and provide a list of recipes:
 
 <pre>
-$ rails_apps_composer template ~/Desktop/template.rb -r setup readme gems testing auth email models controllers views routes frontend database extras
+$ rails_apps_composer template ~/Desktop/template.rb -r git setup readme gems testing auth email models controllers views routes frontend database extras
 
 What gem would you like to add? (blank to finish)
 Generating and saving application template...
@@ -238,13 +250,13 @@ The command with the @template@ argument followed by a filename and a list of re
 
 h3. Generate an Application Template from Defaults
 
-Generate an application template using a defaults file:
+Generate an application template using a defaults file and the @-d@ flag:
 
 <pre>
-$ rails_apps_composer template ~/Desktop/template.rb --defaults=my_defaults.yaml
+$ 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 to learn about 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 below concerning the format of the defaults file.
 
 h3. Generate an Application from a Template
 

data/lib/rails_wizard/diagnostics.rb

@@ -1,16 +1,31 @@
 module RailsWizard
   module Diagnostics
-    # collections of recipes that are known to work together
+    
+    ### collections of recipes that are known to work together
     @@recipes = []
-    @@recipes << ["example"]
-    @@recipes << ["setup"]
-    @@recipes << ["gems", "setup"]
-    @@recipes << ["gems", "readme", "setup"]
-    @@recipes << ["extras", "gems", "readme", "setup"]
+    @@recipes << %w(example)
+    @@recipes << %w(setup)
+    @@recipes << %w(railsapps)
+    @@recipes << %w(gems setup)
+    @@recipes << %w(gems readme setup)
+    @@recipes << %w(extras gems readme setup)
+    @@recipes << %w(example git)
+    @@recipes << %w(git setup)
+    @@recipes << %w(git railsapps)
+    @@recipes << %w(gems git setup)
+    @@recipes << %w(gems git readme setup)
+    @@recipes << %w(extras gems git readme setup)
+    @@recipes << %w(auth controllers database email extras frontend gems git models railsapps readme routes setup testing views)
+    @@recipes << %w(auth controllers database email example extras frontend gems git models railsapps readme routes setup testing views)
 
-    # collections of preferences that are known to work together
+    ### collections of preferences that are known to work together
     @@prefs = []
-    @@prefs << {:database=>"sqlite", :templates=>"erb"}
+    @@prefs << {:railsapps=>"rails3-bootstrap-devise-cancan", :database=>"sqlite", :templates=>"erb", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"factory_girl", :frontend=>"bootstrap", :bootstrap=>"sass", :email=>"gmail", :authentication=>"devise", :devise_modules=>"default", :authorization=>"cancan", :starter_app=>"admin_app", :form_builder=>"none"}
+    @@prefs << {:railsapps=>"rails3-devise-rspec-cucumber", :database=>"sqlite", :templates=>"erb", :unit_test=>"rspec", :integration=>"cucumber", :fixtures=>"factory_girl", :frontend=>"none", :email=>"gmail", :authentication=>"devise", :devise_modules=>"default", :authorization=>"none", :starter_app=>"users_app", :form_builder=>"none"}
+    @@prefs << {:railsapps=>"rails3-mongoid-devise", :database=>'mongodb', :orm=>'mongoid', :templates=>'erb', :unit_test=>'rspec', :integration=>'cucumber', :fixtures=>'factory_girl', :frontend=>'none', :email=>'gmail', :authentication=>'devise', :devise_modules=>'default', :authorization=>'none', :starter_app=>'users_app', :form_builder=>'none'}
+    @@prefs << {:railsapps=>"rails3-mongoid-omniauth", :database=>'mongodb', :orm=>'mongoid', :templates=>'erb', :unit_test=>'rspec', :integration=>'cucumber', :fixtures=>'factory_girl', :frontend=>'none', :email=>'none', :authentication=>'omniauth', :omniauth_provider=>'twitter', :authorization=>'none', :starter_app=>'users_app', :form_builder=>'none'}
+    @@prefs << {:railsapps=>"rails3-subdomains", :database=>'mongodb', :orm=>'mongoid', :templates=>'haml', :unit_test=>'rspec', :integration=>'cucumber', :fixtures=>'factory_girl', :frontend=>'none', :email=>'gmail', :authentication=>'devise', :devise_modules=>'default', :authorization=>'none', :starter_app=>'subdomains_app', :form_builder=>'none'}
+
     def self.recipes
       @@recipes
     end

data/recipes/frontend.rb

@@ -14,8 +14,8 @@ after_bundler do
   copy_from_repo 'app/views/layouts/_navigation-omniauth.html.erb', :prefs => 'omniauth'
   copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'  
   ## APPLICATION NAME
-  application_layout_file = 'app/views/layouts/application.html.erb'
-  navigation_partial_file = 'app/views/layouts/_navigation.html.erb'
+  application_layout_file = Dir['app/views/layouts/application.html.*'].first
+  navigation_partial_file = Dir['app/views/layouts/_navigation.html.*'].first
   gsub_file application_layout_file, /App_Name/, "#{app_name.humanize.titleize}"
   gsub_file navigation_partial_file, /App_Name/, "#{app_name.humanize.titleize}"
   ### CSS ###

data/recipes/git.rb

@@ -0,0 +1,25 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/git.rb
+
+## Git
+say_wizard "initialize git"
+prefs[:git] = true unless prefs.has_key? :git
+if prefer :git, true
+  begin
+    remove_file '.gitignore'
+    get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/gitignore.txt', '.gitignore'
+  rescue OpenURI::HTTPError
+    say_wizard "Unable to obtain gitignore file from the repo"
+  end
+  git :init
+  git :add => '.'
+  git :commit => "-aqm 'rails_apps_composer: initial commit'"
+end
+
+__END__
+
+name: git
+description: "Initialize git for your application."
+author: RailsApps
+
+category: configuration

data/recipes/railsapps.rb

@@ -0,0 +1,92 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/railsapps.rb
+
+prefs[:railsapps] = multiple_choice "Install an example application?", 
+  [["No, let me build my own application", "none"], 
+  ["rails3-devise-rspec-cucumber", "rails3-devise-rspec-cucumber"], 
+  ["rails3-bootstrap-devise-cancan", "rails3-bootstrap-devise-cancan"], 
+  ["rails3-mongoid-devise", "rails3-mongoid-devise"],
+  ["rails3-mongoid-omniauth", "rails3-mongoid-omniauth"],
+  ["rails3-subdomains", "rails3-subdomains"]] unless prefs.has_key? :railsapps
+
+case prefs[:railsapps]
+  when 'rails3-devise-rspec-cucumber'
+    prefs[:database] = 'sqlite'
+    prefs[:templates] = 'erb'
+    prefs[:unit_test] = 'rspec'
+    prefs[:integration] = 'cucumber'
+    prefs[:fixtures] = 'factory_girl'
+    prefs[:frontend] = 'none'
+    prefs[:email] = 'gmail'
+    prefs[:authentication] = 'devise'
+    prefs[:devise_modules] = 'default'
+    prefs[:authorization] = 'none'
+    prefs[:starter_app] = 'users_app'
+    prefs[:form_builder] = 'none'
+  when 'rails3-bootstrap-devise-cancan'
+    prefs[:database] = 'sqlite'
+    prefs[:templates] = 'erb'
+    prefs[:unit_test] = 'rspec'
+    prefs[:integration] = 'cucumber'
+    prefs[:fixtures] = 'factory_girl'
+    prefs[:frontend] = 'bootstrap'
+    prefs[:bootstrap] = 'sass'
+    prefs[:email] = 'gmail'
+    prefs[:authentication] = 'devise'
+    prefs[:devise_modules] = 'default'
+    prefs[:authorization] = 'cancan'
+    prefs[:starter_app] = 'admin_app'
+    prefs[:form_builder] = 'none'
+  when 'rails3-mongoid-devise'
+    prefs[:database] = 'mongodb'
+    prefs[:orm] = 'mongoid'
+    prefs[:templates] = 'erb'
+    prefs[:unit_test] = 'rspec'
+    prefs[:integration] = 'cucumber'
+    prefs[:fixtures] = 'factory_girl'
+    prefs[:frontend] = 'none'
+    prefs[:email] = 'gmail'
+    prefs[:authentication] = 'devise'
+    prefs[:devise_modules] = 'default'
+    prefs[:authorization] = 'none'
+    prefs[:starter_app] = 'users_app'
+    prefs[:form_builder] = 'none'
+  when 'rails3-mongoid-omniauth'
+    prefs[:database] = 'mongodb'
+    prefs[:orm] = 'mongoid'
+    prefs[:templates] = 'erb'
+    prefs[:unit_test] = 'rspec'
+    prefs[:integration] = 'cucumber'
+    prefs[:fixtures] = 'factory_girl'
+    prefs[:frontend] = 'none'
+    prefs[:email] = 'none'
+    prefs[:authentication] = 'omniauth'
+    prefs[:omniauth_provider] = 'twitter'
+    prefs[:authorization] = 'none'
+    prefs[:starter_app] = 'users_app'
+    prefs[:form_builder] = 'none'
+  when 'rails3-subdomains'
+    prefs[:database] = 'mongodb'
+    prefs[:orm] = 'mongoid'
+    prefs[:templates] = 'haml'
+    prefs[:unit_test] = 'rspec'
+    prefs[:integration] = 'cucumber'
+    prefs[:fixtures] = 'factory_girl'
+    prefs[:frontend] = 'none'
+    prefs[:email] = 'gmail'
+    prefs[:authentication] = 'devise'
+    prefs[:devise_modules] = 'default'
+    prefs[:authorization] = 'none'
+    prefs[:starter_app] = 'subdomains_app'
+    prefs[:form_builder] = 'none'
+end
+
+__END__
+
+name: railsapps
+description: "Install RailsApps example applications."
+author: RailsApps
+
+requires: [auth, controllers, database, email, extras, frontend, gems, git, models, readme, routes, setup, testing, views]
+run_after: [git]
+category: configuration

data/recipes/readme.rb

@@ -23,7 +23,9 @@ after_everything do
   gsub_file "README.textile", /preferences that are known/, "preferences that are NOT known" if diagnostics[:prefs] == 'fail'
   gsub_file "README.textile", /RECIPES/, recipes.sort.inspect
   gsub_file "README.textile", /PREFERENCES/, prefs.inspect
-
+  gsub_file "README", /RECIPES/, recipes.sort.inspect
+  gsub_file "README", /PREFERENCES/, prefs.inspect
+  
   # Ruby on Rails
   gsub_file "README.textile", /\* Ruby/, "* Ruby version #{RUBY_VERSION}"
   gsub_file "README.textile", /\* Rails/, "* Rails version #{Rails::VERSION::STRING}"

data/recipes/setup.rb

@@ -5,27 +5,8 @@
 say_wizard "You are using Ruby version #{RUBY_VERSION}."
 say_wizard "You are using Rails version #{Rails::VERSION::STRING}."
 
-## Git
-say_wizard "initialize git"
-prefs[:git] = true unless prefs.has_key? :git
-if prefer :git, true
-  begin
-    remove_file '.gitignore'
-    get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/gitignore.txt', '.gitignore'
-  rescue OpenURI::HTTPError
-    say_wizard "Unable to obtain gitignore file from the repo"
-  end
-  git :init
-  git :add => '.'
-  git :commit => "-aqm 'rails_apps_composer: initial commit'"
-end
-
 ## Is sqlite3 in the Gemfile?
-f = File.open(destination_root() + '/Gemfile', "r")
-gemfile = ''
-f.each_line do |line|
-  gemfile += line
-end
+gemfile = File.read(destination_root() + '/Gemfile')
 sqlite_detected = gemfile.include? 'sqlite3'
 
 ## Web Server
@@ -145,4 +126,5 @@ name: setup
 description: "Make choices for your application."
 author: RailsApps
 
+run_after: [git, railsapps]
 category: configuration

data/templates/layout.erb

@@ -99,7 +99,7 @@ end
 
 say_wizard "Installing gems. This will take a while."
 if prefs.has_key? :bundle_path
-  run "bundle install --without production #{prefs[:bundle_path]}"
+  run "bundle install --without production --path #{prefs[:bundle_path]}"
 else
   run 'bundle install --without production'
 end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -163,8 +163,10 @@ files:
 - recipes/extras.rb
 - recipes/frontend.rb
 - recipes/gems.rb
+- recipes/git.rb
 - recipes/models.rb
 - recipes/prelaunch.rb
+- recipes/railsapps.rb
 - recipes/readme.rb
 - recipes/routes.rb
 - recipes/setup.rb
@@ -199,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 282801510994621394
+      hash: 4222109462404343651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 282801510994621394
+      hash: 4222109462404343651
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24