rubber 1.5.3 → 1.5.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.5.3
+-----
+
+Don't do a rake gems:install if bundler is in use. <511cac1> [Kevin Menard]
+Don't require rubber to be used as a plugin for Rails 2. <60165e3> [Kevin Menard]
+
 1.5.2
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

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

@@ -7,10 +7,10 @@ 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
           wget -qNP /tmp http://rvm.beginrescueend.com/releases/rvm-install-head
           bash /tmp/rvm-install-head
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
-          echo "rvm_prefix=/usr/local" > /etc/rvmrc
         fi
       ENDSCRIPT
     end

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

@@ -13,7 +13,7 @@ packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, z
 
 # 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
-rvm_ruby: 1.9.2-head
+rvm_ruby: 1.9.2
 
 # When rvm is installed as root, and you set the default, it symlinks ruby executables
 # into /usr/local

data/generators/vulcanize/templates/cassandra/config/rubber/deploy-cassandra.rb

@@ -12,7 +12,7 @@ namespace :rubber do
         if [[ ! -d "#{rubber_env.cassandra_dir}" ]]; then
           wget -qNP /tmp #{rubber_env.cassandra_pkg_url}
           tar -C #{rubber_env.cassandra_prefix} -zxf /tmp/apache-cassandra-#{rubber_env.cassandra_version}-bin.tar.gz
-          wget -nNO #{rubber_env.cassandra_dir}/jmxterm.jar http://downloads.sourceforge.net/project/cyclops-group/jmxterm/1.0-alpha-4/jmxterm-1.0-alpha-4-uber.jar
+          wget -qNO #{rubber_env.cassandra_dir}/jmxterm.jar http://downloads.sourceforge.net/project/cyclops-group/jmxterm/1.0-alpha-4/jmxterm-1.0-alpha-4-uber.jar
         fi
       ENDSCRIPT
     end

data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,6 +1,6 @@
 passenger_version: 2.2.11
 passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
-passenger_ruby: "#{rvm_prefix}/bin/passenger_ruby"
+passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

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

@@ -7,10 +7,10 @@ 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
           wget -qNP /tmp http://rvm.beginrescueend.com/releases/rvm-install-head
           bash /tmp/rvm-install-head
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
-          echo "rvm_prefix=/usr/local" > /etc/rvmrc
         fi
       ENDSCRIPT
     end

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

@@ -13,7 +13,7 @@ packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, z
 
 # 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
-rvm_ruby: 1.9.2-head
+rvm_ruby: 1.9.2
 
 # When rvm is installed as root, and you set the default, it symlinks ruby executables
 # into /usr/local

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

@@ -12,7 +12,7 @@ namespace :rubber do
         if [[ ! -d "#{rubber_env.cassandra_dir}" ]]; then
           wget -qNP /tmp #{rubber_env.cassandra_pkg_url}
           tar -C #{rubber_env.cassandra_prefix} -zxf /tmp/apache-cassandra-#{rubber_env.cassandra_version}-bin.tar.gz
-          wget -nNO #{rubber_env.cassandra_dir}/jmxterm.jar http://downloads.sourceforge.net/project/cyclops-group/jmxterm/1.0-alpha-4/jmxterm-1.0-alpha-4-uber.jar
+          wget -qNO #{rubber_env.cassandra_dir}/jmxterm.jar http://downloads.sourceforge.net/project/cyclops-group/jmxterm/1.0-alpha-4/jmxterm-1.0-alpha-4-uber.jar
         fi
       ENDSCRIPT
     end

data/lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,6 +1,6 @@
 passenger_version: 2.2.11
 passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
-passenger_ruby: "#{rvm_prefix}/bin/passenger_ruby"
+passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

data/lib/rubber/cloud/aws.rb

@@ -220,14 +220,14 @@ module Rubber
         capistrano.put(File.read(ec2_pk), ec2_pk_dest)
         capistrano.put(File.read(ec2_cert), ec2_cert_dest)
 
-        arch = capistrano.capture "uname -m"
+        arch = capistrano.capture("uname -m").strip
         arch = case arch when /i\d86/ then "i386" else arch end
 
         capistrano.sudo_script "create_bundle", <<-CMD
           rvm use system
           export RUBYLIB=/usr/lib/site_ruby/
           unset RUBYOPT
-          nohup ec2-bundle-vol --batch -d /mnt -k #{ec2_pk_dest} -c #{ec2_cert_dest} -u #{@aws_env.account} -p #{image_name} -r #{arch}  &> /tmp/ec2-bundle-vol.log &
+          nohup ec2-bundle-vol --batch -d /mnt -k #{ec2_pk_dest} -c #{ec2_cert_dest} -u #{@aws_env.account} -p #{image_name} -r #{arch} &> /tmp/ec2-bundle-vol.log &
           echo "Creating image from instance volume..."
           while true; do
             if ! ps ax | grep -q "[e]c2-bundle-vol"; then exit; fi

data/lib/rubber/environment.rb

@@ -14,7 +14,10 @@ module Rubber
 
       def initialize(config_root)
         @config_root = config_root
-        @config_files = ["#{@config_root}/rubber.yml"] + Dir["#{@config_root}/rubber-*.yml"].sort
+        @config_files = ["#{@config_root}/rubber.yml"]
+        @config_files += Dir["#{@config_root}/rubber-*.yml"].sort
+        @config_files -= Dir["#{@config_root}/rubber-*-env.yml"]
+        @config_files << "#{@config_root}/rubber-#{Rubber.env}-env.yml"
         @items = {}
         @config_files.each { |file| read_config(file) }
         @config_secret = bind().rubber_secret

data/lib/rubber/recipes/rubber/instances.rb

@@ -292,6 +292,10 @@ namespace :rubber do
       instance_item.external_ip = instance[:external_ip]
       instance_item.internal_host = instance[:internal_host]
       instance_item.zone = instance[:zone]
+      instance_item.platform = instance[:platform]
+
+      # turn back on root ssh access if we are using root as the capistrano user for connecting
+      enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if user == 'root'
 
       # setup amazon elastic ips if configured to do so
       setup_static_ips
@@ -306,8 +310,13 @@ namespace :rubber do
       # Connect to newly created instance and grab its internal ip
       # so that we can update all aliases
       task :_get_ip, :hosts => instance_item.external_ip do
-        instance_item.internal_ip = capture(print_ip_command).strip
-        rubber_instances.save()
+        # There's no good way to get the internal IP for a Windows host, so just set it to the external
+        # and let the router handle mapping to the internal network.
+        if instance_item.windows?
+          instance_item.internal_ip = instance_item.external_ip
+        else
+          instance_item.internal_ip = capture(print_ip_command).strip
+        end
       end
 
       # even though instance is running, sometimes ssh hasn't started yet,

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

@@ -253,7 +253,7 @@ namespace :rubber do
   DESC
   after "deploy:update_code", "rubber:install_bundler_gems" if Rubber::Util.is_bundler?
   task :install_bundler_gems do
-    rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} bundle install"
+    rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} bundle install --without development test"
   end
 
   desc <<-DESC

data/test/environment_test.rb

@@ -3,7 +3,7 @@ gem 'test-unit'
 
 require 'test/unit'
 require 'tempfile'
-require 'test_helper'
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 
 class EnvironmentTest < Test::Unit::TestCase
   include Rubber::Configuration
@@ -42,6 +42,14 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal 'host1val2', e.var2, 'env not retrieving right val for method missing'
   end
 
+  def test_host_override
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
+    e = env.bind('norole', 'host2')
+    assert_equal 'host2val3', e['var3'], 'env not retrieving right val'
+    assert_equal %w[host2val4a host2val4b], e['var4'], 'env not retrieving right val'
+    assert_equal [{'var51a' => 'val51a', 'var52a' => 'val52a'}, {'var53' => 'val53'}, {'var54' => 'val54'}], e['var5'], 'env not retrieving right val'
+  end
+
   def test_combine
     env = Rubber::Configuration::Environment
     assert_equal "new", env.combine("old", "new"), "Last should win for scalar combine"

data/test/generator_test.rb

@@ -3,7 +3,7 @@ gem 'test-unit'
 
 require 'test/unit'
 require 'tempfile'
-require 'test_helper'
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 
 class GeneratorTest < Test::Unit::TestCase
   include Rubber::Configuration
@@ -186,7 +186,7 @@ class GeneratorTest < Test::Unit::TestCase
       hello
     SRC
 
-    assert_raises RuntimeError do
+    assert_raises do
       Generator.new(nil, nil, nil).transform(src)
     end
     
@@ -232,7 +232,7 @@ class GeneratorTest < Test::Unit::TestCase
     FileUtils.rm_rf(out_dir)
     assert ! File.exists?(out_dir)
 
-    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", ['role1'], ['host1'], :out_dir => out_dir)
+    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", ['role1'], 'host1', :out_dir => out_dir)
     g.run()
     assert File.directory?(out_dir), "scoped transform did not create dir"
     assert_equal ['bar.conf', 'foo.conf'], list_dir(out_dir), "scoped transform did not create correct files"
@@ -243,12 +243,12 @@ class GeneratorTest < Test::Unit::TestCase
     FileUtils.rm_rf(out_dir)
   end
 
-  def test_ordering
+  def test_ordering_of_additive
     out_dir = "#{Dir::tmpdir}/test_rubber_ordering"
     FileUtils.rm_rf(out_dir)
     assert ! File.exists?(out_dir)
     
-    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/generator_order", ['role2', 'role1'], ['host1'], :out_dir => out_dir)
+    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/generator_order", ['role2', 'role1'], 'host1', :out_dir => out_dir)
     g.run()
     assert File.directory?(out_dir), "transform did not create dir"
     assert_equal ['out.conf'], list_dir(out_dir), "transform did not create correct file"

data/test/instance_test.rb

@@ -3,7 +3,7 @@ gem 'test-unit'
 
 require 'test/unit'
 require 'tempfile'
-require 'test_helper'
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 
 class InstanceTest < Test::Unit::TestCase
   include Rubber::Configuration

data/test/util_test.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 gem 'test-unit'
 
 require 'test/unit'
-require 'test_helper'
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 
 class UtilTest < Test::Unit::TestCase
 

data/test/zerigo_test.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 gem 'test-unit'
 
 require 'test/unit'
-require 'test_helper'
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 require 'rubber/dns'
 require 'rubber/dns/zerigo'
 require 'rexml/document'
@@ -73,6 +73,7 @@ class ZerigoTest < Test::Unit::TestCase
 
   def test_update_record
     params = {:host => 'host1', :domain => 'example1.com', :data => "1.1.1.1"}
+    new = {:host => 'host1', :domain => 'example1.com', :data => "1.1.1.2"}
 
     FakeWeb.register_uri(:get,
                          "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
@@ -81,7 +82,7 @@ class ZerigoTest < Test::Unit::TestCase
                          "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
                          :body => "")
 
-    @dns.update_host_record(params)
+    @dns.update_host_record(params, new)
   end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-06-06 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 2
         - 4
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -480,20 +475,14 @@ has_rdoc: true
 homepage: http://github.com/wr0ngway/rubber
 licenses: []
 
-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
-  
-  ********************************************************************************
-  
+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"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -503,7 +492,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -512,7 +500,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"