rubber 1.6.0 → 1.6.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+1.6.0
+-----
+
+Merge branch 'master' of github.com:wr0ngway/rubber <51a016c> [Matt Conway]
+stop loading rails within rubber as bundler in rails3 breaks everything by setting ENV[GEM_PATH], you may need to update your templates to use RUBBER_ENV/ROOT instead of RAILS_ENV/ROOT <8f4a0db> [Matt Conway]
+fix changelog gen <c5a8d83> [Matt Conway]
+Fix the API name for 32-bit medium CPU instance. <ec415ce> [Kevin Menard]
+
 1.5.11
 -----
 

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/generators/vulcanize/templates/base/Rakefile

@@ -2,6 +2,8 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+RAILS_LOADER
+
 env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
 RAILS_ENV = ENV['RAILS_ENV'] = env
 root = File.dirname(__FILE__)

data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb

@@ -7,7 +7,7 @@ namespace :rubber do
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
         if [[ `rvm --version 2> /dev/null` == "" ]]; then
-          echo "rvm_prefix=/usr/local" > /etc/rvmrc
+          echo "rvm_prefix=/usr/local/" > /etc/rvmrc
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
 
           # Copied below from http://rvm.beginrescueend.com/releases/rvm-install-latest

data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 1.0.1
+rvm_version: 1.0.5
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/generators/vulcanize/templates/base/templates.rb

@@ -2,8 +2,10 @@ gem "rubber", Rubber.version if Rubber::Util::is_bundler? && ! Rubber::Util::rub
 
 if Rubber::Util::is_rails2?
   m.gsub_file('script/cron-runner', /RAILS_RUNNER/, 'script/runner')
+  m.gsub_file('Rakefile', /RAILS_LOADER/, "require(File.join(File.dirname(__FILE__), 'config', 'boot'))")
   m.gsub_file('Rakefile', /RAILS_TASKS/, "require 'tasks/rails'")
 else
   gsub_file('script/cron-runner', /RAILS_RUNNER/, 'rails runner')
+  gsub_file('Rakefile', /RAILS_LOADER/, '')
   gsub_file('Rakefile', /RAILS_TASKS/, '')
 end

data/lib/generators/vulcanize/templates/base/Rakefile

@@ -2,6 +2,8 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+RAILS_LOADER
+
 env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
 RAILS_ENV = ENV['RAILS_ENV'] = env
 root = File.dirname(__FILE__)

data/lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb

@@ -7,7 +7,7 @@ namespace :rubber do
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
         if [[ `rvm --version 2> /dev/null` == "" ]]; then
-          echo "rvm_prefix=/usr/local" > /etc/rvmrc
+          echo "rvm_prefix=/usr/local/" > /etc/rvmrc
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
 
           # Copied below from http://rvm.beginrescueend.com/releases/rvm-install-latest

data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 1.0.1
+rvm_version: 1.0.5
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/lib/generators/vulcanize/templates/base/templates.rb

@@ -2,8 +2,10 @@ gem "rubber", Rubber.version if Rubber::Util::is_bundler? && ! Rubber::Util::rub
 
 if Rubber::Util::is_rails2?
   m.gsub_file('script/cron-runner', /RAILS_RUNNER/, 'script/runner')
+  m.gsub_file('Rakefile', /RAILS_LOADER/, "require(File.join(File.dirname(__FILE__), 'config', 'boot'))")
   m.gsub_file('Rakefile', /RAILS_TASKS/, "require 'tasks/rails'")
 else
   gsub_file('script/cron-runner', /RAILS_RUNNER/, 'rails runner')
+  gsub_file('Rakefile', /RAILS_LOADER/, '')
   gsub_file('Rakefile', /RAILS_TASKS/, '')
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 -06:00
+date: 2010-09-13 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 9
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,6 +72,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -475,14 +480,20 @@ has_rdoc: true
 homepage: http://github.com/wr0ngway/rubber
 licenses: []
 
-post_install_message: "\n\
-  ********************************************************************************\n\n\
-  Thank you for installing rubber.  Please note that this is a major upgrade\n\
-  and we've moved towards using RVM for Ruby configuration on your EC2 instances.\n\n\
-  If you're upgrading rubber, please make sure to read the upgrade notes and\n\
-  make the necessary configuration changes:\n\n\
-  http://wiki.github.com/wr0ngway/rubber/upgrading\n\n\
-  ********************************************************************************\n\n"
+post_install_message: |+
+  
+  ********************************************************************************
+  
+  Thank you for installing rubber.  Please note that this is a major upgrade
+  and we've moved towards using RVM for Ruby configuration on your EC2 instances.
+  
+  If you're upgrading rubber, please make sure to read the upgrade notes and
+  make the necessary configuration changes:
+  
+  http://wiki.github.com/wr0ngway/rubber/upgrading
+  
+  ********************************************************************************
+  
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -492,6 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -500,6 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"