sproutr 0.2.2 → 0.2.3

data/lib/sproutr.rb

@@ -37,7 +37,7 @@ class Sproutr < Thor
       end
       new_config = clone_ami_config(@ec2.call("DescribeInstances", "InstanceId" => ami_to_clone)["reservationSet"][0]["instancesSet"][0], ami_id)
       until ami_done?(ami_id) do
-        say "Ami has not completed so this clone can not yet be started. Sleeping 30 seconds", :red
+        say "Ami creation has not completed so this clone can not yet be started. Sleeping 30 seconds", :red
         sleep 30
       end
       new_instance = invoke_launch(new_config)
@@ -99,6 +99,18 @@ into a singluar raid array (Required): "
     end
   end
 
+  desc "grow", "Grow a machine's 'hardware' resources"
+  method_option :ami, :type => :array, :required => true
+  method_option :size, :type => :string, :required => true
+
+  def grow
+    options[:ami].each do |ami|
+      Instance::call_on(@ec2, "StopInstances", ami)
+      @ec2.call "ModifyInstanceAttribute", "InstanceId" => ami, "InstanceType" => options[:size]
+      Instance::call_on(@ec2, "StartInstances", ami)
+    end
+  end
+
   desc "launch", "launch an instance from the specified config directory"
   method_option :config_file, :type => :string, :required => true
 
@@ -122,7 +134,12 @@ into a singluar raid array (Required): "
     ami_table = table do |a|
       a.headings = 'Name', 'AMI Id', 'Type', 'State', 'Size', 'Architecture', 'Public?', 'Description'
       @ami_images.each do |ami|
-        a << [ami.name, ami.imageId, ami.rootDeviceType, ami.imageState, ami.blockDeviceMapping[0]["ebs"]["volumeSize"],
+        begin
+          ami_size = ami.blockDeviceMapping.first["ebs"]["volumeSize"]
+        rescue
+          ami_size = "unknown"
+        end
+        a << [ami.name, ami.imageId, ami.rootDeviceType, ami.imageState, ami_size,
               ami.architecture, ami.isPublic, ami.description]
       end
     end
@@ -136,6 +153,7 @@ into a singluar raid array (Required): "
     instance_table = table do |i|
       i.headings = 'Name', 'Instance Id', 'Status', 'ip Address', 'Instance Type', 'AMI Image', 'Availablity Zone', 'DNS Cname'
       instances.each do |instance|
+        p instance.inspect
         i << [((instance.tagSet.nil?) ? "Name Not Set" : instance.tagSet[0]["value"]),
               instance.instanceId, instance.instanceState["name"], instance.ipAddress,
               instance.instanceType, instance.imageId, instance.placement["availabilityZone"], instance.dnsName]
@@ -157,11 +175,31 @@ into a singluar raid array (Required): "
     puts snapshots_table
   end
 
+  desc "migrate", "Migrate from one Availability Zone to another, requires --ami= [multiple apis supported separated by space] and --target="
+  method_option :ami, :type => :array, :require => true
+  method_option :target, :type => :string, :require => true
+
+  def migrate
+    ami_id = @ec2.call("CreateImage", "InstanceId" => ami_to_clone, "Name" => "AMI-#{options["ami"]}-#{Time.now.to_i}",
+                       "Description" => "AMI created from #{options["ami"]} at #{Time.now}", "NoReboot" => "true")["imageId"]
+
+    current_config = @ec2.call("DescribeInstances", "InstanceId" => options["ami"])["reservationSet"][0]["instancesSet"][0]
+    new_config = clone_ami_config(current_config, ami_id)
+
+    until ami_done?(ami_id) do
+      say "Ami creation has not completed so the new instance can not yet be started. Sleeping 30 seconds", :red
+      sleep 30
+    end
+    new_instance = invoke_launch(validate_launch_config(new_config, options[:target]))
+    say "Created and started #{new_instance}", :green
+    tag_instance(new_instance, options[:tags]) if options[:tags]
+  end
+
   desc "restart", "Restart the specified instance(s), requires --ami="
   method_option :ami, :type => :array, :required => true
 
   def restart
-    options[:ami].each { |ami| Instance::call_on("RebootInstances", ami) }
+    options[:ami].each { |ami| Instance::call_on(@ec2, "RebootInstances", ami) }
   end
 
   desc "snapshot", "Create snapshot"
@@ -180,14 +218,14 @@ into a singluar raid array (Required): "
   method_option :ami, :type => :array, :required => true
 
   def start
-    options[:ami].each { |ami| Instance::call_on("StartInstances", ami) }
+    options[:ami].each { |ami| Instance::call_on(@ec2, "StartInstances", ami) }
   end
 
   desc "stop", "Stop the specified instance(s), requires --ami="
   method_option :ami, :type => :array, :required => true
 
   def stop
-    options[:ami].each { |ami| Instance::call_on("StopInstances", ami) if yes? "Do you really want to stop the #{instance} instance? ", :red }
+    options[:ami].each { |ami| Instance::call_on(@ec2, "StopInstances", ami) if yes? "Do you really want to stop the #{ami} instance? ", :red }
   end
 
 
@@ -197,7 +235,7 @@ into a singluar raid array (Required): "
   def terminate
     options[:ami].each do |ami|
       verify = ask "Do you really want to terminate the #{ami} instance? ", :red
-      Instance::call_on("TerminateInstances", ami) if verify.downcase == "y" || verify.downcase == "yes"
+      Instance::call_on(@ec2, "TerminateInstances", ami) if verify.downcase == "y" || verify.downcase == "yes"
     end
   end
 
@@ -205,6 +243,10 @@ into a singluar raid array (Required): "
   method_option :ami, :type => :array, :required => true
   alias :destroy :terminate
 
+  desc "shrink", "Alias to grow"
+  method_option :ami, :type => :array, :required => true
+  method_option :size, :type => :string, :require => true
+  alias :shrink :terminate
 
   desc "list_snapshots", "Alias to list_snapshots"
   alias :list_snapshot :list_snapshots

data/lib/sproutr/instance.rb

@@ -8,8 +8,9 @@ class Instance
     end
   end
 
-  def self.call_on(action, ami)
-    @ec2.call action, "InstanceId" => ami
+  def self.call_on(ec2, action, ami)
+    
+    ec2.call action, "InstanceId" => ami
   end
 
   def method_missing(sym, *args, &block)

data/lib/sproutr/utilities.rb

@@ -21,14 +21,15 @@ def invoke_launch(config)
   response["instancesSet"].first["instanceId"]
 end
 
-def validate_launch_config(config)
+def validate_launch_config(config, availability_zone = nil)
   instance_options = {
       "SecurityGroup.#" => config["groups"] || [],
       "MinCount" => "1",
       "MaxCount" => "1",
       "KeyName" => config["key_name"] || "Production",
       "InstanceType" => config["instance_type"] || "m1.small",
-      "ImageId" => config["ami"]
+      "ImageId" => config["ami"],
+      "AvailabilityZone" => availability_zone || config["placement"]["availabilityZone"]
   }
 
   if config["volumes"]

metadata

@@ -1,149 +1,146 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sproutr
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Kevin Poorman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-24 00:00:00 -04:00
+date: 2011-11-04 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: swirl
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70273739915900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.7.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739915900
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70273739915440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739915440
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: &70273739914960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739914960
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: &70273739914460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739914460
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70273739914060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739914060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70273739913500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739913500
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: &70273739912940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739912940
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &70273739912440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec-mocks
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739912440
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: &70273739911900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739911900
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70273739911360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70273739911360
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70273739910780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *70273739910780
 description: Elegant, interactive EC2 Management
-email: 
+email:
 - kjp@brightleafsoftware.com
-executables: 
+executables:
 - sproutr
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
 - lib/sproutr/ami.rb
@@ -156,30 +153,27 @@ files:
 has_rdoc: true
 homepage: https://github.com/noeticpenguin/sproutr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
-summary: An Ec2 management system designed to help you quickly define a new instance, create N clones of said instance and start/stop them
+summary: An Ec2 management system designed to help you quickly define a new instance,
+  create N clones of said instance and start/stop them
 test_files: []
-