rails_apps_composer 2.2.33 → 2.2.34

data/README.textile

@@ -392,4 +392,19 @@ The rails_apps_composer program is licensed under the terms of the "MIT License"
 
 Copyright © 2012 Daniel Kehoe
 
+h2. Useful Links
+
+|_. Getting Started |_. Articles |_. Tutorials |
+| "Rails Tutorial":https://tutorials.railsapps.org/rails-tutorial (recommendations) | "Heroku and Rails":http://railsapps.github.com/rails-heroku-tutorial.html | "Devise with CanCan and Twitter Bootstrap":https://tutorials.railsapps.org/rails3-bootstrap-devise-cancan |
+| "Rails":http://railsapps.github.com/rails.html (resources)| "Twitter Bootstrap and Rails":http://railsapps.github.com/twitter-bootstrap-rails.html | "Rails Membership Site with Stripe":https://tutorials.railsapps.org/rails-stripe-membership-saas |
+| "Installing Rails":http://railsapps.github.com/installing-rails.html | "JavaScript and Rails":http://railsapps.github.com/rails-javascript-include-external.html | "Rails Subscription Site with Recurly":https://tutorials.railsapps.org/rails-recurly-subscription-saas |
+| "Updating Rails":http://railsapps.github.com/updating-rails.html | "Rails Environment Variables":http://railsapps.github.com/rails-environment-variables.html | "Startup Prelaunch Signup Application":http://railsapps.github.com/tutorial-rails-prelaunch-signup.html |
+| "Rails Composer":http://railsapps.github.com/rails-composer/ | "Git and GitHub with Rails":http://railsapps.github.com/rails-git.html | "Devise with RSpec and Cucumber":http://railsapps.github.com/tutorial-rails-devise-rspec-cucumber.html |
+| "Rails Examples":http://railsapps.github.com/ | "Send Email with Rails":http://railsapps.github.com/rails-send-email.html | "Devise with Mongoid":http://railsapps.github.com/tutorial-rails-mongoid-devise.html |
+| "Rails Starter Apps":http://railsapps.github.com/rails-examples-tutorials.html | "Haml and Rails":http://railsapps.github.com/rails-haml.html | "OmniAuth with Mongoid":http://railsapps.github.com/tutorial-rails-mongoid-omniauth.html |
+| | "Rails Application Layout":http://railsapps.github.com/rails-default-application-layout.html | "Subdomains with Devise":http://railsapps.github.com/tutorial-rails-subdomains.html |
+| | "HTML5 Boilerplate for Rails":http://railsapps.github.com/rails-html5-boilerplate.html | |
+| | "Example Gemfiles for Rails":http://railsapps.github.com/rails-3-2-example-gemfile.html | |
+| | "Rails Application Templates":http://railsapps.github.com/rails-application-templates.html | |
+
 !https://cruel-carlota.pagodabox.com/1f4f51c551cd90489a558e5fe4d91fff(githalytics.com alpha)!

data/recipes/extras.rb

@@ -1,6 +1,59 @@
 # Application template recipe for the rails_apps_composer. Change the recipe here:
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/extras.rb
 
+## RVMRC
+rvmrc_detected = false
+if File.exist?('.rvmrc')
+  rvmrc_file = File.read('.rvmrc')
+  rvmrc_detected = rvmrc_file.include? app_name
+end
+unless rvmrc_detected
+  prefs[:rvmrc] = yes_wizard? "Create a project-specific rvm gemset and .rvmrc?"
+end
+if prefs[:rvmrc]
+  if which("rvm")
+    say_wizard "recipe creating project-specific rvm gemset and .rvmrc"
+    # using the rvm Ruby API, see:
+    # http://blog.thefrontiergroup.com.au/2010/12/a-brief-introduction-to-the-rvm-ruby-api/
+    # https://rvm.io/integration/passenger
+    if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
+      begin
+        gems_path = ENV['MY_RUBY_HOME'].split(/@/)[0].sub(/rubies/,'gems')
+        ENV['GEM_PATH'] = "#{gems_path}:#{gems_path}@global"
+        require 'rvm'
+        RVM.use_from_path! File.dirname(File.dirname(__FILE__))
+      rescue LoadError
+        raise "RVM gem is currently unavailable."
+      end
+    end
+    say_wizard "creating RVM gemset '#{app_name}'"
+    RVM.gemset_create app_name
+    say_wizard "switching to gemset '#{app_name}'"
+    # RVM.gemset_use! requires rvm version 1.11.3.5 or newer
+    rvm_spec =
+      if Gem::Specification.respond_to?(:find_by_name)
+        Gem::Specification.find_by_name("rvm")
+      else
+        Gem.source_index.find_name("rvm").last
+      end
+      unless rvm_spec.version > Gem::Version.create('1.11.3.4')
+        say_wizard "rvm gem version: #{rvm_spec.version}"
+        raise "Please update rvm gem to 1.11.3.5 or newer"
+      end
+    begin
+      RVM.gemset_use! app_name
+    rescue => e
+      say_wizard "rvm failure: unable to use gemset #{app_name}, reason: #{e}"
+      raise
+    end
+    run "rvm gemset list"
+    copy_from_repo '.rvmrc'
+    gsub_file '.rvmrc', /App_Name/, "#{app_name}"
+  else
+    say_wizard "WARNING! RVM does not appear to be available."
+  end
+end
+
 ## QUIET ASSETS
 if config['quiet_assets']
   prefs[:quiet_assets] = true
@@ -26,7 +79,7 @@ end
 if prefs[:better_errors]
   say_wizard "recipe adding better_errors gem"
   gem 'better_errors', '>= 0.6.0', :group => :development
-  gem 'binding_of_caller', '>= 0.6.9', :group => :development
+  gem 'binding_of_caller', '>= 0.7.1', :group => :development, :platforms => [:mri_19, :rbx]
 end
 
 ## BAN SPIDERS
@@ -55,54 +108,6 @@ case RbConfig::CONFIG['host_os']
     end
 end
 
-## RVMRC
-if config['rvmrc']
-  prefs[:rvmrc] = true
-end
-if prefs[:rvmrc]
-  if which("rvm")
-    say_wizard "recipe creating project-specific rvm gemset and .rvmrc"
-    # using the rvm Ruby API, see:
-    # http://blog.thefrontiergroup.com.au/2010/12/a-brief-introduction-to-the-rvm-ruby-api/
-    # https://rvm.io/integration/passenger
-    if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
-      begin
-        gems_path = ENV['MY_RUBY_HOME'].split(/@/)[0].sub(/rubies/,'gems')
-        ENV['GEM_PATH'] = "#{gems_path}:#{gems_path}@global"
-        require 'rvm'
-        RVM.use_from_path! File.dirname(File.dirname(__FILE__))
-      rescue LoadError
-        raise "RVM gem is currently unavailable."
-      end
-    end
-    say_wizard "creating RVM gemset '#{app_name}'"
-    RVM.gemset_create app_name
-    say_wizard "switching to gemset '#{app_name}'"
-    # RVM.gemset_use! requires rvm version 1.11.3.5 or newer
-    rvm_spec =
-      if Gem::Specification.respond_to?(:find_by_name)
-        Gem::Specification.find_by_name("rvm")
-      else
-        Gem.source_index.find_name("rvm").last
-      end
-      unless rvm_spec.version > Gem::Version.create('1.11.3.4')
-        say_wizard "rvm gem version: #{rvm_spec.version}"
-        raise "Please update rvm gem to 1.11.3.5 or newer"
-      end
-    begin
-      RVM.gemset_use! app_name
-    rescue => e
-      say_wizard "rvm failure: unable to use gemset #{app_name}, reason: #{e}"
-      raise
-    end
-    run "rvm gemset list"
-    copy_from_repo '.rvmrc'
-    gsub_file '.rvmrc', /App_Name/, "#{app_name}"
-  else
-    say_wizard "WARNING! RVM does not appear to be available."
-  end
-end
-
 ## AFTER_EVERYTHING
 after_everything do
   say_wizard "recipe removing unnecessary files and whitespace"
@@ -157,21 +162,18 @@ run_after: [gems, init, prelaunch]
 category: other
 
 config:
-  - quiet_assets:
+  - ban_spiders:
       type: boolean
-      prompt: Reduce assets logger noise during development?
+      prompt: Set a robots.txt file to ban spiders?
+  - github:
+      type: boolean
+      prompt: Create a GitHub repository?
   - local_env_file:
       type: boolean
       prompt: Use application.yml file for environment variables?
+  - quiet_assets:
+      type: boolean
+      prompt: Reduce assets logger noise during development?
   - better_errors:
       type: boolean
       prompt: Improve error reporting with 'better_errors' during development?
-  - ban_spiders:
-      type: boolean
-      prompt: Set a robots.txt file to ban spiders?
-  - rvmrc:
-      type: boolean
-      prompt: Create a project-specific rvm gemset and .rvmrc?
-  - github:
-      type: boolean
-      prompt: Create a GitHub repository?

data/recipes/gems.rb

@@ -4,7 +4,7 @@
 ### GEMFILE ###
 
 ## Ruby on Rails
-insert_into_file 'Gemfile', "ruby '1.9.3'\n", :before => "gem 'rails', '3.2.6'" if prefer :deploy, 'heroku'
+insert_into_file('Gemfile', "ruby '1.9.3'\n", before: /^ *gem 'rails'/, force: false) if prefer :deploy, 'heroku'
 
 ## Web Server
 if (prefs[:dev_webserver] == prefs[:prod_webserver])
@@ -22,7 +22,7 @@ end
 
 ## Database Adapter
 gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
-gem 'mongoid', '>= 3.1.0' if prefer :orm, 'mongoid'
+gem 'mongoid', '>= 3.1.1' if prefer :orm, 'mongoid'
 unless File.open('Gemfile').lines.any?{|line| line.include?('pg')}
   gem 'pg', '>= 0.14.1' if prefer :database, 'postgresql'
 end
@@ -33,14 +33,14 @@ end
 ## Template Engine
 if prefer :templates, 'haml'
   gem 'haml-rails', '>= 0.4'
-  gem 'html2haml', '>= 1.0.0', :group => :development
+  gem 'html2haml', '>= 1.0.1', :group => :development
 end
 if prefer :templates, 'slim'
   gem 'slim', '>= 2.0.0.pre.6'
   gem 'haml2slim', '>= 0.4.6', :group => :development
   # Haml is needed for conversion of HTML to Slim
   gem 'haml-rails', '>= 0.4', :group => :development
-  gem 'html2haml', '>= 1.0.0', :group => :development
+  gem 'html2haml', '>= 1.0.1', :group => :development
 end
 
 ## Testing Framework
@@ -75,7 +75,7 @@ gem 'compass-rails', '>= 1.0.3', :group => :assets if prefer :frontend, 'foundat
 gem 'zurb-foundation', '>= 3.2.5', :group => :assets if prefer :frontend, 'foundation'
 if prefer :bootstrap, 'less'
   gem 'less-rails', '>= 2.2.6', :group => :assets
-  gem 'twitter-bootstrap-rails', '>= 2.2.3', :group => :assets
+  gem 'twitter-bootstrap-rails', '>= 2.2.4', :group => :assets
   # install gem 'therubyracer' to use Less
   gem 'libv8', '>= 3.11.8'
   gem 'therubyracer', '>= 0.11.3', :group => :assets, :platform => :ruby, :require => 'v8'

data/recipes/init.rb

@@ -73,7 +73,7 @@ FILE
     end
   end
   ## DEVISE-DEFAULT
-  unless prefer :authentication, 'omniauth'
+  if prefer :authentication, 'devise'
     append_file 'db/seeds.rb' do <<-FILE
 puts 'DEFAULT USERS'
 user = User.find_or_create_by_email :name => ENV['ADMIN_NAME'].dup, :email => ENV['ADMIN_EMAIL'].dup, :password => ENV['ADMIN_PASSWORD'].dup, :password_confirmation => ENV['ADMIN_PASSWORD'].dup

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.33"
+  VERSION = "2.2.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.33
+  version: 2.2.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-02-20 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: -2885590873741171090
+      hash: -161628024965057512
 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: -2885590873741171090
+      hash: -161628024965057512
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.25