rails_apps_composer 1.2.1 → 1.3.1

data/lib/rails_wizard/template.rb

@@ -17,9 +17,22 @@ module RailsWizard
     def render(template_name, binding = nil); self.class.render(template_name, binding) end
 
 
+    # Sort the recipes list taking 'run_after' directives into account.
     def resolve_recipes
-      # @resolve_recipes ||= recipes_with_dependencies.sort
-      @resolve_recipes ||= recipes_with_dependencies
+      @resolve_recipes ||= begin
+        list = recipes_with_dependencies
+
+        for i in 0...list.size
+          after_keys = list[i+1..-1].map { |r| r.key }
+
+          if (list[i].run_after & after_keys).any?
+            list.push list.slice!(i)
+            redo
+          end
+        end
+
+        list
+      end
     end
 
     def recipe_classes

data/recipes/active_admin.rb

@@ -0,0 +1,31 @@
+gem 'activeadmin'
+gem "meta_search",    '>= 1.1.0.pre'
+# sass-rails is also required but is by default in rails
+
+
+after_bundler do
+	case config['user_model']
+		when 'default'
+			generate 'active_admin:install'
+		when ''
+			generate 'active_admin:install'
+		when 'skip'
+			generate 'active_admin:install --skip-users'
+		else
+			generate "active_admin:install #{config['user_model']}"
+	end
+end
+
+__END__
+
+name: RailsAdmin
+description: "Install Active Admin to build an administration zone data in your application"
+author: systho
+
+category: other
+
+config:
+  - user_model:
+      type: string
+      prompt: "What model will you use for admin users ? type 'skip' to skip this step (default is AdminUser)"
+

data/recipes/add_user.rb

@@ -96,5 +96,6 @@ name: AddUser
 description: "Add a User model including 'name' and 'email' attributes."
 author: RailsApps
 
+run_after: [devise, omniauth]
 category: other
 tags: [utilities, configuration]

data/recipes/compass.rb

@@ -1,5 +1,6 @@
 if config['compass']
-  gem 'compass', :version => '~> 0.12.rc.1'
+  gem 'compass', :version => '~> 0.12.1', :group => [:assets]
+  gem 'compass-rails', :version => '~> 1.0.0', :group => [:assets]
   after_bundler do
     remove_file 'app/assets/stylesheets/application.css'
     create_file 'app/assets/stylesheets/application.css.sass' do <<-SASS

data/recipes/devise.rb

@@ -6,12 +6,12 @@ case config['devise']
     recipes.delete('devise')
     say_wizard "Devise recipe skipped."
   when 'standard'
-    gem 'devise', '>= 2.0.4'
+    gem 'devise', '>= 2.1.0.rc'
   when 'confirmable'
-    gem 'devise', '>= 2.0.4'
+    gem 'devise', '>= 2.1.0.rc'
     recipes << 'devise-confirmable'
   when 'invitable'
-    gem 'devise', '>= 2.0.4'
+    gem 'devise', '>= 2.1.0.rc'
     gem 'devise_invitable', '>= 1.0.0'
     recipes << 'devise-confirmable'
     recipes << 'devise-invitable'
@@ -57,8 +57,9 @@ if recipes.include? 'devise'
       say_wizard "Copying RSpec files from the rails3-devise-rspec-cucumber examples"
       begin
         # copy all the RSpec specs files from the rails3-devise-rspec-cucumber example app
-        get 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/spec/factories.rb', 'spec/factories.rb'
-        gsub_file 'spec/factories.rb', /# confirmed_at/, "confirmed_at" if recipes.include? 'devise-confirmable'
+        remove_file 'spec/factories/users.rb'
+        get 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/spec/factories/users.rb', 'spec/factories/users.rb'
+        gsub_file 'spec/factories/users.rb', /# confirmed_at/, "confirmed_at" if recipes.include? 'devise-confirmable'
         remove_file 'spec/controllers/home_controller_spec.rb'
         remove_file 'spec/controllers/users_controller_spec.rb'
         get 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/spec/controllers/home_controller_spec.rb', 'spec/controllers/home_controller_spec.rb'

data/recipes/mongoid.rb

@@ -4,7 +4,7 @@
 if config['mongoid']
   say_wizard "REMINDER: When creating a Rails app using Mongoid..."
   say_wizard "you should add the '-O' flag to 'rails new'"
-  gem 'bson_ext', '>= 1.5.2'
+  gem 'bson_ext', '>= 1.6.1'
   gem 'mongoid', '>= 2.4.6'
 else
   recipes.delete('mongoid')

data/recipes/omniauth.rb

@@ -2,7 +2,7 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/omniauth.rb
 
 if config['omniauth']
-  gem 'omniauth', '>= 1.0.2'
+  gem 'omniauth', '>= 1.0.3'
   # for available gems, see https://github.com/intridea/omniauth/wiki/List-of-Strategies
   case config['provider']
     when 'twitter'
@@ -13,6 +13,8 @@ if config['omniauth']
      gem 'omniauth-github'
     when 'linkedin'
       gem 'omniauth-linkedin'
+    when 'google'
+      gem 'omniauth-google'
   end
 else
   recipes.delete('omniauth')
@@ -152,4 +154,4 @@ config:
   - provider:
       type: multiple_choice
       prompt: "Which service provider will you use?"
-      choices: [["Twitter", twitter], ["Facebook", facebook], ["GitHub", github], ["LinkedIn", linkedin]]
+      choices: [["Twitter", twitter], ["Facebook", facebook], ["GitHub", github], ["LinkedIn", linkedin], ["Google", google]]

data/recipes/rspec.rb

@@ -2,7 +2,7 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/rspec.rb
 
 if config['rspec']
-  gem 'rspec-rails', '>= 2.8.1', :group => [:development, :test]
+  gem 'rspec-rails', '>= 2.9.0.rc2', :group => [:development, :test]
   if recipes.include? 'mongoid'
     # use the database_cleaner gem to reset the test database
     gem 'database_cleaner', '>= 0.7.1', :group => :test
@@ -13,7 +13,7 @@ if config['rspec']
     gem 'machinist', :group => :test
   end
   if config['factory_girl']
-    gem 'factory_girl_rails', '>= 1.7.0', :group => :test
+    gem 'factory_girl_rails', '>= 2.0.0.rc', :group => [:development, :test]
   end
   # add a collection of RSpec matchers and Cucumber steps to make testing email easy
   gem 'email_spec', '>= 1.2.1', :group => :test

data/spec/rails_wizard/recipe_spec.rb

@@ -74,28 +74,6 @@ RUBY
       recipe.send(k).should == v
     end
   end
-
-  context 'Comparable' do
-    subject{ RailsWizard::Recipe }
-    it 'a < b.run_after(a)' do
-      A = subject.generate('a', '#')
-      B = subject.generate('b', '#', :run_after => ['a'])
-
-      (A < B).should be_true
-    end
-
-    it 'a > b.run_before(a)' do
-      A = subject.generate('a', '#')
-      B = subject.generate('b', '#', :run_before => ['a'])
-      
-      (A > B).should be_true
-    end
-
-    after do
-      Object.send :remove_const, :A if defined?(A)
-      Object.send :remove_const, :B if defined?(B)
-    end
-  end
 end
 
 __END__

data/spec/rails_wizard/template_spec.rb

@@ -10,6 +10,31 @@ describe RailsWizard::Template do
     end
   end
 
+  describe '#resolve_dependencies' do
+    def recipe(name, opts={})
+      RailsWizard::Recipe.generate(name, '', opts)
+    end
+
+    subject do
+      @template = RailsWizard::Template.new([])
+      @template.stub!(:recipes_with_dependencies).and_return(@recipes)
+      @template.resolve_recipes.map { |r| r.key }
+    end
+
+    it 'should sort properly' do
+      @recipes = [
+        recipe('add_user', :run_after => ['devise']),
+        recipe('devise', :run_after => ['omniauth']),
+        recipe('omniauth'),
+        recipe('haml'),
+        recipe('compass')
+      ]
+
+      subject.index('devise').should > subject.index('omniauth')
+    end
+
+  end
+
   describe '#recipes_with_dependencies' do
     def r(*deps)
       mock(:Class, :requires => deps, :superclass => RailsWizard::Recipe)

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.2.1"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153664200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153664200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153663680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153663680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153663240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153663240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153618740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153618740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153618240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153618240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: mg
-  requirement: &2153617820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153617820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153617280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153617280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153616820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153616820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem with recipes to create Rails application templates you can use
   to generate Rails starter apps.
 email:
@@ -115,6 +155,7 @@ files:
 - lib/rails_wizard/template.rb
 - lib/rails_wizard.rb
 - recipes/action_mailer.rb
+- recipes/active_admin.rb
 - recipes/activerecord.rb
 - recipes/add_user.rb
 - recipes/backbone.rb
@@ -162,7 +203,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/rails_directory.rb
 - spec/support/template_runner.rb
-- bin/rails_apps_composer
+- !binary |-
+  YmluL3JhaWxzX2FwcHNfY29tcG9zZXI=
 homepage: http://github.com/RailsApps/rails_apps_composer
 licenses: []
 post_install_message: 
@@ -177,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 18862800852877578
+      hash: 3232364997351596987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,10 +228,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 18862800852877578
+      hash: 3232364997351596987
 requirements: []
 rubyforge_project: rails_apps_composer
-rubygems_version: 1.8.16
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.