rubber 2.0.1 → 2.0.2

data/.travis.yml

@@ -3,8 +3,9 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-#  - jruby-18mode # JRuby in 1.8 mode
-#  - jruby-19mode # JRuby in 1.9 mode
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
 #  - rbx-18mode
 #  - rbx-19mode
 # script: bundle exec rspec spec

data/CHANGELOG

@@ -1,13 +1,55 @@
-2.0.1
------
+2.0.2 (05/08/2012)
+
+New Features:
+============
+
+[graylog] Added an admin UI for ElasticSearch
+
+Improvements:
+============
+
+[base] Use ntpd instead of cron for syncing time
+[core] Auto-reboot for kernel updates on initial instance bootstrap rather than prompting the user to reboot
+[redis] Upgraded to redis 2.4.12 from 2.4.11
+
+Bug Fixes:
+=========
+
+[core] Fixed issue with Route 53 DNS not updating records properly
+[core] Wait for EBS volumes to be fully attached before trying to format them
+[core] Fixed issue with running `rubber config` locally
+[collectd] Made the runner executable
+[graphite] Fixed some broken URLs in the dashboard
+[passenger] Fixed issue with using a path to config.ru before capistrano completed setting it up.
+[resque] Replaced a hard-coded reference to the resque-pool PID file with the rubber configured one
+[resque] Append to the resque-pool.log file rather than overwrite it 
+[zookeeper] Fixed the detection of an existing zookeeper installation
+
+
+
+2.0.1 (04/29/2012)
+----------
+
+New Features:
+============
+
+[base] Added the ability to supply additional arguments to RVM (e.g., to install additional patches or modify compile arguments)
+[graphite] Added a simple graphite dashboard suitable for TV display
 
 Improvements:
 ============
 
-Upgraded to redis 2.4.11 from 2.4.6
-Upgraded to RVM 1.13.0 from 1.10.2
-Upgraded to Ubuntu 12.04
-Assorted fixes/workarounds for 12.04
+[redis] Upgraded to redis 2.4.11 from 2.4.6
+[base] Upgraded to RVM 1.13.0 from 1.10.2
+[base] Upgraded to Ubuntu 12.04
+
+Bug Fixes:
+=========
+
+[base] Assorted fixes/workarounds for 12.04
+[collectd] Fixed an issue with libperl and collectd
+[redis] Fixed an issue with the redis role not installing the zip packaged, needed for backup
+
 
 2.0.0 (04/24/2012)
 ----------

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
+
+gem 'jruby-openssl', :platforms => :jruby
 
 # Specify your gem's dependencies in rubber.gemspec
 gemspec

data/lib/rubber/dns/fog.rb

@@ -12,25 +12,60 @@ module Rubber
         super(env)
         creds = Rubber::Util.symbolize_keys(env.credentials)
         @client = ::Fog::DNS.new(creds)
+        @name_includes_domain = env.name_includes_domain
+        @name_includes_trailing_period = env.name_includes_trailing_period
       end
+      
+      def normalize_name(name, domain)
+        domain = domain.gsub(/\.$/, "") if @name_includes_trailing_period
 
+        name = name.gsub(/\.$/, "") if @name_includes_trailing_period
+        name = name.gsub(/.?#{domain}$/, "") if @name_includes_domain
+        
+        return name, domain
+      end
+      
+      def denormalize_name(name, domain)
+        if @name_includes_domain
+          if name && name.strip.empty?
+            name = "#{domain}"
+          else
+            name = "#{name}.#{domain}"
+          end
+        end
+        
+        if @name_includes_trailing_period
+          name = "#{name}." 
+          domain = "#{domain}."
+        end
+        
+        return name, domain
+      end
+      
       def host_to_opts(host)
+        name, domain = normalize_name(host.name || '', host.zone.domain)
+
         opts = {}
-        opts[:id] = host.id
-        opts[:host] = host.name || ''
+        opts[:id] = host.id if host.respond_to?(:id) && host.id
+        opts[:host] = name
+        opts[:domain] = domain
         opts[:type] = host.type
-        opts[:data] = host.value if host.value
-        opts[:ttl] = host.ttl if host.ttl
-        opts[:priority] = host.priority if host.priority
+        opts[:data] = Array(host.value).first if host.value
+        opts[:ttl] = host.ttl.to_i if host.ttl
+        opts[:priority] = host.priority if host.respond_to?(:priority) && host.priority
+        
         return opts
       end
 
       def opts_to_host(opts, host={})
-        host[:name] = opts[:host]
+        name, domain = denormalize_name(opts[:host], opts[:domain])
+        
+        host[:name] = name  
         host[:type] =  opts[:type]
         host[:value] = opts[:data] if opts[:data]
         host[:ttl] = opts[:ttl] if opts[:ttl]
         host[:priority] = opts[:priority] if opts[:priority]
+        
         return host
       end
 
@@ -60,18 +95,34 @@ module Rubber
           fqdn << "#{opts[:domain]}"
         end
 
-        hosts = fqdn ? (zone.records.find(fqdn) rescue []) : zone.records.all
+        # TODO: revert this when fog gets fixed
+        # hosts = fqdn ? (zone.records.all(:name => fqdn) rescue []) : zone.records.all
+        hosts = zone.records.all
+        if fqdn
+          hosts = hosts.find_all do |r|
+            attributes = host_to_opts(r)
+            host, domain = attributes[:host], attributes[:domain]
+            
+            fog_fqdn = ""
+            fog_fqdn << "#{host}." if host && ! host.strip.empty?
+            fog_fqdn << "#{domain}"
+            
+            fqdn == fog_fqdn
+          end
+        end
+
         hosts.each do |h|
           keep = true
+          attributes = host_to_opts(h)
 
-          if host_type && h.type != host_type && host_type != '*'
+          if host_type && host_type != '*' && attributes[:type] != host_type
             keep = false
           end
 
-          if host_data && h.value != host_data
+          if host_data && attributes[:data] != host_data
             keep = false
           end
-
+          
           result << h if keep
         end
 
@@ -103,11 +154,20 @@ module Rubber
         new_opts = setup_opts(new_opts, [:host, :domain, :type, :data])
 
         find_hosts(old_opts).each do |h|
-          opts_to_host(new_opts).each do |k, v|
-            h.send("#{k}=", v)
+          changes = opts_to_host(new_opts)
+          result = nil
+          if h.respond_to?(:modify)
+            result = h.modify(changes)
+          elsif h.respond_to?(:update_host)
+            result = h.update_host(changes)
+          else
+            changes.each do |k, v|
+              h.send("#{k}=", v)
+            end
+            result = h.save
           end
 
-          h.save || raise("Failed to update host #{h.hostname}, #{h.errors.full_messages.join(', ')}")
+          result || raise("Failed to update host #{h.hostname}, #{h.errors.full_messages.join(', ')}")
         end
       end
 

data/lib/rubber/environment.rb

@@ -134,7 +134,7 @@ module Rubber
 
         def expand_string(val)
           while val =~ /\#\{[^\}]+\}/
-            val = eval('%Q{' + val + '}', binding)
+            val = eval('%Q{' + val + '}', binding, __FILE__)
           end
           val = true if val =="true"
           val = false if val == "false"

data/lib/rubber/generator.rb

@@ -144,8 +144,14 @@ module Rubber
 
           # Set file permissions and owner if needed
           FileUtils.chmod(config.perms, config_path) if config.perms && config_path
-          FileUtils.chown(config.owner, config.group, config_path) if config_path && (config.owner || config.group)
-
+          if config_path && (config.owner || config.group)
+            if fake_root
+              Rubber.logger.info("Not performing chown (#{config.owner}:#{config.group}) as a fake root was given")
+            else
+              FileUtils.chown(config.owner, config.group, config_path) 
+            end
+          end
+          
           # Run post transform command if needed
           if config.post
             if fake_root

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

@@ -472,11 +472,22 @@ namespace :rubber do
   
   def maybe_reboot
     reboot_needed = multi_capture("echo $(ls /var/run/reboot-required 2> /dev/null)")
-    reboot_hosts = reboot_needed.collect {|k, v| v.strip.size > 0 ? k : nil}.compact
-    
+    reboot_hosts = reboot_needed.collect {|k, v| v.strip.size > 0 ? k : nil}.compact.sort
+
+    # Figure out which hosts are bootstrapping for the first time so we can auto reboot
+    # If there is no deployed app directory, then we have never bootstrapped. 
+    auto_reboot = multi_capture("echo $(ls #{deploy_to} 2> /dev/null)")
+    auto_reboot_hosts = auto_reboot.collect {|k, v| v.strip.size == 0 ? k : nil}.compact.sort
+
     if reboot_hosts.size > 0
 
-      ENV['REBOOT'] = 'y' if ENV['FORCE'] =~ /^(t|y)/
+      # automatically reboot if FORCE or if all the hosts that need rebooting
+      # are bootstrapping for the first time
+      if ENV['FORCE'] =~ /^(t|y)/ || reboot_hosts == auto_reboot_hosts
+        ENV['REBOOT'] = 'y'
+        logger.info "Updates require a reboot on hosts #{reboot_hosts.inspect}"
+      end
+      
       reboot = get_env('REBOOT', "Updates require a reboot on hosts #{reboot_hosts.inspect}, reboot [y/N]?", false)
       reboot = (reboot =~ /^y/)
       

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

@@ -126,11 +126,26 @@ namespace :rubber do
               mv /etc/fstab /etc/fstab.bak
               cat /etc/fstab.bak | grep -v '#{vol_spec['mount']}' > /etc/fstab
               if [ `lsb_release -r -s | sed 's/[.].*//'` -gt "10" ]; then
-		 device=`echo #{vol_spec['device']} | sed 's/sd/xvd/'`
-	      else
-		 device='#{vol_spec['device']}'
-	      fi
-		 echo "$device #{vol_spec['mount']} #{vol_spec['filesystem']} #{vol_spec['mount_opts'] ? vol_spec['mount_opts'] : 'noatime'} 0 0 # rubber volume #{vol_id}" >> /etc/fstab
+		            device=`echo #{vol_spec['device']} | sed 's/sd/xvd/'`
+	            else
+		            device='#{vol_spec['device']}'
+	            fi
+		 
+		          echo "$device #{vol_spec['mount']} #{vol_spec['filesystem']} #{vol_spec['mount_opts'] ? vol_spec['mount_opts'] : 'noatime'} 0 0 # rubber volume #{vol_id}" >> /etc/fstab
+		          
+		          # Ensure volume is ready before running mkfs on it.
+		          echo 'Waiting for device'
+              cnt=0
+              while ! [[ -b #{vol_spec['device']} ]]; do
+                if [[ "$cnt" -eq "15" ]]; then
+                  echo 'Timed out waiting for EBS device to be ready.'
+                  exit 1
+                fi
+                echo '.'
+                sleep 2
+                let "cnt = $cnt + 1"
+              done
+              echo 'Device ready'
 
               #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + '$device') if created}
               #{("mkdir -p '#{vol_spec['mount']}'") if vol_spec['mount']}

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end
 

data/rubber.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('test-unit')
   s.add_development_dependency('shoulda-context')
   s.add_development_dependency('mocha')
+  s.add_development_dependency('awesome_print')
 end
 
 

data/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf

@@ -74,7 +74,11 @@ NameVirtualHost *:<%= rubber_env.web_tools_ssl_port %>
     
     host = "#{name}.#{rubber_env.full_host}"
     host_and_port = "#{host}:#{rubber_env.web_tools_ssl_port}"
-    proxy_url = "http://#{proxy_host}:#{settings.port}#{settings.path}"
+
+    # don't use settings.path here - mapping the host/port is sufficient,
+    # and path can be done in tools-index.html.  This allows admin sites
+    # that hit other paths on same host/port to still function, e.g. elasticsearch 
+    proxy_url = "http://#{proxy_host}:#{settings.port}/"
 %>
   <VirtualHost *:<%= rubber_env.web_tools_ssl_port %>>
     ServerName      <%= host %>

data/templates/apache/config/rubber/role/web_tools/tools-index.html

@@ -30,7 +30,7 @@
         # graphite web app)
         Array(rubber_env.web_tools_proxies).each do |name, settings|
       %>
-        <li><a href="https://<%= name %>.<%= tools_host.full_name %>:<%= rubber_env.web_tools_ssl_port %>/"><%= name.capitalize %></a></li>
+        <li><a href="https://<%= name %>.<%= tools_host.full_name %>:<%= rubber_env.web_tools_ssl_port %><%= settings.path || '/' %>"><%= name.capitalize %></a></li>
       <% end %>
 
 		</ul>

data/templates/base/config/rubber/common/crontab

@@ -16,6 +16,3 @@ RAILS_ENV=<%= Rubber.env %>
 
 # Roll all rails logs at midnight
 0 0 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=<%= Rubber.root %>/log
-
-# Automatically set the clock for all machines
-<%= rand(60) %> 4 * * * <%= Rubber.root %>/script/rubber cron ntpdate pool.ntp.org

data/templates/base/config/rubber/common/ntp-sysctl.conf

@@ -0,0 +1,7 @@
+<%
+  @path = "/etc/sysctl.d/60-ntp.conf"
+  @post = "/usr/sbin/service procps start"
+%>
+
+# allows us to set machine clock (xen clocks from ec2 tend to drift a lot)
+xen.independent_wallclock=1

data/templates/base/config/rubber/common/ntp.conf

@@ -0,0 +1,57 @@
+<%
+  @path = "/etc/ntp.conf"
+  @post = "/usr/sbin/service ntp restart"
+%>
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+
+# Enable this if you want statistics to be logged.
+#statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+server 0.us.pool.ntp.org
+server 1.us.pool.ntp.org
+server 2.us.pool.ntp.org
+server 3.us.pool.ntp.org
+
+<% rubber_instances.each do |ic| %>
+peer <%= ic.full_name %>
+<% end %>
+
+# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
+# details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
+# might also be helpful.
+#
+# Note that "restrict" applies to both servers and clients, so a configuration
+# that might be intended to block requests from certain clients could also end
+# up blocking replies from your own upstream servers.
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access, but only if
+# cryptographically authenticated.
+#restrict 192.168.123.0 mask 255.255.255.0 notrust
+
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+#broadcast 192.168.123.255
+
+# If you want to listen to time broadcasts on your local subnet, de-comment the
+# next lines.  Please do this only if you trust everybody on the network!
+#disable auth
+#broadcastclient

data/templates/base/config/rubber/rubber.yml

@@ -9,7 +9,7 @@ app_user: app
 admin_email: "root@#{full_host}"
 
 # OPTIONAL: If not set, you won't be able to access web_tools
-# server (munin stats, monit status, etc)
+# server (graphite, graylog, monit status, haproxy status, etc)
 # web_tools_user: admin
 # web_tools_password: sekret
 
@@ -169,7 +169,7 @@ prompt_for_security_group_sync: true
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]
-packages: [postfix, build-essential, git-core, ec2-ami-tools, libxslt-dev]
+packages: [postfix, build-essential, git-core, ec2-ami-tools, libxslt-dev, ntp]
 
 # OPTIONAL: gem sources to setup for rubygems
 # gemsources: ["http://rubygems.org", "http://gems.github.com"]

data/templates/base/templates.rb

@@ -1,5 +1,5 @@
 if Rubber::Util::is_bundler?
-  append_to_file "Gemfile", "gem 'rubber', '#{Rubber.version}'\n"
+  append_to_file "Gemfile", "gem 'rubber'\n"
   
   # for cron-sh
   append_to_file 'Gemfile', "gem 'open4'\n"

data/templates/elasticsearch/config/rubber/deploy-elasticsearch.rb

@@ -12,6 +12,9 @@ namespace :rubber do
           wget --no-check-certificate -qNP /tmp https://github.com/downloads/elasticsearch/elasticsearch/elasticsearch-#{rubber_env.elasticsearch_version}.zip
           unzip -d #{rubber_env.elasticsearch_prefix} /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.zip
           rm /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.zip
+
+          #{rubber_env.elasticsearch_dir}/bin/plugin -install mobz/elasticsearch-head
+          
         fi
       ENDSCRIPT
     end

data/templates/elasticsearch/config/rubber/rubber-elasticsearch.yml

@@ -1,4 +1,4 @@
-elasticsearch_version: 0.18.7
+elasticsearch_version: 0.19.3
 elasticsearch_prefix: /usr/local
 elasticsearch_dir: "#{elasticsearch_prefix}/elasticsearch-#{elasticsearch_version}"
 elasticsearch_data_dir: "/mnt/elasticsearch/data"
@@ -9,4 +9,10 @@ elasticsearch_http_port: 9200
 
 roles:
   elasticsearch:
-    packages: [openjdk-6-jdk]
+    packages: [openjdk-7-jdk]
+
+web_tools_proxies:
+  elasticsearch:
+    role: elasticsearch
+    port: "#{elasticsearch_http_port}"
+    path: /_plugin/head/

data/templates/graphite/config/rubber/role/graphite_web/dashboard.html

@@ -36,7 +36,7 @@ Simple graphite dashboard cycler for use on a large display - e.g. googletv/chro
 
   <script type="text/javascript">
 
-    //  To test this locally, edit ROOT_URL to point to graphite webapp
+    //  To test this locally, edit ROOT_URL to point to graphite webapp (without trailing slash)
     //  To allow xhttp to graphite from html loaded from local file, run chrome with:
     // /Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome  --disable-web-security
     
@@ -91,7 +91,7 @@ Simple graphite dashboard cycler for use on a large display - e.g. googletv/chro
       self.dashboardList = function() {
         console.log("Fetching all dashboards");
 
-        return $.getJSON(ROOT_URL + '/graphite/dashboard/find/', {'query': ''});
+        return $.getJSON(ROOT_URL + '/dashboard/find/', {'query': ''});
       }
 
       self.detailFromDashboardList = function(data) {
@@ -111,7 +111,7 @@ Simple graphite dashboard cycler for use on a large display - e.g. googletv/chro
         var name = dashboard["name"];
         console.log("Fetching dashboard detail for " + name);
 
-        return $.getJSON(ROOT_URL + '/graphite/dashboard/load/' + name, {}, function(data) {
+        return $.getJSON(ROOT_URL + '/dashboard/load/' + name, {}, function(data) {
 
           console.log("Got dashboard detail for " + name);
           console.log(data);
@@ -214,7 +214,7 @@ Simple graphite dashboard cycler for use on a large display - e.g. googletv/chro
           params = $.extend(true, params, defn); // deep copy
           params["target"] = params["target"][0];
 
-          var url = ROOT_URL + "/graphite/render?" + $.param(params);
+          var url = ROOT_URL + "/render?" + $.param(params);
 
           return url;
         });

data/templates/passenger/config/rubber/deploy-passenger.rb

@@ -26,7 +26,7 @@ namespace :rubber do
     after "deploy:update_code", "rubber:passenger:remove_config_ru" if Rubber::Util.is_rails?
 
     task :remove_config_ru, :roles => :passenger do
-      rsudo "rm -f  #{current_release}/config.ru"
+      rsudo "rm -f #{releases_path}/*/config.ru"
     end
 
     # passenger depends on apache for start/stop/restart, just need these defined

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.4.11
+redis_server_version: 2.4.12
 redis_server_pid_file: /var/run/redis-server.pid
 redis_server_conf_file: /etc/redis.conf
 redis_server_log_file: /var/log/redis-server.log

data/templates/resque/config/rubber/role/resque_worker/resque-pool-upstart.conf

@@ -12,7 +12,7 @@ stop on runlevel [016]
 
 script
   cd <%= Rubber.root %>
-  exec sudo -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= Rubber.root %> && exec bundle exec resque-pool > log/resque-pool.log 2>&1'
+  exec sudo -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= Rubber.root %> && exec bundle exec resque-pool >> log/resque-pool.log 2>&1'
 end script
 
 post-start script
@@ -25,7 +25,7 @@ end script
 # so that we dont end up killing running jobs
 #
 pre-stop script
-  pid=`cat /var/run/resque-pool.pid`
+  pid=`cat <%= rubber_env.resque_pool_pid_file %>`
   kill -INT $pid
   while ps -p $pid > /dev/null; do sleep 0.1; done
   rm -f <%= rubber_env.resque_pool_pid_file %>

data/templates/zookeeper/config/rubber/deploy-zookeeper.rb

@@ -9,7 +9,7 @@ namespace :rubber do
   
     task :install, :roles => :zookeeper do
       rubber.sudo_script 'install_zookeeper', <<-ENDSCRIPT
-        if [[ ! -f "#{rubber_env.zookeeper_install_dir}" ]]; then
+        if [[ ! -d "#{rubber_env.zookeeper_install_dir}" ]]; then
           # Fetch the sources.
           wget -qNP /tmp #{rubber_env.zookeeper_package_url}
           tar -C #{File.dirname rubber_env.zookeeper_install_dir} -zxf /tmp/#{File.basename rubber_env.zookeeper_package_url}

data/test/dns/fog_test.rb

@@ -1,147 +1,171 @@
 require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
 require 'rubber/dns/fog'
-#require 'rexml/document'
 
 class FogTest < Test::Unit::TestCase
 
   @envs = []
-  
+
   env = {'credentials' =>
-            {'provider' => 'zerigo', 'zerigo_email' => 'xxx', 'zerigo_token' => 'yyy'}}
+             {'provider' => 'zerigo', 'zerigo_email' => 'xxx', 'zerigo_token' => 'yyy'}}
   @envs << Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
 
-  # no mocks for aws dns yet
-  #env = {'credentials' =>
-  #          {'provider' => 'aws', 'aws_access_key_id' => 'xxx', 'aws_secret_access_key' => 'yyy'}}
-  #@envs << Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+  unless ENV['CI']
+    secret = YAML.load_file(File.expand_path("~/rubber-secret.yml")) rescue {}
+    access_key = secret['cloud_providers']['aws']['access_key']
+    access_secret = secret['cloud_providers']['aws']['secret_access_key']
+    env = {'credentials' =>
+               {'provider' => 'aws', 'aws_access_key_id' => access_key, 'aws_secret_access_key' => access_secret},
+           'name_includes_domain' => true,
+           'name_includes_trailing_period' => true}
+    # no mocks for aws dns yet
+    @envs << Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+  end
+
+  def all_test_zones(dns=@dns)
+    dns.client.zones.all.find_all {|z| z.domain =~ /rubbertest/ }
+  end
   
+  def destroy_test_domains
+    all_test_zones(Rubber::Dns::Fog.new(@env)).each do |zone|
+      zone.records.all.each do |record|
+        record.destroy
+      end
+      zone.destroy
+    end
+  end
   
+  env = @envs.first
   @envs.each do |env|
-  
-  context "fog #{env.credentials.provider} dns" do
-    
-    setup do
-      @env = env
-    end
-    
-    context "find_or_create" do
-      
-      should "create domain if it doesn't exist" do
-        @dns = Rubber::Dns::Fog.new(@env)
-    
-        assert_equal 0, @dns.client.zones.all.size
-        
-        zone0 = @dns.find_or_create_zone("example1.com")
+
+    context "fog #{env.credentials.provider} dns" do
+
+      setup do
+        @env = env
+
+        # no mocks for aws dns yet
+        if env.credentials.provider == 'aws'
+          Fog.unmock!
+          destroy_test_domains
+        end
         
-        assert_equal 1, @dns.client.zones.all.size
-        zone1 = @dns.client.zones.all.find {|z| z.domain =~ /^example1.com/ }
-        assert zone1
-        assert_equal zone0.id, zone1.id
-        assert_equal zone0.domain, zone1.domain
-      end
-      
-      should "match the same domain that was passed" do
         @dns = Rubber::Dns::Fog.new(@env)
-    
-        assert_equal 0, @dns.client.zones.all.size
-        
-        zone0 = @dns.find_or_create_zone("abcfoo.com")
-        zone1 = @dns.find_or_create_zone("foo.com")
-        
-        assert_equal 2, @dns.client.zones.all.size
-        
-        zone2 = @dns.client.zones.all.find {|z| z.domain =~ /^foo.com/ }
-        assert zone2
-        assert_equal zone1.id, zone2.id
-        assert_equal zone1.domain, zone2.domain
       end
       
-      should "do nothing if domain already exists" do
-        @dns = Rubber::Dns::Fog.new(@env)
-        
-        @dns.client.zones.create(:domain => 'example1.com')
-        assert_equal 1, @dns.client.zones.all.size
-        
-        zone0 = @dns.find_or_create_zone("example1.com")
-        
-        assert_equal 1, @dns.client.zones.all.size
-        zone1 = @dns.client.zones.all.find {|z| z.domain =~ /^example1.com/ }
-        assert_equal zone0.id, zone1.id
-        assert_equal zone0.domain, zone1.domain
-      end
+      context "find_or_create" do
       
-    end
-    
-    context "records" do
-  
-      setup do
-        @dns = Rubber::Dns::Fog.new(@env)
+        should "create domain if it doesn't exist" do
+          assert_equal 0, all_test_zones.size
       
-        @domain = "example1.com"
-        @zone = @dns.find_or_create_zone(@domain)
-      end
-          
-      should "find_records" do
-        # Set up some sample records.
-        first = @zone.records.create(:value => '172.16.16.1', :name => 'host1', :domain => @domain, :type => 'A')
-        @zone.records.create(:value => '172.16.16.2', :domain => @domain, :type => 'A')
+          zone0 = @dns.find_or_create_zone("rubbertest.com")
       
-        # Search for records through the rubber DNS interface and make sure whe get what we expected.
+          assert_equal 1, all_test_zones.size
+          zone1 = all_test_zones.find {|z| z.domain =~ /^rubbertest.com/ }
+          assert zone1
+          assert_equal zone0.id, zone1.id
+          assert_equal zone0.domain, zone1.domain
+        end
       
-        # Wildcard search.
-        records = @dns.find_host_records(:host => '*', :domain => @domain)
-        assert_equal 2, records.size
-        assert_equal({:type => "A", :host => "host1", :domain => @domain, :id => first.id, :data=>"172.16.16.1", :ttl => 3600, :priority => 0}, records.first)
+        should "match the same domain that was passed" do
+          assert_equal 0, all_test_zones.size
       
-        # Blank hostname search.
-        records = @dns.find_host_records(:host => '', :domain => @domain)
-        assert_equal 1, records.size
-        assert_equal '', records.first[:host]
+          zone0 = @dns.find_or_create_zone("abcrubbertest.com")
+          zone1 = @dns.find_or_create_zone("rubbertest.com")
       
-        # Specific hostname search.
-        records = @dns.find_host_records(:host => 'host1', :domain => @domain)
-        assert_equal 1, records.size
-        assert_equal 'host1', records.first[:host]
-      end
+          assert_equal 2, all_test_zones.size
       
-      should "create_record" do
-        @dns.create_host_record({:host => 'newhost', :domain => @domain, :data => '1.1.1.1', :type => 'A', :ttl => '333'})
+          zone2 = all_test_zones.find {|z| z.domain =~ /^rubbertest.com/ }
+          assert zone2
+          assert_equal zone1.id, zone2.id
+          assert_equal zone1.domain, zone2.domain
+        end
       
-        assert_equal @zone.records.all.size, 1
-        record = @zone.records.first
+        should "do nothing if domain already exists" do
+          @dns.client.zones.create(:domain => 'rubbertest.com')
+          assert_equal 1, all_test_zones.size
       
-        assert_equal 'newhost',             record.name
-        assert_equal "newhost.#{@domain}",  record.domain
-        assert_equal '1.1.1.1',             record.value
-        assert_equal 'A',                   record.type
-        assert_equal 333,                   record.ttl
-      end
+          zone0 = @dns.find_or_create_zone("rubbertest.com")
       
-      should "destroy_record" do
-        # Create the record we want to test destroying.
-        @zone.records.create(:type => 'A', :value => '172.16.16.1', :name => 'host1', :domain => @domain)
-        assert_equal 1, @zone.records.all.size
+          assert_equal 1, all_test_zones.size
+          zone1 = all_test_zones.find {|z| z.domain =~ /^rubbertest.com/ }
+          assert_equal zone0.id, zone1.id
+          assert_equal zone0.domain, zone1.domain
+        end
       
-        @dns.destroy_host_record({:host => 'host1', :domain => @domain})
-      
-        assert_equal 0, @zone.records.all.size
       end
+
+      context "records" do
       
-      should "update_record" do
-        params = {:host => 'host1', :domain => @domain, :data => "1.1.1.1"}
-        new = {:host => 'host1', :domain => @domain, :data => "1.1.1.2"}
-      
-        @zone.records.create(:type => 'A', :value => '1.1.1.1', :name => 'host1', :domain => @domain)
+        setup do
+          @domain = "rubbertest.com"
+          @zone = @dns.find_or_create_zone(@domain)
+        end
       
-        @dns.update_host_record(params, new)
+        should "create_record" do
+          @dns.create_host_record({:host => 'newhost', :domain => @domain, :data => '1.1.1.1', :type => 'A', :ttl => '333'})
+        
+          assert_equal @zone.records.all.size, 1
+          record = @zone.records.first
+          attributes = @dns.host_to_opts(record)
+        
+          assert_equal 'newhost',             attributes[:host]
+          assert_equal @domain,               attributes[:domain]
+          assert_equal '1.1.1.1',             attributes[:data]
+          assert_equal 'A',                   attributes[:type]
+          assert_equal 333,                   attributes[:ttl]
+        end
+        
+        should "destroy_record" do
+          # Create the record we want to test destroying.
+          @dns.create_host_record({:host => 'newhost', :domain => @domain, :data => '1.1.1.1', :type => 'A'})
+          assert_equal 1, @zone.records.all.size
+        
+          @dns.destroy_host_record({:host => 'newhost', :domain => @domain})
+        
+          assert_equal 0, @zone.records.all.size
+        end
+        
+        should "update_record" do
+          params = {:host => 'host1', :domain => @domain, :data => "1.1.1.1"}
+          new = {:host => 'host1', :domain => @domain, :data => "1.1.1.2"}
+        
+          @dns.create_host_record({:host => 'host1', :domain => @domain, :data => '1.1.1.1', :type => 'A'})
+          assert_equal 1, @zone.records.all.size
+        
+          @dns.update_host_record(params, new)
+          assert_equal 1, @zone.records.all.size
+        
+          record = @zone.records.all.first
+          attributes = @dns.host_to_opts(record)
+          assert_equal '1.1.1.2', attributes[:data]
+        end
+        
+        should "find_records" do
+          # Set up some sample records.
+          created = []
+          created << {:host => 'host1', :domain => @domain, :data => '1.1.1.1', :type => 'A'}
+          created << {:host => '', :domain => @domain, :data => '1.1.1.1', :type => 'A'}
+          created.each {|r| @dns.create_host_record(r) }
+        
+          # Search for records through the rubber DNS interface and make sure whe get what we expected.
+        
+          # Wildcard search.
+          records = @dns.find_host_records(:host => '*', :domain => @domain)
+          assert_equal 2, records.size
+        
+          # Blank hostname search.
+          records = @dns.find_host_records(:host => '', :domain => @domain)
+          assert_equal 1, records.size
+          assert_equal '', records.first[:host]
+        
+          # Specific hostname search.
+          records = @dns.find_host_records(:host => 'host1', :domain => @domain)
+          assert_equal 1, records.size
+          assert_equal 'host1', records.first[:host]
+        end
       
-        record = @zone.records.all.first
-        assert_equal '1.1.1.2', record.value
       end
 
     end
-    
-  end
-    
+
   end
 end

data/test/test_helper.rb

@@ -7,13 +7,16 @@ require 'test/unit'
 require 'mocha'
 require 'shoulda-context'
 require 'pp'
+require 'ap'
 require 'tempfile'
-
 require 'fog'
-Fog.mock!
 
 class Test::Unit::TestCase
-  def teardown
+  setup do
+    Fog.mock!
+  end
+  
+  teardown do
     Fog::Mock.reset    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -172,6 +172,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    The rubber plugin enables relatively complex multi-instance deployments
   of RubyOnRails applications to\n    Amazon's Elastic Compute Cloud (EC2).  Like
   capistrano, rubber is role based, so you can define a set\n    of configuration
@@ -254,6 +270,8 @@ files:
 - templates/base/Capfile
 - templates/base/config/deploy.rb
 - templates/base/config/rubber/common/crontab
+- templates/base/config/rubber/common/ntp-sysctl.conf
+- templates/base/config/rubber/common/ntp.conf
 - templates/base/config/rubber/common/rsyslog.conf
 - templates/base/config/rubber/common/rubber.profile
 - templates/base/config/rubber/deploy-setup.rb
@@ -591,7 +609,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1797429455710097314
+      hash: -340677959787113833
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -600,46 +618,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1797429455710097314
+      hash: -340677959787113833
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud
   (ec2)
-test_files:
-- test/cloud/aws_table_store_test.rb
-- test/cloud/aws_test.rb
-- test/cloud/fog_storage_test.rb
-- test/cloud/fog_test.rb
-- test/command_test.rb
-- test/dns/fog_test.rb
-- test/environment_test.rb
-- test/fixtures/basic/common/bar.conf
-- test/fixtures/basic/common/foo.conf
-- test/fixtures/basic/host/host1/foo.conf
-- test/fixtures/basic/host/host2/foo.conf
-- test/fixtures/basic/role/role1/foo.conf
-- test/fixtures/basic/role/role2/foo.conf
-- test/fixtures/basic/rubber-extra.yml
-- test/fixtures/basic/rubber.yml
-- test/fixtures/expansion/rubber.yml
-- test/fixtures/generator_order/common/a_first.conf
-- test/fixtures/generator_order/common/z_last.conf
-- test/fixtures/generator_order/host/host1/a_first.conf
-- test/fixtures/generator_order/host/host1/z_last.conf
-- test/fixtures/generator_order/role/role1/a_first.conf
-- test/fixtures/generator_order/role/role1/z_last.conf
-- test/fixtures/generator_order/role/role2/a_first.conf
-- test/fixtures/generator_order/role/role2/z_last.conf
-- test/fixtures/instance_expansion/instance-test.yml
-- test/fixtures/instance_expansion/rubber.yml
-- test/fixtures/nested/rubber.yml
-- test/fixtures/secret/rubber.yml
-- test/fixtures/secret/secret.yml
-- test/generator_test.rb
-- test/instance_test.rb
-- test/test-rails-template.rb
-- test/test_helper.rb
-- test/util_test.rb
+test_files: []