rubber 1.2.1 → 1.3.0

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

@@ -59,8 +59,8 @@ namespace :rubber do
     Sets permissions of files in application directory to be owned by app_user.
   DESC
   task :setup_app_permissions do
-    run "find #{shared_path} -name cached-copy -prune -o -print | xargs chown #{rubber_env.app_user}:#{rubber_env.app_user}"
-    run "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/tmp"
+    sudo "sh -c 'find #{shared_path} -name cached-copy -prune -o -print | xargs chown #{rubber_env.app_user}:#{rubber_env.app_user}'"
+    sudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/tmp"
   end
 
   def run_config(options={})

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

@@ -228,6 +228,9 @@ namespace :rubber do
         instance_item.platform = instance[:platform]
         rubber_instances.save()
 
+        # 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
 

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

@@ -7,8 +7,8 @@ namespace :rubber do
     Bootstraps instances by setting timezone, installing packages and gems
   DESC
   task :bootstrap do
-    set_timezone
     link_bash
+    set_timezone
     upgrade_packages
     install_packages
     setup_volumes
@@ -17,6 +17,33 @@ namespace :rubber do
     deploy.setup
   end
 
+  # Sets up instance to allow root access (e.g. recent canonical AMIs)
+  def enable_root_ssh(ip, initial_ssh_user)
+    old_user = user
+    begin
+      set :user, initial_ssh_user
+
+      task :_allow_root_ssh, :hosts => ip do
+        sudo "cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"
+      end
+
+      begin
+        _allow_root_ssh
+      rescue ConnectionError => e
+        if e.message =~ /Net::SSH::AuthenticationFailed/
+          logger.info "Can't connect as user #{initial_ssh_user} to #{ip}, assuming root allowed"
+        else
+          sleep 2
+          logger.info "Failed to connect to #{ip}, retrying"
+          retry
+        end
+      end
+    ensure
+      set :user, old_user
+    end
+
+  end
+
   desc <<-DESC
     Sets up aliases for instance hostnames based on contents of instance.yml.
     Generates /etc/hosts for local/remote machines and sets hostname on
@@ -167,7 +194,9 @@ namespace :rubber do
       put filtered, hosts_file
 
       # Setup hostname on instance so shell, etcs have nice display
-      sudo "echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$"
+      sudo "sh -c 'echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$'"
+      # Newer ubuntus ec2-init script always resets hostname, so prevent it
+      sudo "sh -c 'echo compat=0 > /etc/ec2-init/is-compat-env'"
     end
 
     # TODO
@@ -248,46 +277,43 @@ namespace :rubber do
 
     logger.info "Installing gems:#{expanded_gem_list}"
     open("/tmp/gem_helper", "w") {|f| f.write(gem_helper_script)}
-    system "sh /tmp/gem_helper install #{expanded_gem_list}"
+    system "ruby /tmp/gem_helper install #{expanded_gem_list}"
   end
 
+  set :gem_sources_helper_script, <<-'ENDSCRIPT'
+    sources = ARGV
+
+    installed = []
+    `gem sources -l`.each_line do |line|
+      line = line.strip
+      installed << line if line.size > 0 && line =~ /^[^*]/
+    end
+
+    to_install = sources - installed
+    to_remove = installed - sources
+
+    if to_install.size > 0
+      to_install.each do |source|
+        system "gem sources -a #{source}"
+        fail "Unable to add gem sources" if $?.exitstatus > 0
+      end
+    end
+    if to_remove.size > 0
+      to_remove.each do |source|
+        system "gem sources -r #{source}"
+        fail "Unable to remove gem sources" if $?.exitstatus > 0
+      end
+    end
+  ENDSCRIPT
+  
   desc <<-DESC
     Setup ruby gems sources. Set 'gemsources' in rubber.yml to \
     be an array of URI strings.
   DESC
   task :setup_gem_sources do
     if rubber_env.gemsources
-      script = prepare_script 'gem_sources_helper', <<-'ENDSCRIPT'
-        ruby - $@ <<-'EOF'
-
-        sources = ARGV
-
-        installed = []
-        `gem sources -l`.grep(/^[^*]/) do |line|
-            line = line.strip
-            installed << line if line.size > 0
-        end
-
-        to_install = sources - installed
-        to_remove = installed - sources
-
-        if to_install.size > 0
-          to_install.each do |source|
-            system "gem sources -a #{source}"
-            fail "Unable to add gem sources" if $?.exitstatus > 0
-          end
-        end
-        if to_remove.size > 0
-          to_remove.each do |source|
-            system "gem sources -r #{source}"
-            fail "Unable to remove gem sources" if $?.exitstatus > 0
-          end
-        end
-
-        'EOF'
-      ENDSCRIPT
-
-      sudo "sh #{script} #{rubber_env.gemsources.join(' ')}"
+      script = prepare_script 'gem_sources_helper', gem_sources_helper_script, nil
+      sudo "ruby #{script} #{rubber_env.gemsources.join(' ')}"
     end
   end
 
@@ -296,7 +322,7 @@ namespace :rubber do
     You can override this task if you don't want this to happen
   DESC
   task :link_bash do
-    sudo("ln -sf /bin/bash /bin/sh")
+    sudo "ln -sf /bin/bash /bin/sh"
   end
 
   desc <<-DESC
@@ -310,10 +336,16 @@ namespace :rubber do
   DESC
   task :set_timezone do
     opts = get_host_options('timezone')
-    sudo "bash -c 'echo $CAPISTRANO:VAR$ > /etc/timezone'", opts
+    sudo "sh -c 'echo $CAPISTRANO:VAR$ > /etc/timezone'", opts
     sudo "cp /usr/share/zoneinfo/$CAPISTRANO:VAR$ /etc/localtime", opts
     # restart syslog so that times match timezone
-    sudo "/etc/init.d/sysklogd restart"
+    sudo_script 'restart_syslog', <<-ENDSCRIPT
+      if [[ -x /etc/init.d/sysklogd ]]; then
+        /etc/init.d/sysklogd restart
+      elif [[ -x /etc/init.d/rsyslog ]]; then
+        /etc/init.d/rsyslog restart
+     fi
+    ENDSCRIPT
   end
   
   def update_dyndns(instance_item)
@@ -354,7 +386,7 @@ namespace :rubber do
   end
 
   def custom_package(url_base, name, ver, install_test)
-    rubber.run_script "install_#{name}", <<-ENDSCRIPT
+    rubber.sudo_script "install_#{name}", <<-ENDSCRIPT
       if [[ #{install_test} ]]; then
         arch=`uname -m`
         if [ "$arch" = "x86_64" ]; then
@@ -389,8 +421,6 @@ namespace :rubber do
   # calls to rubygems
   #
   set :gem_helper_script, <<-'ENDSCRIPT'
-    ruby - $@ <<-'EOF'
-
     gem_cmd = ARGV[0]
     gems = ARGV[1..-1]
     cmd = "gem #{gem_cmd} --no-rdoc --no-ri"
@@ -408,7 +438,7 @@ namespace :rubber do
     end
 
     installed = {}
-    `gem list --local`.each do |line|
+    `gem list --local`.each_line do |line|
         parts = line.scan(/(.*) \((.*)\)/).first
         next unless parts && parts.size == 2
         installed[parts[0]] = parts[1].split(",")
@@ -429,8 +459,6 @@ namespace :rubber do
       system "#{cmd} #{gem_list}"
       fail "Unable to install gems" if $?.exitstatus > 0
     end
-
-    'EOF'
   ENDSCRIPT
 
   # Helper for installing gems,allows one to respond to prompts
@@ -450,11 +478,11 @@ namespace :rubber do
     end
     
     if opts.size > 0
-      script = prepare_script('gem_helper', gem_helper_script)
-      sudo "sh #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|
+      script = prepare_script('gem_helper', gem_helper_script, nil)
+      sudo "ruby #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|
         handle_gem_prompt(ch, data, str)
       end
     end
   end
 
-end
+end

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

@@ -147,10 +147,10 @@ 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

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

@@ -104,7 +104,7 @@ namespace :rubber do
       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']}'
@@ -135,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']}
@@ -175,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}
@@ -200,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/test/generator_test.rb

@@ -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
@@ -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/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/zerigo_test.rb

@@ -0,0 +1,87 @@
+require 'rubygems'
+gem 'test-unit'
+
+require 'test/unit'
+require '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"}
+
+    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)
+  end
+
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -05:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: zerigo_dns
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -82,7 +82,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: httparty
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -93,6 +93,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to Amazon's Elastic Compute Cloud (EC2).  Like capistrano, rubber is role based, so you can define a set of configuration files for a role and then assign that role to as many concrete instances as needed. One can also assign multiple roles to a single instance. This lets one start out with a single ec2 instance (belonging to all roles), and add new instances into the mix as needed to scale specific facets of your deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load.
 email: matt@conwaysplace.com
 executables: 
@@ -197,6 +209,7 @@ files:
 - generators/vulcanize/templates/munin/templates.yml
 - generators/vulcanize/templates/mysql/config/rubber/common/database.yml
 - generators/vulcanize/templates/mysql/config/rubber/deploy-mysql.rb
+- generators/vulcanize/templates/mysql/config/rubber/role/db/apparmor-mysql.conf
 - generators/vulcanize/templates/mysql/config/rubber/role/db/crontab
 - generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf
 - generators/vulcanize/templates/mysql/config/rubber/role/db/my.cnf
@@ -319,3 +332,4 @@ test_files:
 - test/instance_test.rb
 - test/test_helper.rb
 - test/util_test.rb
+- test/zerigo_test.rb