axtro-rubber 1.2.3 → 1.5.7

data/lib/rubber/recipes/rubber/utils.rb

@@ -16,23 +16,26 @@ namespace :rubber do
     default_roles = rubber_env.staging_roles || "*"
     roles = ENV['ROLES'] = rubber.get_env("ROLES", "Roles to use for staging instance", true, default_roles)
 
-    # some bootstraps update code (bootstrap_db) but if you don't have that role, need to do it here
-    # Since release directory variable gets reused by cap, we have to just do the symlink here - doing
-    # a update again will fail
-    set :rubber_code_was_updated, false
-    after "deploy:update_code" do
-      set :rubber_code_was_updated, true
-    end
-
     if rubber_instances[instance_alias]
       logger.info "Instance already exists, skipping to bootstrap"
     else
       rubber.create
     end
+
+    # stop everything before so monit doesn't start stuff during bootstrapping
+    # if its already installed due to a bundled instance
+    deploy.stop rescue nil
+
     rubber.bootstrap
-    # stop everything in case we have a bundled instance with monit, etc starting at boot
+    
+    # stop everything after in case package upgrades during bootstrap start up
+    # services - we should be able to safely do a deploy:start below
     deploy.stop rescue nil
-    if ! rubber_code_was_updated
+
+    # some bootstraps update code (bootstrap_db) but if you don't have that role, need to do it here
+    # Since release directory variable gets reused by cap, we have to just do the symlink here - doing
+    # a update again will fail
+    if ! fetch(:rubber_code_was_updated, false)
       deploy.update_code
     end
     deploy.symlink
@@ -147,22 +150,30 @@ namespace :rubber do
     return local_alias
   end
 
-  def prepare_script(name, contents)
+  def prepare_script(name, contents, stop_on_error_cmd=rubber_env.stop_on_error_cmd)
     script = "/tmp/#{name}"
     # this lets us abort a script if a command in the middle of it errors out
-    contents = "#{rubber_env.stop_on_error_cmd}\n#{contents}" if rubber_env.stop_on_error_cmd
+    contents = "#{stop_on_error_cmd}\n#{contents}" if stop_on_error_cmd
     put(contents, script)
     return script
   end
 
-  def run_script(name, contents)
+  def run_script(name, contents, opts = {})
+    args = opts.delete(:script_args)
     script = prepare_script(name, contents)
-    run "sh #{script}"
+    run "bash #{script} #{args}", opts
   end
 
-  def sudo_script(name, contents)
+  def sudo_script(name, contents, opts = {})
+    args = opts.delete(:script_args)
     script = prepare_script(name, contents)
-    sudo "sh #{script}"
+    run "#{sudo} bash -l #{script} #{args}", opts
+  end
+
+  def top.rsudo(command, opts = {}, &block)
+    user = opts.delete(:as)
+    args = "-H -u #{user}" if user
+    run "#{sudo opts} #{args} bash -l -c '#{command}'", opts, &block
   end
 
   def get_env(name, desc, required=false, default=nil)
@@ -200,4 +211,16 @@ namespace :rubber do
     return opts
   end
 
+  # some bootstraps update code (bootstrap_db), so keep track so we don't do it multiple times  
+  after "deploy:update_code" do
+    set :rubber_code_was_updated, true
+  end
+  
+  def update_code_for_bootstrap
+    unless (fetch(:rubber_code_was_updated, false))
+      deploy.setup
+      deploy.update_code
+    end
+  end
+  
 end

data/lib/rubber/recipes/rubber/volumes.rb

@@ -94,18 +94,17 @@ namespace :rubber do
       print "Waiting for volume to attach"
       while true do
         print "."
-        sleep 2
         volume = cloud.describe_volumes(vol_id).first
         break if volume[:status] == "in-use" and volume[:attachment_status] == "attached"
+        sleep 2
       end
-      sleep 2
       print "\n"
 
       # we don't mount/format at this time if we are doing a RAID array
       if vol_spec['mount'] && vol_spec['filesystem']
         # then format/mount/etc if we don't have an entry in hosts file
         task :_setup_volume, :hosts => ic.external_ip do
-          rubber.run_script 'setup_volume', <<-ENDSCRIPT
+          rubber.sudo_script 'setup_volume', <<-ENDSCRIPT
             if ! grep -q '#{vol_spec['mount']}' /etc/fstab; then
               if mount | grep -q '#{vol_spec['mount']}'; then
                 umount '#{vol_spec['mount']}'
@@ -114,7 +113,7 @@ namespace :rubber do
               cat /etc/fstab.bak | grep -v '#{vol_spec['mount']}' > /etc/fstab
               echo '#{vol_spec['device']} #{vol_spec['mount']} #{vol_spec['filesystem']} noatime 0 0 # rubber volume #{vol_id}' >> /etc/fstab
 
-              #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + vol_spec['device']) if created and !vol_spec['base']}
+              #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + vol_spec['device']) if created}
               mkdir -p '#{vol_spec['mount']}'
               mount '#{vol_spec['mount']}'
             fi
@@ -136,7 +135,7 @@ namespace :rubber do
     if ! ic.partitions.include?(part_id)
       # then format/mount/etc if we don't have an entry in hosts file
       task :_setup_partition, :hosts => ic.external_ip do
-        rubber.run_script 'setup_partition', <<-ENDSCRIPT
+        rubber.sudo_script 'setup_partition', <<-ENDSCRIPT
           if ! fdisk -l 2>&1 | grep -q '#{partition_spec['partition_device']}'; then
             if grep -q '#{partition_spec['disk_device']}\\b' /etc/fstab; then
               umount #{partition_spec['disk_device']}
@@ -176,7 +175,7 @@ namespace :rubber do
       end
       # then format/mount/etc if we don't have an entry in hosts file
       task :_zero_partitions, :hosts => ic.external_ip do
-        rubber.run_script 'zero_partitions', <<-ENDSCRIPT
+        rubber.sudo_script 'zero_partitions', <<-ENDSCRIPT
           # zero out parition for performance (see amazon DevGuide)
           echo "Zeroing out raid partitions to improve performance, this way take a while"
           #{zero_script}
@@ -201,7 +200,7 @@ namespace :rubber do
     end
 
     task :_setup_raid_volume, :hosts => ic.external_ip do
-      rubber.run_script 'setup_raid_volume', <<-ENDSCRIPT
+      rubber.sudo_script 'setup_raid_volume', <<-ENDSCRIPT
         if ! grep -q '#{raid_spec['device']}' /etc/fstab; then
           if mount | grep -q '#{raid_spec['mount']}'; then
             umount '#{raid_spec['mount']}'

data/lib/rubber/tasks/rubber.rb

@@ -252,7 +252,7 @@ namespace :rubber do
     if (init_s3 &&
         AWS::S3::Bucket.list.find { |b| b.name == backup_bucket })
       s3objects = AWS::S3::Bucket.find(backup_bucket,
-                 :prefix => (file || 'db/')) 
+                 :prefix => (file || 'db/'))
       if file
         puts "trying to fetch #{file} from s3"
         data = s3objects.detect { |o| file == o.key }

data/lib/rubber/util.rb

@@ -30,8 +30,43 @@ module Rubber
     end
 
     def self.is_rails?
-      File.exist?(File.join(RUBBER_ROOT, 'config', 'environment.rb'))
+      File.exist?(File.join(RUBBER_ROOT, 'config', 'boot.rb'))
     end
 
+    def self.is_rails2?
+      defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 2
+    end
+
+    def self.is_rails3?
+      defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 3
+    end
+
+    def self.is_bundler?
+      File.exist?(File.join(RUBBER_ROOT, 'Gemfile'))
+    end
+
+    def self.rubber_as_plugin?
+      File.exist?(File.join(RUBBER_ROOT, 'vendor/plugins/rubber'))
+    end
+
+    def self.prompt(name, desc, required=false, default=nil)
+      value = ENV.delete(name)
+      msg = "#{desc}"
+      msg << " [#{default}]" if default
+      msg << ": "
+      unless value
+        print msg
+        value = gets
+      end
+      value = value.size == 0 ? default : value
+      self.fatal "#{name} is required, pass using environment or enter at prompt" if required && ! value
+      return value
+    end
+
+    def self.fatal(msg, code=1)
+      puts msg
+      exit code
+    end
+    
   end
 end

data/rails/init.rb

@@ -3,7 +3,4 @@
 #
 
 require "rubber"
-Rubber::initialize(RAILS_ROOT, RAILS_ENV)
-
-::RUBBER_CONFIG = Rubber::Configuration.rubber_env
-::RUBBER_INSTANCES = Rubber::Configuration.rubber_instances
+Rubber::initialize(Rails.root, Rails.env)

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
@@ -93,6 +93,14 @@ class GeneratorTest < Test::Unit::TestCase
     assert ! File.exists?(post_file), "post should not have been executed as dest file unchanged"
     assert_equal "hello", File.read(out_file.path).strip, "transformed contents are incorrect"
 
+    FileUtils.rm_f(post_file)
+    gen = Generator.new(nil, nil, nil)
+    gen.force = true
+    gen.transform(src)
+    assert File.exists?(out_file.path), "transform did not generate an output file"
+    assert File.exists?(post_file), "forced transform did not execute post"
+    assert_equal "hello", File.read(out_file.path).strip, "transformed contents are incorrect"
+
     FileUtils.rm_f(post_file)
     gen = Generator.new(nil, nil, nil)
     gen.no_post = true
@@ -178,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
     
@@ -224,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"
@@ -235,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"
@@ -323,4 +331,40 @@ def test_file_pattern
     Generator.new(nil, nil, nil).transform(src)
     assert ! File.exists?(out_file.path), "transform didn't skip generation of an output file"
   end
+
+  def test_backup
+    out_file = Tempfile.new('testbak')
+    assert ! File.exists?("#{out_file.path}.bak")
+    File.open(out_file.path, 'w') {|f| f.write("howdy")}
+    
+    src = <<-SRC
+      <%
+        @path = '#{out_file.path}'
+      %>
+     hello <%= Time.now.to_f %>
+    SRC
+
+    Generator.new(nil, nil, nil).transform(src)
+
+    assert File.exists?("#{out_file.path}.bak"), "transform didn't generate backup"
+    assert_match /howdy/, File.read("#{out_file.path}.bak"), "transform backup has wrong contents"
+  end
+
+  def test_no_backup
+    out_file = Tempfile.new('testnobak')
+    assert ! File.exists?("#{out_file.path}.bak")
+    File.open(out_file.path, 'w') {|f| f.write("howdy")}
+    src = <<-SRC
+      <%
+        @path = '#{out_file.path}'
+        @backup = false
+      %>
+     hello <%= Time.now.to_f %>
+    SRC
+
+    Generator.new(nil, nil, nil).transform(src)
+
+    assert ! File.exists?("#{out_file.path}.bak"), "transform shouldn't generate backup"
+  end
+
 end

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/test_helper.rb

@@ -6,3 +6,9 @@ Rubber::initialize(File.dirname(__FILE__), 'test')
 require 'rubygems'
 require 'mocha'
 require 'pp'
+require 'fakeweb'
+FakeWeb.allow_net_connect = false
+
+def fakeweb_fixture(name)
+  return File.read("#{File.dirname(__FILE__)}/fixtures/fakeweb/#{name}")
+end

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

@@ -0,0 +1,88 @@
+require 'rubygems'
+gem 'test-unit'
+
+require 'test/unit'
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
+require 'rubber/dns'
+require 'rubber/dns/zerigo'
+require 'rexml/document'
+
+class ZerigoTest < Test::Unit::TestCase
+
+  def setup
+    env = Rubber::Configuration::Environment::BoundEnv.new({'dns_providers' => {'zerigo' => {'email' => 'foo@bar.com', 'token' => 'testtoken'}}}, nil, nil)
+    @dns = Rubber::Dns::Zerigo.new(env)
+    FakeWeb.register_uri(:get,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/zones.xml",
+                         :body => fakeweb_fixture('zerigo/get_zones.xml'))
+    @domain = "example1.com"
+    @zone = ::Zerigo::DNS::Zone.find_or_create(@domain)
+  end
+
+  def test_find_records
+    hosts_xml = fakeweb_fixture('zerigo/get_hosts.xml')
+    FakeWeb.register_uri(:get,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?zone_id=1",
+                         :body => hosts_xml)
+    records = @dns.find_host_records(:host => '*', :domain => 'example1.com')
+    assert_equal 2, records.size
+    assert_equal({:type=>"A", :host=>"host1", :domain=>"example1.com", :id=>1, :data=>"172.16.16.1"}, records.first)
+
+    doc = REXML::Document.new(hosts_xml)
+    doc.root.elements.delete(1)
+    hosts_xml_single = doc.to_s
+    FakeWeb.register_uri(:get,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=example1.com&zone_id=1",
+                         :body => hosts_xml_single)
+    records = @dns.find_host_records(:host => '', :domain => 'example1.com')
+    assert_equal 1, records.size
+    assert_equal '', records.first[:host]
+
+    doc = REXML::Document.new(hosts_xml)
+    doc.root.elements.delete(2)
+    hosts_xml_single = doc.to_s
+    FakeWeb.register_uri(:get,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
+                         :body => hosts_xml_single)
+    records = @dns.find_host_records(:host => 'host1', :domain => 'example1.com')
+    assert_equal 1, records.size
+    assert_equal 'host1', records.first[:host]
+  end
+
+  def test_create_record
+    params = {:host => 'newhost', :domain => 'example1.com', :data => '1.1.1.1', :type => 'A', :ttl => '333'}
+    dest_params = {'hostname' => 'newhost', 'data' => '1.1.1.1', 'host_type' => 'A', 'ttl' => '333', :zone_id => @zone.id}
+
+    ::Zerigo::DNS::Host.expects(:create).with(dest_params)
+    
+    @dns.create_host_record(params)
+  end
+
+  def test_destroy_record
+    params = {:host => 'host1', :domain => 'example1.com'}
+
+    FakeWeb.register_uri(:get,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
+                         :body => fakeweb_fixture('zerigo/host1.xml'))
+    FakeWeb.register_uri(:delete,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
+                         :body => "")
+
+    @dns.destroy_host_record(params)
+  end
+
+  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",
+                         :body => fakeweb_fixture('zerigo/host1.xml'))
+    FakeWeb.register_uri(:post,
+                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
+                         :body => "")
+
+    @dns.update_host_record(params, new)
+  end
+
+end