rubber 1.5.2 → 1.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG CHANGED
@@ -1,3 +1,13 @@
1
+ 1.5.2
2
+ -----
3
+
4
+ New release. <fad9bbb> [Kevin Menard]
5
+ Fixed issue with dependent modules in Rails 2 generator. <84a0259> [Kevin Menard]
6
+ Fixed an issue with mysqldump and empty passwords. <708f053> [Kevin Menard]
7
+ Removed unnecessary puts statement. <0e81cdc> [Kevin Menard]
8
+ Fix for incomplete path. <b18743f> [Kevin Menard]
9
+ Ubuntu changed the location of its service command, so we can't rely on any given path for it. <e82e7b1> [Kevin Menard]
10
+
1
11
  1.5.1
2
12
  -----
3
13
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.5.2
1
+ 1.5.3
@@ -1,6 +1,16 @@
1
1
  require 'find'
2
2
  require 'yaml'
3
3
 
4
+ # Load and initialize rubber if it hasn't been already.
5
+ # This happens using the generator with Rails 2 and Rubber is not set up as a plugin.
6
+ unless defined?(Rubber)
7
+ env = ENV['RUBBER_ENV'] ||= 'development'
8
+ root = '.'
9
+
10
+ require 'rubber'
11
+ Rubber::initialize(root, env)
12
+ end
13
+
4
14
  if Rubber::Util::is_rails2?
5
15
  require 'fileutils'
6
16
  require 'commands/generate'
@@ -1,6 +1,16 @@
1
1
  require 'find'
2
2
  require 'yaml'
3
3
 
4
+ # Load and initialize rubber if it hasn't been already.
5
+ # This happens using the generator with Rails 2 and Rubber is not set up as a plugin.
6
+ unless defined?(Rubber)
7
+ env = ENV['RUBBER_ENV'] ||= 'development'
8
+ root = '.'
9
+
10
+ require 'rubber'
11
+ Rubber::initialize(root, env)
12
+ end
13
+
4
14
  if Rubber::Util::is_rails2?
5
15
  require 'fileutils'
6
16
  require 'commands/generate'
@@ -259,7 +259,7 @@ namespace :rubber do
259
259
  desc <<-DESC
260
260
  Install ruby gems defined in the rails environment.rb
261
261
  DESC
262
- after "rubber:config", "rubber:install_rails_gems" if Rubber::Util::is_rails2?
262
+ after "rubber:config", "rubber:install_rails_gems" if (Rubber::Util::is_rails2? && !Rubber::Util.is_bundler?)
263
263
  task :install_rails_gems do
264
264
  rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} rake gems:install"
265
265
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubber
3
3
  version: !ruby/object:Gem::Version
4
- hash: 7
4
+ hash: 5
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 5
9
- - 2
10
- version: 1.5.2
9
+ - 3
10
+ version: 1.5.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-05-23 00:00:00 -04:00
18
+ date: 2010-05-26 00:00:00 -04:00
19
19
  default_executable: vulcanize
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency