rubber 1.5.2 → 1.5.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+1.5.2
+-----
+
+New release. <fad9bbb> [Kevin Menard]
+Fixed issue with dependent modules in Rails 2 generator. <84a0259> [Kevin Menard]
+Fixed an issue with mysqldump and empty passwords. <708f053> [Kevin Menard]
+Removed unnecessary puts statement. <0e81cdc> [Kevin Menard]
+Fix for incomplete path. <b18743f> [Kevin Menard]
+Ubuntu changed the location of its service command, so we can't rely on any given path for it. <e82e7b1> [Kevin Menard]
+
 1.5.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.3

data/generators/vulcanize/vulcanize_generator.rb

@@ -1,6 +1,16 @@
 require 'find'
 require 'yaml'
 
+# Load and initialize rubber if it hasn't been already.
+# This happens using the generator with Rails 2 and Rubber is not set up as a plugin.
+unless defined?(Rubber)
+  env = ENV['RUBBER_ENV'] ||= 'development'
+  root = '.'
+
+  require 'rubber'
+  Rubber::initialize(root, env)
+end
+
 if Rubber::Util::is_rails2?
   require 'fileutils'
   require 'commands/generate'

data/lib/generators/vulcanize/vulcanize_generator.rb

@@ -1,6 +1,16 @@
 require 'find'
 require 'yaml'
 
+# Load and initialize rubber if it hasn't been already.
+# This happens using the generator with Rails 2 and Rubber is not set up as a plugin.
+unless defined?(Rubber)
+  env = ENV['RUBBER_ENV'] ||= 'development'
+  root = '.'
+
+  require 'rubber'
+  Rubber::initialize(root, env)
+end
+
 if Rubber::Util::is_rails2?
   require 'fileutils'
   require 'commands/generate'

data/lib/rubber/recipes/rubber/setup.rb

@@ -259,7 +259,7 @@ namespace :rubber do
   desc <<-DESC
     Install ruby gems defined in the rails environment.rb
   DESC
-  after "rubber:config", "rubber:install_rails_gems" if Rubber::Util::is_rails2?
+  after "rubber:config", "rubber:install_rails_gems" if (Rubber::Util::is_rails2? && !Rubber::Util.is_bundler?)
   task :install_rails_gems do
     rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} rake gems:install"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 -04:00
+date: 2010-05-26 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency