rails_apps_composer 2.2.16 → 2.2.17

data/README.textile

@@ -140,6 +140,8 @@ $ rails_apps_composer new myapp -l ~/recipes/
 
 If you create local recipes, please consider contributing them to the project.
 
+If you want to only use your local recipes, and not include the default recipes, use the @-L@ flag.
+
 h3. Generate an Application Interactively
 
 You'll be prompted for recipes and gems:
@@ -261,6 +263,14 @@ $ rails_apps_composer template ~/Desktop/template.rb -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.
 
+h3. Generate an Application Template With Your Own Layout
+
+If you want to generate an application template, but use your own layout to do so, you can use the @-t@ flag to set the directory where your templates are. Look at the @templates/@ directory in this gem to see how your templates should look.
+
+<pre>
+$ rails_apps_composer template ~/Desktop/template.rb -t ~/Desktop/my_templates
+</pre>
+
 h3. Generate an Application from a Template
 
 After you've created a template file, you can generate an application from a template at any time using the @rails new@ command with the @-m@ option:

data/lib/rails_wizard/command.rb

@@ -8,6 +8,8 @@ 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 :no_default_recipes, :type => :boolean, :aliases => "-L"
+    method_option :template_root, :type => :string, :aliases => '-t'
     method_option :quiet, :type => :boolean, :aliases => "-q", :default => false
     def new(name)
       add_recipes
@@ -22,6 +24,8 @@ 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 :no_default_recipes, :type => :boolean, :aliases => "-L"
+    method_option :template_root, :type => :string, :aliases => '-t'
     method_option :quiet, :type => :boolean, :aliases => "-q", :default => false
     def template(template_name)
       add_recipes
@@ -54,6 +58,7 @@ module RailsWizard
       def yellow; "\033[33m" end
 
       def add_recipes
+        Recipes.clear if options[:no_default_recipes]
         if dirs = options[:recipe_dirs]
           dirs.each { |d| Recipes.add_from_directory(d) }
         end
@@ -135,23 +140,27 @@ module RailsWizard
           default
         end
       end
-      
+
       def ask_for_args(defaults)
         args = []
         default_args = defaults["args"] || {}
-        
+
         question = "#{bold}Would you like to skip Test::Unit? (yes for RSpec) \033[33m(y/n)\033[0m#{clear}"
         args << "-T" if ask_for_arg(question, default_args[:skip_test_unit])
 
         question = "#{bold}Would you like to skip Active Record? (yes for MongoDB) \033[33m(y/n)\033[0m#{clear}"
         args << "-O" if ask_for_arg(question, default_args[:skip_active_record])
-        
+
         args
       end
-      
+
       #pass in name if you want to create a rails app
       #pass in file_name if you want to create a template
       def run_template(name, recipes, gems, args, defaults, file_name=nil)
+        if options[:template_root]
+          RailsWizard::Template.template_root = options[:template_root]
+        end
+
         if file_name
           file = File.new(file_name,'w')
         else

data/lib/rails_wizard/recipes.rb

@@ -2,7 +2,7 @@ module RailsWizard
   module Recipes
     @@categories = {}
     @@list = {}
-    
+
     def self.add(recipe)
       RailsWizard::Recipes.const_set ActiveSupport::Inflector.camelize(recipe.key), recipe
       @@list[recipe.key] = recipe
@@ -11,6 +11,14 @@ module RailsWizard
       recipe
     end
 
+    def self.clear
+      self.list.each do |recipe_key|
+        send(:remove_const, ActiveSupport::Inflector.camelize(recipe_key))
+      end
+      @@categories = {}
+      @@list = {}
+    end
+
     def self.[](key)
       @@list[key.to_s]
     end

data/lib/rails_wizard/template.rb

@@ -19,7 +19,11 @@ module RailsWizard
     end
 
     def self.template_root
-      File.dirname(__FILE__) + '/../../templates'
+      @template_root ||= File.dirname(__FILE__) + '/../../templates'
+    end
+
+    def self.template_root=(root)
+      @template_root = root
     end
 
     def self.render(template_name, binding = nil)

data/recipes/gems.rb

@@ -75,7 +75,7 @@ gem 'machinist', '>= 2.0', :group => :test if prefer :fixtures, 'machinist'
 ## Front-end Framework
 gem 'bootstrap-sass', '>= 2.1.0.1' if prefer :bootstrap, 'sass'
 gem 'compass-rails', '>= 1.0.3', :group => :assets if prefer :frontend, 'foundation'
-gem 'zurb-foundation', '>= 3.1.1', :group => :assets if prefer :frontend, 'foundation'
+gem 'zurb-foundation', '>= 3.2.0', :group => :assets if prefer :frontend, 'foundation'
 if prefer :bootstrap, 'less'
   gem 'twitter-bootstrap-rails', '>= 2.1.4', :group => :assets
   # install gem 'therubyracer' to use Less

data/recipes/saas.rb

@@ -31,7 +31,7 @@ if prefer :railsapps, 'rails-stripe-membership-saas'
     copy_from_repo 'features/users/sign_up.feature', :repo => repo
     copy_from_repo 'features/step_definitions/user_steps.rb', :repo => repo    
     copy_from_repo 'config/locales/devise.en.yml', :repo => repo
-
+    
     # >-------------------------------[ Models ]--------------------------------<
     copy_from_repo 'app/models/ability.rb', :repo => repo
     copy_from_repo 'app/models/user.rb', :repo => repo
@@ -53,10 +53,10 @@ if prefer :railsapps, 'rails-stripe-membership-saas'
     copy_from_repo 'app/controllers/content_controller.rb', :repo => repo
     copy_from_repo 'app/controllers/registrations_controller.rb', :repo => repo
     copy_from_repo 'app/controllers/application_controller.rb', :repo => repo
+    copy_from_repo 'app/controllers/users_controller.rb', :repo => repo
 
     # >-------------------------------[ Mailers ]--------------------------------<
     generate 'mailer UserMailer'
-    copy_from_repo 'spec/mailers/user_mailer_spec.rb', :repo => repo
     copy_from_repo 'app/mailers/user_mailer.rb', :repo => repo
 
     # >-------------------------------[ Views ]--------------------------------<
@@ -79,7 +79,13 @@ if prefer :railsapps, 'rails-stripe-membership-saas'
     copy_from_repo 'app/assets/javascripts/registrations.js.erb', :repo => repo
     copy_from_repo 'app/assets/stylesheets/application.css.scss', :repo => repo
     copy_from_repo 'app/assets/stylesheets/pricing.css.scss', :repo => repo
-    
+
+    # >-------------------------------[ RSpec ]--------------------------------<
+    say_wizard "copying RSpec tests from the rails-stripe-membership-saas examples"
+    copy_from_repo 'spec/models/user_spec.rb', :repo => repo
+    copy_from_repo 'spec/controllers/content_controller_spec.rb', :repo => repo
+    copy_from_repo 'spec/mailers/user_mailer_spec.rb', :repo => repo
+
     ### GIT ###
     git :add => '-A' if prefer :git, true
     git :commit => '-qm "rails_apps_composer: membership app"' if prefer :git, true

data/recipes/testing.rb

@@ -251,7 +251,9 @@ Fabricator(:user) do
 end
 RUBY
     end
-    gsub_file 'features/step_definitions/user_steps.rb', /@user = FactoryGirl.create\(:user, email: @visitor\[:email\]\)/, '@user = Fabricate(:user, email: @visitor[:email])'
+    if prefer :integration, 'cucumber'
+      gsub_file 'features/step_definitions/user_steps.rb', /@user = FactoryGirl.create\(:user, email: @visitor\[:email\]\)/, '@user = Fabricate(:user, email: @visitor[:email])'
+    end
     gsub_file 'spec/controllers/users_controller_spec.rb', /@user = FactoryGirl.create\(:user\)/, '@user = Fabricate(:user)'
   end
 end # after_everything 

data/spec/rails_wizard/recipes_spec.rb

@@ -26,4 +26,12 @@ describe RailsWizard::Recipes do
     subject.add_from_directory(File.join(File.dirname(__FILE__), '..', 'test_recipes'))
     subject.list.should include 'test_recipe_in_file'
   end
+
+  describe '.clear' do
+    it 'should remove all current recipes' do
+      RailsWizard::Recipes.clear
+      subject.list.should == []
+      subject.categories.should == []
+    end
+  end
 end

data/spec/rails_wizard/template_spec.rb

@@ -7,6 +7,18 @@ describe RailsWizard::Template do
   let(:gems){ ['foogem'] }
   let(:args){ [] }
 
+  describe '.template_root' do
+    it 'returns the gem ./templates directory by default' do
+      template_root = File.expand_path(subject.template_root)
+      template_root.should == File.expand_path('../../../templates', __FILE__)
+    end
+
+    it 'can be set to another directory' do
+      subject.template_root = '/tmp/templates'
+      subject.template_root.should == '/tmp/templates'
+    end
+  end
+
   describe '#initialize' do
     it 'should work with classes' do
       subject.new([recipe], gems).recipes.should == [recipe]

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.16"
+  VERSION = "2.2.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.16
+  version: 2.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2773202915050764008
+      hash: -4210114770382273959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2773202915050764008
+      hash: -4210114770382273959
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24