rubber 1.7.2 → 1.8.0

data/lib/rubber/recipes/rubber/tags.rb

@@ -0,0 +1,12 @@
+require 'rubber/tag'
+
+namespace :rubber do
+  desc <<-DESC
+    Updates ALL the tags on EC2 instances for the current env
+  DESC
+  required_task :update_tags do
+    rubber_instances.each do |ic|
+      Rubber::Tag::update_instance_tags(ic.name)
+    end
+  end
+end

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

@@ -96,7 +96,7 @@ namespace :rubber do
         print "."
         sleep 2
         volume = cloud.describe_volumes(vol_id).first
-        break if volume[:status] == "in-use"
+        break if volume[:attachment_status] == "attached"
       end
       print "\n"
 
@@ -161,6 +161,7 @@ namespace :rubber do
 
   def zero_partitions(ic, partitions)
     env = rubber_cfg.environment.bind(ic.role_names, ic.name)
+    partitions = partitions.clone
 
     # don't zero out the ones that we weren't told to
     partitions.delete_if do |part|
@@ -194,9 +195,9 @@ namespace :rubber do
 
   def setup_raid_volume(ic, raid_spec, create=false)
     if create
-      mdadm_init = "mdadm --create #{raid_spec['device']} --level #{raid_spec['raid_level']} --raid-devices #{raid_spec['source_devices'].size} #{raid_spec['source_devices'].sort.join(' ')}"
+      mdadm_init = "yes | mdadm --create #{raid_spec['device']} --level #{raid_spec['raid_level']} --raid-devices #{raid_spec['source_devices'].size} #{raid_spec['source_devices'].sort.join(' ')}"
     else
-      mdadm_init = "mdadm --assemble #{raid_spec['device']} #{raid_spec['source_devices'].sort.join(' ')}"
+      mdadm_init = "yes | mdadm --assemble #{raid_spec['device']} #{raid_spec['source_devices'].sort.join(' ')}"
     end
 
     task :_setup_raid_volume, :hosts => ic.external_ip do
@@ -225,7 +226,7 @@ namespace :rubber do
           echo "mdadm --assemble --scan" > /etc/rc.local
           chmod +x /etc/rc.local
 
-          #{('yes | mkfs -t ' + raid_spec['filesystem'] + ' ' + raid_spec['device']) if create}
+          #{('yes | mkfs -t ' + raid_spec['filesystem'] + ' ' + raid_spec['filesystem_opts'] + ' ' + raid_spec['device']) if create}
           mkdir -p '#{raid_spec['mount']}'
           mount '#{raid_spec['mount']}'
         fi

data/lib/rubber/tag.rb

@@ -0,0 +1,16 @@
+module Rubber
+  module Tag
+    # Updates the tags for the given ec2 instance
+    def self.update_instance_tags(instance_alias)
+      instance_item = Rubber::Configuration.rubber_instances[instance_alias]
+      fatal "Instance does not exist: #{instance_alias}" if ! instance_item
+
+      rubber_cfg = Rubber::Configuration.get_configuration(RUBBER_ENV)
+      rubber_env = rubber_cfg.environment.bind()
+
+      cloud = Rubber::Cloud::get_provider(rubber_env.cloud_provider || "aws", Rubber::Configuration.rubber_env, self)
+
+      cloud.create_tags(instance_item.instance_id, :Name => instance_alias, :Environment => RUBBER_ENV)
+    end
+  end
+end

data/lib/rubber/tasks/rubber.rb

@@ -31,7 +31,7 @@ namespace :rubber do
       roles = instance.role_names
       env = cfg.environment.bind(roles, instance_alias)
       gen = Rubber::Configuration::Generator.new("#{RUBBER_ROOT}/config/rubber", roles, instance_alias)
-    elsif RUBBER_ENV == 'development'
+    elsif ['development', 'test'].include?(Rubber.env)
       roles = cfg.environment.known_roles
       role_items = roles.collect do |r|
         Rubber::Configuration::RoleItem.new(r, r == "db" ? {'primary' => true} : {})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 55
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 2
-  version: 1.7.2
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -04:00
+date: 2010-12-07 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 25
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 17
+        version: 0.9.17
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -240,6 +240,7 @@ files:
 - generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/monit-postgresql.conf
+- generators/vulcanize/templates/postgresql/config/rubber/role/db/munin-postgresql.conf
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/pg_hba.conf
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql.conf
@@ -414,6 +415,7 @@ files:
 - lib/generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/monit-postgresql.conf
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/munin-postgresql.conf
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/pg_hba.conf
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql.conf
@@ -465,8 +467,10 @@ files:
 - lib/rubber/recipes/rubber/setup.rb
 - lib/rubber/recipes/rubber/spot_requests.rb
 - lib/rubber/recipes/rubber/static_ips.rb
+- lib/rubber/recipes/rubber/tags.rb
 - lib/rubber/recipes/rubber/utils.rb
 - lib/rubber/recipes/rubber/volumes.rb
+- lib/rubber/tag.rb
 - lib/rubber/tasks/rubber.rb
 - lib/rubber/util.rb
 - rails/init.rb
@@ -494,8 +498,8 @@ post_install_message: |+
   
   ********************************************************************************
   
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement