rubber 1.13.2 → 1.14.0

data/CHANGELOG

@@ -1,3 +1,12 @@
+1.14.0 (06/02/2011)
+-----
+
+Projects using bundler will now run rake with bundle exec
+Added ability to lockdown the version of rake that RVM will install (vulcanize base for the changes)
+Added the image type and ID for each instance to the instance file
+Fixed an issue with LVM groups keeping physical volumes in /etc/fstab
+Fixed an issue using the mysql2 adapter with the stock MySQL config
+
 1.13.2
 -----
 

data/VERSION

@@ -1 +1 @@
-1.13.2
+1.14.0

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

@@ -37,11 +37,19 @@ namespace :rubber do
 
           bash ./scripts/install
 
+          # Set up the rubygems version
           sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
 
+          # Set up the rake version
+          sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/default.gems
+          sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/global.gems
+
+          # Set up the .gemrc file
+          echo "--- " >> ~/.gemrc
+          echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
+
           #
           # end rvm install script
-
         fi
       ENDSCRIPT
     end

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

@@ -22,6 +22,9 @@ rvm_ruby: 1.9.2
 # know about newer RubyGems.  So you may need to bump your rvm_version to get the latest RubyGems release.
 rubygems_version: 1.5.2
 
+# REQUIRED: Set to version of rake you want RVM to install.
+rake_version: 0.8.7
+
 # When rvm is installed as root, and you set the default, it symlinks ruby executables
 # into /usr/local/rvm
 ruby_prefix: /usr/local/rvm

data/generators/vulcanize/templates/mysql/config/rubber/common/database.yml

@@ -3,7 +3,7 @@
 %>
 
 <%= RUBBER_ENV %>:
-  adapter: mysql
+  adapter: <%= YAML::load(File.open("#{RUBBER_ROOT}/config/database.yml"))["production"]["adapter"] %>
   encoding: utf8
   database: <%= rubber_env.db_name %>
   username: <%= rubber_env.db_user %>

data/generators/vulcanize/templates/mysql_proxy/config/rubber/common/database.yml

@@ -5,7 +5,7 @@
 # Sets up rails to talk to mysql-proxy load balancer running on localhost,
 # which then then balances requests between sql nodes in the cluster
 <%= RUBBER_ENV %>:
-  adapter: mysql
+  adapter: <%= YAML::load(File.open("#{RUBBER_ROOT}/config/database.yml"))["production"]["adapter"] %>
   encoding: utf8
   database: <%= rubber_env.db_name %>
   username: <%= rubber_env.db_user %>

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.2.1
+redis_server_version: 2.2.8
 
 redis_db_dir: /mnt/redis
 

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

@@ -72,7 +72,7 @@ namespace :rubber do
 
     # runs the given ultrasphinx rake tasks
     def run_sphinx task
-      rsudo "cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake #{task}", :as => runner
+      rsudo "cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} #{fetch(:rake, 'rake')} #{task}", :as => runner
     end
 
 

data/generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/monit-sphinx.conf

@@ -2,8 +2,8 @@
   @path = '/etc/monit/monit.d/monit-sphinx.conf'
 
   pidfile = "#{RUBBER_ROOT}/log/searchd.#{RUBBER_ENV}.pid"
-  start_program = "cd #{RUBBER_ROOT} && rake ts:start"
-  stop_program = "cd #{RUBBER_ROOT} && rake ts:stop"
+  start_program = "cd #{RUBBER_ROOT} && #{fetch(:rake, 'rake')} ts:start"
+  stop_program = "cd #{RUBBER_ROOT} && #{fetch(:rake, 'rake')} ts:stop"
 %>
 
 check process sphinx with pidfile <%= pidfile %>

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

@@ -37,11 +37,19 @@ namespace :rubber do
 
           bash ./scripts/install
 
+          # Set up the rubygems version
           sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
 
+          # Set up the rake version
+          sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/default.gems
+          sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/global.gems
+
+          # Set up the .gemrc file
+          echo "--- " >> ~/.gemrc
+          echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
+
           #
           # end rvm install script
-
         fi
       ENDSCRIPT
     end

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

@@ -22,6 +22,9 @@ rvm_ruby: 1.9.2
 # know about newer RubyGems.  So you may need to bump your rvm_version to get the latest RubyGems release.
 rubygems_version: 1.5.2
 
+# REQUIRED: Set to version of rake you want RVM to install.
+rake_version: 0.8.7
+
 # When rvm is installed as root, and you set the default, it symlinks ruby executables
 # into /usr/local/rvm
 ruby_prefix: /usr/local/rvm

data/lib/generators/vulcanize/templates/mysql/config/rubber/common/database.yml

@@ -3,7 +3,7 @@
 %>
 
 <%= RUBBER_ENV %>:
-  adapter: mysql
+  adapter: <%= YAML::load(File.open("#{RUBBER_ROOT}/config/database.yml"))["production"]["adapter"] %>
   encoding: utf8
   database: <%= rubber_env.db_name %>
   username: <%= rubber_env.db_user %>

data/lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/database.yml

@@ -5,7 +5,7 @@
 # Sets up rails to talk to mysql-proxy load balancer running on localhost,
 # which then then balances requests between sql nodes in the cluster
 <%= RUBBER_ENV %>:
-  adapter: mysql
+  adapter: <%= YAML::load(File.open("#{RUBBER_ROOT}/config/database.yml"))["production"]["adapter"] %>
   encoding: utf8
   database: <%= rubber_env.db_name %>
   username: <%= rubber_env.db_user %>

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.2.1
+redis_server_version: 2.2.8
 
 redis_db_dir: /mnt/redis
 

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

@@ -72,7 +72,7 @@ namespace :rubber do
 
     # runs the given ultrasphinx rake tasks
     def run_sphinx task
-      rsudo "cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake #{task}", :as => runner
+      rsudo "cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} #{fetch(:rake, 'rake')} #{task}", :as => runner
     end
 
 

data/lib/generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/monit-sphinx.conf

@@ -2,8 +2,8 @@
   @path = '/etc/monit/monit.d/monit-sphinx.conf'
 
   pidfile = "#{RUBBER_ROOT}/log/searchd.#{RUBBER_ENV}.pid"
-  start_program = "cd #{RUBBER_ROOT} && rake ts:start"
-  stop_program = "cd #{RUBBER_ROOT} && rake ts:stop"
+  start_program = "cd #{RUBBER_ROOT} && #{fetch(:rake, 'rake')} ts:start"
+  stop_program = "cd #{RUBBER_ROOT} && #{fetch(:rake, 'rake')} ts:stop"
 %>
 
 check process sphinx with pidfile <%= pidfile %>

data/lib/rubber/instance.rb

@@ -114,7 +114,7 @@ module Rubber
 
     # The configuration for a single instance
     class InstanceItem
-      attr_reader :name, :domain, :instance_id, :security_groups
+      attr_reader :name, :domain, :instance_id, :image_type, :image_id, :security_groups
       attr_accessor :roles, :zone
       attr_accessor :external_host, :external_ip
       attr_accessor :internal_host, :internal_ip
@@ -122,11 +122,13 @@ module Rubber
       attr_accessor :spot_instance_request_id
       attr_accessor :platform
 
-      def initialize(name, domain, roles, instance_id, security_group_list=[])
+      def initialize(name, domain, roles, instance_id, image_type, image_id, security_group_list=[])
         @name = name
         @domain = domain
         @roles = roles
         @instance_id = instance_id
+        @image_type = image_type
+        @image_id = image_id
         @security_groups = security_group_list
       end
 

data/lib/rubber/recipes/rubber/deploy.rb

@@ -84,7 +84,7 @@ namespace :rubber do
       put(File.read(secret), File.join(path, base, File.basename(secret)), :mode => "+r")
     end
 
-    rsudo "cd #{path} && #{extra_env} rake rubber:config"
+    rsudo "cd #{path} && #{extra_env} #{fetch(:rake, 'rake')} rubber:config"
   end
 
 end

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

@@ -295,7 +295,7 @@ namespace :rubber do
 
     logger.info "Instance #{instance_alias} created: #{instance_id}"
 
-    instance_item = Rubber::Configuration::InstanceItem.new(instance_alias, env.domain, instance_roles, instance_id, security_groups)
+    instance_item = Rubber::Configuration::InstanceItem.new(instance_alias, env.domain, instance_roles, instance_id, ami_type, ami, security_groups)
     instance_item.spot_instance_request_id = request_id if create_spot_instance
     rubber_instances.add(instance_item)
     rubber_instances.save()

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

@@ -1,3 +1,5 @@
+require "bundler/capistrano" if Rubber::Util.is_bundler?
+
 namespace :rubber do
 
   desc <<-DESC
@@ -257,26 +259,6 @@ namespace :rubber do
     gem_helper(false)
   end
 
-  desc <<-DESC
-    Install ruby gems defined in Gemfile
-  DESC
-  after "deploy:update_code", "rubber:install_bundler_gems" if Rubber::Util.is_bundler?
-  task :install_bundler_gems do
-    # copied from bundler/capistrano in bundler distro
-    bundle_dir     = fetch(:bundle_dir,         " #{fetch(:shared_path)}/bundle")
-    bundle_without = [*fetch(:bundle_without,   [:development, :test])].compact
-    bundle_flags   = fetch(:bundle_flags, "--deployment --quiet")
-    bundle_gemfile = fetch(:bundle_gemfile,     "Gemfile")
-    bundle_cmd     = fetch(:bundle_cmd, "bundle")
-  
-    args = ["--gemfile #{fetch(:latest_release)}/#{bundle_gemfile}"]
-    args << "--path #{bundle_dir}" unless bundle_dir.to_s.empty?
-    args << bundle_flags.to_s
-    args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
-
-    rsudo "#{bundle_cmd} install #{args.join(' ')}"
-  end
-
   desc <<-DESC
     Install ruby gems defined in the rails environment.rb
   DESC

data/lib/rubber/recipes/rubber/static_ips.rb

@@ -134,6 +134,7 @@ namespace :rubber do
     # First half of the sync.
     new_receiver = Rubber::Configuration::InstanceItem.new(old_receiver.name,
       old_receiver.domain, old_receiver.roles, old_receiver.instance_id,
+      old_receiver.image_type, old_receiver.image_id,
       old_receiver.security_groups)
     new_receiver.static_ip = static_ip
     rubber_instances.add(new_receiver)
@@ -153,6 +154,7 @@ namespace :rubber do
     # Second half of the sync.
     new_donor = Rubber::Configuration::InstanceItem.new(old_donor.name,
       old_donor.domain, old_donor.roles, old_donor.instance_id,
+      old_donor.image_type, old_donor.image_id,
       old_donor.security_groups)
     rubber_instances.add(new_donor)
 

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

@@ -221,12 +221,12 @@ namespace :rubber do
 
     task :_setup_raid_volume, :hosts => ic.external_ip do
       rubber.sudo_script 'setup_raid_volume', <<-ENDSCRIPT
-        if ! grep -q '#{raid_spec['device']}' /etc/fstab; then
+        if ! grep -qE '#{raid_spec['device']}|#{raid_spec['mount']}' /etc/fstab; then
           if mount | grep -q '#{raid_spec['mount']}'; then
             umount '#{raid_spec['mount']}'
           fi
           mv /etc/fstab /etc/fstab.bak
-          cat /etc/fstab.bak | grep -v '#{raid_spec['mount']}' > /etc/fstab
+          cat /etc/fstab.bak | grep -vE '#{raid_spec['device']}|#{raid_spec['mount']}' > /etc/fstab
           echo '#{raid_spec['device']} #{raid_spec['mount']} #{raid_spec['filesystem']} noatime 0 0 # rubber raid volume' >> /etc/fstab
 
           # seems to help devices initialize, otherwise mdadm fails because
@@ -325,10 +325,16 @@ namespace :rubber do
         for device in #{physical_volumes.join(' ')}
         do
           if ! pvdisplay $device >> /dev/null 2>&1; then
+
             if grep $device /etc/mtab; then
               umount $device
             fi
 
+            if grep -q "$device" /etc/fstab; then
+              mv /etc/fstab /etc/fstab.bak
+              cat /etc/fstab.bak | grep -v "$device\\b" > /etc/fstab
+            fi
+
             pvcreate $device
 
             # See if the volume group already exists. If so, add the new physical volume to it.

data/lib/rubber/tasks/rubber.rb

@@ -40,7 +40,7 @@ namespace :rubber do
       end
       env = cfg.environment.bind(roles, instance_alias)
       domain = env.domain
-      instance = Rubber::Configuration::InstanceItem.new(instance_alias, domain, role_items, 'dummyid', ['dummygroup'])
+      instance = Rubber::Configuration::InstanceItem.new(instance_alias, domain, role_items, 'dummyid', 'm1.small', 'ami-7000f019' ['dummygroup'])
       instance.external_host = instance.full_name
       instance.external_ip = "127.0.0.1"
       instance.internal_host = instance.full_name

metadata

@@ -2,7 +2,7 @@
 name: rubber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -04:00
+date: 2011-06-02 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -466,12 +466,6 @@ files:
 - lib/rubber/thread_safe_proxy.rb
 - lib/rubber/util.rb
 - rails/init.rb
-- test/environment_test.rb
-- test/generator_test.rb
-- test/instance_test.rb
-- test/test_helper.rb
-- test/util_test.rb
-- test/zerigo_test.rb
 has_rdoc: true
 homepage: http://github.com/wr0ngway/rubber
 licenses: []
@@ -496,14 +490,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubber
-rubygems_version: 1.6.1
+rubygems_version: 1.3.8
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)
-test_files: 
-- test/environment_test.rb
-- test/generator_test.rb
-- test/instance_test.rb
-- test/test_helper.rb
-- test/util_test.rb
-- test/zerigo_test.rb
+test_files: []
+

data/test/environment_test.rb

@@ -1,137 +0,0 @@
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'tempfile'
-require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
-
-class EnvironmentTest < Test::Unit::TestCase
-  include Rubber::Configuration
-
-  def test_known_roles
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
-    assert_equal ['role1', 'role2'], env.known_roles, "list of know roles not correct"
-  end
-
-  def test_env
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
-    e = env.bind()
-    assert_equal 'val1', e['var1'], 'env not retrieving right val'
-    assert_equal 'val2', e['var2'], 'env not retrieving right val'
-    assert_equal 'val1', e.var1, 'env not retrieving right val for method missing'
-    assert_equal 'val2', e.var2, 'env not retrieving right val for method missing'
-    
-    assert_equal 'val3', e.var3, 'env not retrieving right val for config in supplemental file'
-
-    e = env.bind('role1', 'nohost')
-    assert_equal 'val1', e['var1'], 'env not retrieving right val'
-    assert_equal 'role1val2', e['var2'], 'env not retrieving right val'
-    assert_equal 'val1', e.var1, 'env not retrieving right val for method missing'
-    assert_equal 'role1val2', e.var2, 'env not retrieving right val for method missing'
-
-    e = env.bind('role1', 'host1')
-    assert_equal 'val1', e['var1'], 'env not retrieving right val'
-    assert_equal 'host1val2', e['var2'], 'env not retrieving right val'
-    assert_equal 'val1', e.var1, 'env not retrieving right val for method missing'
-    assert_equal 'host1val2', e.var2, 'env not retrieving right val for method missing'
-
-    e = env.bind('norole', 'host1')
-    assert_equal 'val1', e['var1'], 'env not retrieving right val'
-    assert_equal 'host1val2', e['var2'], 'env not retrieving right val'
-    assert_equal 'val1', e.var1, 'env not retrieving right val for method missing'
-    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"
-    assert_equal 5, env.combine(1, 5), "Last should win for scalar combine"
-    assert_equal [1, 2, 3, 4], env.combine([1, 2, 3], [3, 4]), "Arrays should be unioned when combined"
-    assert_equal({1 => "1", 2 => "2", 3 => "3", 4 => "4"}, env.combine({1 => "1", 2 => "2"}, {3 => "3", 4 => "4"}), "Maps should be unioned when combined")
-    assert_equal({1 => "2"}, env.combine({1 => "1"}, {1 => "2"}), "Last should win for scalars in maps when combined")
-    assert_equal({1 => {1 => "1", 2 => "2"}}, env.combine({1 => {1 => "1"}}, {1 => {2 => "2"}}), "Maps should be unioned recursively when combined")
-  end
-
-  def test_expansion
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion")
-    e = env.bind()
-    assert_equal 'val1', e['var1']
-    assert_equal 'val2', e['var2']
-    assert_equal 'val1', e['var3']
-    assert_equal '4 is val2', e['var4']
-    assert_equal 'val1', e['var5']
-    assert_equal %w[lv1 lv2 val1], e['list1']
-    expected = {'mk1' => 'mv1', 'mk2' => 'mv2', 'mk3' => 'val2'}
-    e.map1.each do |k, v|
-      assert_equal expected[k], v
-    end
-      
-    e = env.bind('role1', 'nohost')
-    assert_equal 'role1val1', e['var1']
-    assert_equal 'role1val1', e['var3']
-    assert_equal %w[lv1 lv2 role1val1 role1lv1 role1val2], e['list1']
-
-    e = env.bind('role1', 'host1')
-    assert_equal 'host1val1', e['var1']
-    assert_equal 'host1val1', e['var3']
-    assert_equal %w[lv1 lv2 host1val1 role1lv1 host1val2 host1lv1], e['list1'] # lists are additive
-    
-    e = env.bind('norole', 'host1')
-    assert_equal 'host1val1', e['var1']
-    assert_equal 'host1val1', e['var3']
-    assert_equal %w[lv1 lv2 host1val1 host1lv1 host1val2], e['list1']
-  end
-
-  def test_bool_expansion
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion")
-    e = env.bind()
-    assert_equal true, e['truevar']
-    assert_equal false, e['falsevar']
-    assert_equal true, e['truevar_exp']
-    assert 'true' != e['truevar_exp']
-    assert_equal false, e['falsevar_exp']
-    assert 'false' != e['falsevar_exp']
-    assert_equal 'true thing', e['faketruevar_exp']      
-  end
-
-  def test_secret_env
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
-    e = env.bind()
-    assert_nil e['rubber_secret'], 'env should not have secret set'
-    
-    fixture_dir = File.expand_path("#{File.dirname(__FILE__)}/fixtures/secret")
-    env = Rubber::Configuration::Environment.new(fixture_dir)
-    e = env.bind()
-    assert_equal "#{fixture_dir}/secret.yml", e['rubber_secret'], 'env should have secret set'
-    assert_equal "secret_val", e['secret_key'], 'env should have gotten setting from secret file'    
-  end
-
-  def test_nested_ref
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/nested")
-    e = env.bind()
-    assert_equal 'val1', e.var1, 'env not retrieving right val'
-    assert_equal 'val3', e.var2.var3, 'env not retrieving right val'
-    assert_equal({'var5' => 'val5'}, e.var2.var4, 'env not retrieving right val')
-    assert_equal ['val6a', 'val6b'], e.var2.var6, 'env not retrieving right val'
-    assert_equal 'val1', e.var2.var7, 'env not retrieving right val'
-    assert_equal 'val3', e.var2.var8, 'env not retrieving right val'
-    assert_equal 'val5', e.var2.var9, 'env not retrieving right val'
-  end
-
-  def test_instances_in_expansion
-    config = Rubber::Configuration::get_configuration('test', "#{File.dirname(__FILE__)}/fixtures/instance_expansion")
-    config.environment
-    e = config.environment.bind()
-    e.stubs(:rubber_instances).returns(config.instance)
-    assert_equal "50.1.1.1", e['var1']
-  end
-
-end

data/test/generator_test.rb

@@ -1,370 +0,0 @@
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'tempfile'
-require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
-
-class GeneratorTest < Test::Unit::TestCase
-  include Rubber::Configuration
-
-  def test_validate
-    assert_raise RuntimeError do
-      src = <<-SRC
-        hello
-      SRC
-      Generator.new(nil, nil, nil).transform(src)
-    end
-    assert_raise RuntimeError do
-      src = <<-SRC
-        <%
-          @read_cmd = 'ls'
-        %>
-        hello
-      SRC
-      Generator.new(nil, nil, nil).transform(src)
-    end
-    assert_raise RuntimeError do
-      src = <<-SRC
-        <%
-          @write_cmd = 'cat'
-        %>
-        hello
-      SRC
-      Generator.new(nil, nil, nil).transform(src)
-    end
-  end
-
-  def test_simple_transform
-    out_file = Tempfile.new('testsimple')
-    src = <<-SRC
-      <%
-        @path = '#{out_file.path}'
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert_equal "hello", File.read(out_file.path).strip, "transformed contents are incorrect"
-  end
-
-  def test_additive_transform
-    out_file = Tempfile.new('testadditive')
-    open(out_file.path, 'w') { |f| f.write("howdy\n")}
-    src = <<-SRC
-      <%
-        @path = '#{out_file.path}'
-        @additive = ['#start', '#end']
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert_equal "howdy\n#start      \n      hello\n#end", File.read(out_file.path).strip, "transformed contents are incorrect"
-
-    src += "neato\n"
-    open(out_file.path, 'a') { |f| f.write("again\n")}
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert_equal "howdy\n#start      \n      hello\nneato\n#end\nagain", File.read(out_file.path).strip, "transformed contents are incorrect"
-  end
-
-  def test_post_command
-    out_file = Tempfile.new('testpost')
-    post_file = out_file.path + '.post'
-    src = <<-SRC
-      <%
-        @path = '#{out_file.path}'
-        @post = 'touch #{post_file}'
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert File.exists?(post_file), "transform did not execute post"
-    assert_equal "hello", File.read(out_file.path).strip, "transformed contents are incorrect"
-
-    FileUtils.rm_f(post_file)
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    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
-    gen.transform(src + "there")
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert ! File.exists?(post_file), "post should not have been generated for no_post option"
-    assert_equal "hello\nthere", File.read(out_file.path).strip, "transformed contents are incorrect"
-  end
-
-  def test_stop_on_error
-    out_file = Tempfile.new('teststoponerr')
-    post_file = out_file.path + '.post'
-    src = <<-SRC
-      <%
-        @path = '#{out_file.path}'
-        @post = 'badcommand; touch #{post_file}'
-      %>
-      hello
-    SRC
-
-    g = Generator.new(nil, nil, nil)
-    g.transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert File.exists?(post_file), "transform did not execute post"
-    assert_equal "hello", File.read(out_file.path).strip, "transformed contents are incorrect"
-
-    FileUtils.rm_f(post_file)
-    g = Generator.new(nil, nil, nil)
-    g.stop_on_error_cmd = "function error_exit { exit 99; }; trap error_exit ERR"
-    g.transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert ! File.exists?(post_file), "post should not have been executed as comes after error"
-  end
-
-  def test_pipe_command
-    out_file = Tempfile.new('testpipe')
-    src = <<-SRC
-      <%
-        @read_cmd = 'echo hi'
-        @write_cmd = 'cat > #{out_file.path}'
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate to write_cmd"
-    assert_equal "hello", File.read(out_file.path).strip, "transformed contents are incorrect"
-
-    FileUtils.rm_f(out_file.path)
-    src = <<-SRC
-      <%
-        @read_cmd = 'echo hi'
-        @write_cmd = 'cat > #{out_file.path}'
-        @additive = ['#start', '#end']
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate to write_cmd"
-    assert_equal "hi\n#start      \n      hello\n#end", File.read(out_file.path).strip, "transformed contents are incorrect"
-
-    FileUtils.rm_f(out_file.path)
-    src = <<-SRC
-      <%
-        @read_cmd = 'echo "#start\nthere\n#end\nhi\n"'
-        @write_cmd = 'cat > #{out_file.path}'
-        @additive = ['#start', '#end']
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate to write_cmd"
-    assert_equal "#start      \n      hello\n#end\nhi", File.read(out_file.path).strip, "transformed contents are incorrect"
-    
-    FileUtils.rm_f(out_file.path)
-    src = <<-SRC
-      <%
-        @read_cmd = 'echo hi'
-        @write_cmd = 'badcommand'
-      %>
-      hello
-    SRC
-
-    assert_raises do
-      Generator.new(nil, nil, nil).transform(src)
-    end
-    
-  end
-
-  def list_dir(dir)
-    l = Dir.entries(dir)
-    l.delete_if {|d| d =~ /(^\.+$)|\.bak$/}
-  end
-
-  def test_scoping
-    out_dir = "#{Dir::tmpdir}/test_rubber_scoping"
-    FileUtils.rm_rf(out_dir)
-    assert ! File.exists?(out_dir)
-
-    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", nil, nil, :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"
-    assert_equal "common", File.read("#{out_dir}/foo.conf").strip, "transformed contents are incorrect"
-    assert_equal "common", File.read("#{out_dir}/bar.conf").strip, "transformed contents are incorrect"
-
-    FileUtils.rm_rf(out_dir)
-    assert ! File.exists?(out_dir)
-
-    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", ['role1'], nil, :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"
-    assert_equal "role1", File.read("#{out_dir}/foo.conf").strip, "transformed contents are incorrect"
-    assert_equal "common", File.read("#{out_dir}/bar.conf").strip, "transformed contents are incorrect"
-
-    FileUtils.rm_rf(out_dir)
-    assert ! File.exists?(out_dir)
-
-    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", ['role2', 'role1'], nil, :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"
-    assert_equal "role2", File.read("#{out_dir}/foo.conf").strip, "transformed contents are incorrect"
-    assert_equal "common", File.read("#{out_dir}/bar.conf").strip, "transformed contents are incorrect"
-
-    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.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"
-    assert_equal "host1", File.read("#{out_dir}/foo.conf").strip, "transformed contents are incorrect"
-    assert_equal "common", File.read("#{out_dir}/bar.conf").strip, "transformed contents are incorrect"
-
-
-    FileUtils.rm_rf(out_dir)
-  end
-
-  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.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"
-    result = <<DATA
-# common first start
-first
-# common first end
-# common last start
-last
-# common last end
-# role1 first start
-role1 first
-# role1 first end
-# role1 last start
-role1 last
-# role1 last end
-# role2 first start
-role2 first
-# role2 first end
-# role2 last start
-role2 last
-# role2 last end
-# host1 first start
-host1 first
-# host1 first end
-# host1 last start
-host1 last
-# host1 last end
-DATA
-    assert_equal result.strip, File.read("#{out_dir}/out.conf").strip, "transformed contents are incorrect"
-    
-    FileUtils.rm_rf(out_dir)
-  end
-
-def test_file_pattern
-    out_dir = "#{Dir::tmpdir}/test_rubber_scoping"
-    FileUtils.rm_rf(out_dir)
-    assert ! File.exists?(out_dir)
-
-    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", nil, nil, :out_dir => out_dir)
-    g.file_pattern = 'foo\.conf'
-    g.run()
-    assert File.directory?(out_dir), "scoped transform did not create dir"
-    assert_equal ['foo.conf'], list_dir(out_dir), "scoped transform did not create correct files"
-    assert_equal "common", File.read("#{out_dir}/foo.conf").strip, "transformed contents are incorrect"
-  end
-
-  def test_perms
-    user = ENV['USER']
-    group = `groups`.split.last
-    out_file = Tempfile.new('testperms')
-    src = <<-SRC
-      <%
-        @path = '#{out_file.path}'
-        @perms = 0777
-        @owner = '#{user}'
-        @group = '#{group}'
-      %>
-      hello
-    SRC
-
-    Generator.new(nil, nil, nil).transform(src)
-    assert File.exists?(out_file.path), "transform did not generate an output file"
-    assert_equal "100777", sprintf("%o", File.stat(out_file.path).mode), "transformed permissions are incorrect"
-    assert_equal Etc.getpwnam(user).uid, File.stat(out_file.path).uid, "transformed owner is incorrect"
-    assert_equal Etc.getgrnam(group).gid,  File.stat(out_file.path).gid, "transformed group is incorrect"
-  end
-
-  def test_skip
-    out_file = Tempfile.new('testskip')
-    File.delete(out_file.path)
-    src = <<-SRC
-      <%
-        @skip = true
-        @path = '#{out_file.path}'
-      %>
-      hello
-    SRC
-
-    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

@@ -1,180 +0,0 @@
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'tempfile'
-require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
-
-class InstanceTest < Test::Unit::TestCase
-  include Rubber::Configuration
-
-  def setup
-    @instance = Instance.new(Tempfile.new('testforrole').path)
-    @instance.add(@i1 = InstanceItem.new('host1', 'domain.com', [RoleItem.new('role1')], ''))
-    @instance.add(@i2 = InstanceItem.new('host2', 'domain.com', [RoleItem.new('role1')], ''))
-    @instance.add(@i3 = InstanceItem.new('host3', 'domain.com', [RoleItem.new('role2')], ''))
-    @instance.add(@i4 = InstanceItem.new('host4', 'domain.com', [RoleItem.new('role2', 'primary' => true)], ''))
-  end
-
-  def test_for_role
-    assert_equal 2, @instance.for_role('role1').size, 'not finding correct instances for role'
-    assert_equal 2, @instance.for_role('role2').size, 'not finding correct instances for role'
-    assert_equal 1, @instance.for_role('role2', {}).size, 'not finding correct instances for role'
-    assert_equal @i3, @instance.for_role('role2', {}).first, 'not finding correct instances for role'
-    assert_equal 1, @instance.for_role('role2', 'primary' => true).size, 'not finding correct instances for role'
-    assert_equal @i4, @instance.for_role('role2', 'primary' => true).first, 'not finding correct instances for role'
-  end
-
-  def test_unfiltered
-    ENV['FILTER'] = nil
-    ENV['FILTER_ROLES'] = nil
-    setup
-    assert_equal 4, @instance.filtered().size, 'should not filter for empty FILTER(_ROLES)'
-  end
-
-
-  def test_filtered
-    ENV['FILTER_ROLES'] = nil
-    ENV['FILTER'] = 'host1'
-    setup
-    assert_equal [@i1], @instance.filtered(), 'should have only filtered host'
-    
-    ENV['FILTER'] = 'host2 , host4'
-    setup
-    assert_equal [@i2, @i4], @instance.filtered(), 'should have only filtered hosts'
-
-    ENV['FILTER'] = '-host2'
-    setup
-    assert_equal [@i1, @i3, @i4], @instance.filtered(), 'should not have negated hosts'
-
-    ENV['FILTER'] = 'host1,host2,-host2'
-    setup
-    assert_equal [@i1], @instance.filtered(), 'should not have negated hosts'
-
-    ENV['FILTER'] = 'host1~host3'
-    setup
-    assert_equal [@i1, @i2, @i3], @instance.filtered(), 'should allow range in filter'
-
-    ENV['FILTER'] = '-host1~-host3'
-    setup
-    assert_equal [@i4], @instance.filtered(), 'should allow negative range in filter'
-
-    ENV['FILTER'] = '-host1'
-    ENV['FILTER_ROLES'] = 'role1'
-    setup
-    assert_equal [@i2], @instance.filtered(), 'should not have negated roles'
-  end
-
-  def test_filtered_roles
-    ENV['FILTER'] = nil
-    ENV['FILTER_ROLES'] = 'role1'
-    setup
-    assert_equal [@i1, @i2], @instance.filtered(), 'should have only filtered roles'
-
-    ENV['FILTER_ROLES'] = 'role1 , role2'
-    setup
-    assert_equal [@i1, @i2, @i3, @i4], @instance.filtered(), 'should have only filtered roles'
-
-    ENV['FILTER_ROLES'] = '-role1'
-    setup
-    assert_equal [@i3, @i4], @instance.filtered(), 'should not have negated roles'
-
-    ENV['FILTER_ROLES'] = 'role1~role2'
-    setup
-    assert_equal [@i1, @i2, @i3, @i4], @instance.filtered(), 'should allow range in filter'
-
-    ENV['FILTER_ROLES'] = '-role1~-role2'
-    setup
-    assert_equal [], @instance.filtered(), 'should allow negative range in filter'
-  end
-
-  def test_validate_filters
-    ENV['FILTER'] = "nohost"
-    setup
-    assert_raises do
-      @instance.filtered()
-    end
-
-    ENV['FILTER'] = "-nohost"
-    setup
-    assert_raises do
-      @instance.filtered()
-    end
-
-    ENV['FILTER_ROLES'] = "norole"
-    setup
-    assert_raises do
-      @instance.filtered()
-    end
-
-    ENV['FILTER_ROLES'] = "-norole"
-    setup
-    assert_raises do
-      @instance.filtered()
-    end
-  end
-
-  def test_equality
-    assert RoleItem.new('a').eql?(RoleItem.new('a'))
-    assert RoleItem.new('a') == RoleItem.new('a')
-    assert_equal RoleItem.new('a').hash, RoleItem.new('a').hash
-
-    assert ! RoleItem.new('a').eql?(RoleItem.new('b'))
-    assert RoleItem.new('a') != RoleItem.new('b')
-    assert_not_equal RoleItem.new('a').hash, RoleItem.new('b').hash
-
-    assert RoleItem.new('a', {'a' => 'b', 1 => true}).eql?(RoleItem.new('a', {'a' => 'b', 1 => true}))
-    assert RoleItem.new('a', {'a' => 'b', 1 => true}) == RoleItem.new('a', {'a' => 'b', 1 => true})
-    assert_equal RoleItem.new('a', {'a' => 'b', 1 => true}).hash, RoleItem.new('a', {'a' => 'b', 1 => true}).hash
-
-    assert ! RoleItem.new('a', {'a' => 'b', 1 => true}).eql?(RoleItem.new('a', {'a' => 'b', 2 => true}))
-    assert RoleItem.new('a', {'a' => 'b', 1 => true}) != RoleItem.new('a', {'a' => 'b', 2 => true})
-    assert_equal RoleItem.new('a', {'a' => 'b', 1 => true}).hash, RoleItem.new('a', {'a' => 'b', 2 => true}).hash
-  end
-
-  def test_role_parse
-    assert_equal RoleItem.new('a'), RoleItem.parse("a")
-    assert_equal RoleItem.new('a', {'b' => 'c'}), RoleItem.parse("a:b=c")
-    assert_equal RoleItem.new('a', {'b' => 'c', 'd' => 'e'}), RoleItem.parse("a:b=c;d=e")
-    assert_equal RoleItem.new('a', {'b' => true, 'c' => false}), RoleItem.parse("a:b=true;c=false")
-  end
-
-  def test_role_to_s
-    assert_equal "a", RoleItem.new('a').to_s
-    assert_equal "a:b=c", RoleItem.new('a', {'b' => 'c'}).to_s
-    assert_equal "a:b=c;d=e", RoleItem.new('a', {'b' => 'c', 'd' => 'e'}).to_s
-    assert_equal "a:b=true;c=false", RoleItem.new('a', {'b' => true, 'c' => false}).to_s
-  end
-
-  def test_expand_role_dependencies
-    deps = { RoleItem.new('a') => RoleItem.new('b'),
-             RoleItem.new('b') => RoleItem.new('c'),
-             RoleItem.new('c') => [RoleItem.new('d'), RoleItem.new('a')]}
-    roles = [RoleItem.new('a'),RoleItem.new('b'),RoleItem.new('c'),RoleItem.new('d')]
-    assert_equal roles, RoleItem.expand_role_dependencies(RoleItem.new('a'), deps).sort
-    assert_equal roles, RoleItem.expand_role_dependencies([RoleItem.new('a'), RoleItem.new('d')], deps).sort
-
-    deps = { RoleItem.new('mysql_master') => RoleItem.new('db', {'primary' => true}),
-             RoleItem.new('mysql_slave') => RoleItem.new('db'),
-             RoleItem.new('db', {'primary' => true}) => RoleItem.new('mysql_master'),
-             RoleItem.new('db') => RoleItem.new('mysql_slave')
-    }
-    assert_equal [RoleItem.new('db', 'primary' => true), RoleItem.new('mysql_master')],
-                 RoleItem.expand_role_dependencies(RoleItem.new('mysql_master'), deps).sort
-    assert_equal [RoleItem.new('db', 'primary' => true), RoleItem.new('mysql_master')],
-                 RoleItem.expand_role_dependencies(RoleItem.new('db', 'primary' => true), deps).sort
-    assert_equal [RoleItem.new('db'), RoleItem.new('mysql_slave')],
-                 RoleItem.expand_role_dependencies(RoleItem.new('mysql_slave'), deps).sort
-    assert_equal [RoleItem.new('db'), RoleItem.new('mysql_slave')],
-                 RoleItem.expand_role_dependencies(RoleItem.new('db'), deps).sort
-
-  end
-
-  def test_common_dependencies
-    deps = { RoleItem.new('a') => RoleItem.new('b'),
-             RoleItem.new('common') => [RoleItem.new('c')]}
-    roles = [RoleItem.new('a'), RoleItem.new('b'), RoleItem.new('c')]
-    assert_equal roles, RoleItem.expand_role_dependencies(RoleItem.new('a'), deps).sort
-  end
-  
-end

data/test/test_helper.rb

@@ -1,14 +0,0 @@
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
-
-require 'rubber'
-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

@@ -1,19 +0,0 @@
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
-
-class UtilTest < Test::Unit::TestCase
-
-  def test_stringify
-    assert_equal "", Rubber::Util::stringify(nil)
-    assert_equal "hi", Rubber::Util::stringify("hi")
-    assert_equal "1", Rubber::Util::stringify(1)
-    assert_equal "3.4", Rubber::Util::stringify(3.4)
-    assert_equal ["1", "2", "r"], Rubber::Util::stringify([1, 2, "r"])
-    assert_equal({"1" => "2", "three" => "four"}, Rubber::Util::stringify({1 => 2, :three => "four"}))
-    assert_equal [{"3" => "4"}], Rubber::Util::stringify([{3 => 4}])
-  end
-
-end

data/test/zerigo_test.rb

@@ -1,88 +0,0 @@
-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,
-                         "https://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,
-                         "https://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,
-                         "https://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,
-                         "https://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,
-                         "https://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,
-                         "https://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,
-                         "https://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,
-                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
-                         :body => "")
-
-    @dns.update_host_record(params, new)
-  end
-
-end