rubber 1.6.3 → 1.7.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.6.3
+-----
+
+Much better way to get an instance's internal IP. <dcf97a3> [Kevin Menard]
+
 1.6.2
 -----
 

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.7.0

data/lib/rubber/cloud/aws.rb

@@ -44,6 +44,7 @@ module Rubber
             instance[:state] = item.instanceState.name
             instance[:zone] = item.placement.availabilityZone
             instance[:platform] = item.platform || 'linux'
+            instance[:root_device_type] = item.rootDeviceType
             instances << instance
           end
         end if response.reservationSet
@@ -55,6 +56,19 @@ module Rubber
         response = @ec2.terminate_instances(:instance_id => instance_id)
       end
 
+      def reboot_instance(instance_id)
+        response = @ec2.reboot_instances(:instance_id => instance_id)
+      end
+
+      def stop_instance(instance_id)
+        # Don't force the stop process. I.e., allow the instance to flush its file system operations.
+        response = @ec2.stop_instances(:instance_id => instance_id, :force => false)
+      end
+
+      def start_instance(instance_id)
+        response = @ec2.start_instances(:instance_id => instance_id)
+      end
+
       def describe_availability_zones
         zones = []
         response = @ec2.describe_availability_zones()
@@ -259,6 +273,7 @@ module Rubber
           image = {}
           image[:id] = item.imageId
           image[:location] = item.imageLocation
+          image[:root_device_type] = item.rootDeviceType
           images << image
         end if response.imagesSet
         return images

data/lib/rubber/instance.rb

@@ -80,7 +80,7 @@ module Rubber
       attr_accessor :roles, :zone
       attr_accessor :external_host, :external_ip
       attr_accessor :internal_host, :internal_ip
-      attr_accessor :static_ip, :volumes, :partitions
+      attr_accessor :static_ip, :volumes, :partitions, :root_device_type
       attr_accessor :spot_instance_request_id
       attr_accessor :platform
 

data/lib/rubber/recipes/rubber/bundles.rb

@@ -20,8 +20,10 @@ namespace :rubber do
   required_task :describe_bundles do
     images = cloud.describe_images()
     images.each do |image|
+      logger.info "======================"
       logger.info "ID: #{image[:id]}"
       logger.info "Location: #{image[:location]}"
+      logger.info "Root device type: #{image[:root_device_type]}"
     end
   end
 

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

@@ -42,7 +42,7 @@ namespace :rubber do
     Refresh the host data for a EC2 instance with the given ALIAS.
     This is useful to run when rubber:create fails after instance creation
   DESC
-  task :refresh do
+  required_task :refresh do
     instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
     ENV.delete('ROLES') # so we don't get an error if people leave ROLES in env from :create CLI
     refresh_instance(instance_alias)
@@ -51,7 +51,7 @@ namespace :rubber do
   desc <<-DESC
     Destroy the EC2 instance for the given ALIAS
   DESC
-  task :destroy do
+  required_task :destroy do
     instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
     ENV.delete('ROLES') # so we don't get an error if people leave ROLES in env from :create CLI
     destroy_instance(instance_alias)
@@ -60,12 +60,39 @@ namespace :rubber do
   desc <<-DESC
     Destroy ALL the EC2 instances for the current env
   DESC
-  task :destroy_all do
+  required_task :destroy_all do
     rubber_instances.each do |ic|
       destroy_instance(ic.name)
     end
   end
 
+  desc <<-DESC
+    Reboot the EC2 instance for the give ALIAS
+  DESC
+  required_task :reboot do
+    instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
+    ENV.delete('ROLES') # so we don't get an error if people leave ROLES in env from :create CLI
+    reboot_instance(instance_alias)
+  end
+
+  desc <<-DESC
+    Stop the EC2 instance for the give ALIAS
+  DESC
+  required_task :stop do
+    instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
+    ENV.delete('ROLES') # so we don't get an error if people leave ROLES in env from :create CLI
+    stop_instance(instance_alias)
+  end
+
+  desc <<-DESC
+    Start the EC2 instance for the give ALIAS
+  DESC
+  required_task :start do
+    instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
+    ENV.delete('ROLES') # so we don't get an error if people leave ROLES in env from :create CLI
+    start_instance(instance_alias)
+  end
+
   desc <<-DESC
     Adds the given ROLES to the instance named ALIAS
   DESC
@@ -218,7 +245,6 @@ namespace :rubber do
       sleep 2
 
       break if refresh_instance(instance_alias)
-
     end
   end
 
@@ -242,6 +268,7 @@ namespace :rubber do
       instance_item.internal_ip = instance[:internal_ip]
       instance_item.zone = instance[:zone]
       instance_item.platform = instance[:platform]
+      instance_item.root_device_type = instance[:root_device_type]
       rubber_instances.save()
 
       unless instance_item.windows?
@@ -323,6 +350,65 @@ namespace :rubber do
     cleanup_known_hosts(instance_item) unless env.disable_known_hosts_cleanup
   end
 
+  # Reboots the given ec2 instance
+  def reboot_instance(instance_alias)
+    instance_item = rubber_instances[instance_alias]
+    fatal "Instance does not exist: #{instance_alias}" if ! instance_item
+
+    env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
+
+    value = Capistrano::CLI.ui.ask("About to REBOOT #{instance_alias} (#{instance_item.instance_id}) in mode #{RUBBER_ENV}.  Are you SURE [yes/NO]?: ")
+    fatal("Exiting", 0) if value != "yes"
+
+    logger.info "Rebooting instance alias=#{instance_alias}, instance_id=#{instance_item.instance_id}"
+
+    cloud.reboot_instance(instance_item.instance_id)
+  end
+
+  # Stops the given ec2 instance.  Note that this operation only works for instances that use an EBS volume for the root
+  # device and that are not spot instances.
+  def stop_instance(instance_alias)
+    instance_item = rubber_instances[instance_alias]
+    fatal "Instance does not exist: #{instance_alias}" if ! instance_item
+    fatal "Cannot stop spot instances!" if ! instance_item.spot_instance_request_id.nil?
+    fatal "Cannot stop instances with instance-store root device!" if (instance_item.root_device_type != 'ebs')
+
+    env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
+
+    value = Capistrano::CLI.ui.ask("About to STOP #{instance_alias} (#{instance_item.instance_id}) in mode #{RUBBER_ENV}.  Are you SURE [yes/NO]?: ")
+    fatal("Exiting", 0) if value != "yes"
+
+    logger.info "Stopping instance alias=#{instance_alias}, instance_id=#{instance_item.instance_id}"
+
+    cloud.stop_instance(instance_item.instance_id)
+  end
+
+  # Starts the given ec2 instance.  Note that this operation only works for instances that use an EBS volume for the root
+  # device, that are not spot instances, and that are already stopped.
+  def start_instance(instance_alias)
+    instance_item = rubber_instances[instance_alias]
+    fatal "Instance does not exist: #{instance_alias}" if ! instance_item
+    fatal "Cannot start spot instances!" if ! instance_item.spot_instance_request_id.nil?
+    fatal "Cannot start instances with instance-store root device!" if (instance_item.root_device_type != 'ebs')
+
+    env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
+
+    value = Capistrano::CLI.ui.ask("About to START #{instance_alias} (#{instance_item.instance_id}) in mode #{RUBBER_ENV}.  Are you SURE [yes/NO]?: ")
+    fatal("Exiting", 0) if value != "yes"
+
+    logger.info "Starting instance alias=#{instance_alias}, instance_id=#{instance_item.instance_id}"
+
+    cloud.start_instance(instance_item.instance_id)
+
+    # Re-starting an instance will almost certainly give it a new set of IPs and DNS entries, so refresh the values.
+    print "Waiting for instance to start"
+    while true do
+      print "."
+      sleep 2
+
+      break if refresh_instance(instance_alias)
+    end
+  end
 
   # delete from ~/.ssh/known_hosts all lines that begin with ec2- or instance_alias
   def cleanup_known_hosts(instance_item)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 6
-  - 3
-  version: 1.6.3
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 -04:00
+date: 2010-10-01 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency