knife-ec2 0.5.10 → 0.5.12

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in knife-rackspace.gemspec
 gemspec
+
+group :development do
+  gem 'rspec', '~> 2.7.0'
+end

data/Gemfile.lock

@@ -0,0 +1,97 @@
+PATH
+  remote: .
+  specs:
+    knife-ec2 (0.5.11)
+      chef (>= 0.10.10)
+      fog (~> 1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    bunny (0.7.9)
+    chef (0.10.10)
+      bunny (>= 0.6.0)
+      erubis
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.6.1)
+      mixlib-authentication (>= 1.1.0)
+      mixlib-cli (>= 1.1.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout (~> 1.0.0.rc)
+      moneta
+      net-ssh (~> 2.2.2)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      treetop (~> 1.4.9)
+      uuidtools
+      yajl-ruby (>= 1.1.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    excon (0.13.4)
+    fog (1.3.1)
+      builder
+      excon (~> 0.13.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.1)
+    highline (1.6.12)
+    ipaddress (0.8.0)
+    json (1.6.1)
+    mime-types (1.18)
+    mixlib-authentication (1.1.4)
+      mixlib-log
+    mixlib-cli (1.2.2)
+    mixlib-config (1.1.2)
+    mixlib-log (1.3.0)
+    mixlib-shellout (1.0.0)
+    moneta (0.6.0)
+    multi_json (1.3.4)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.2.2)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    nokogiri (1.5.2)
+    ohai (0.6.12)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      systemu
+      yajl-ruby
+    polyglot (0.3.3)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    ruby-hmac (0.4.0)
+    systemu (2.5.0)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    uuidtools (2.1.2)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  knife-ec2!
+  rspec (~> 2.7.0)

data/README.rdoc

@@ -31,7 +31,7 @@ If your knife.rb file will be checked into a SCM system (ie readable by others)
 You also have the option of passing your AWS API Key/Secret into the individual knife subcommands using the <tt>-A</tt> (or <tt>--aws-access-key-id</tt>) <tt>-K</tt> (or <tt>--aws-secret-access-key</tt>) command options
 
     # provision a new m1.small Ubuntu 10.04 webserver
-    knife ec2 server create 'role[webserver]' -I ami-7000f019 -f m1.small -A 'Your AWS Access Key ID' -K "Your AWS Secret Access Key"
+    knife ec2 server create -r 'role[webserver]' -I ami-7000f019 -f m1.small -A 'Your AWS Access Key ID' -K "Your AWS Secret Access Key"
 
 Additionally the following options may be set in your `knife.rb`:
 
@@ -53,7 +53,7 @@ Provisions a new server in the Amazon EC2 and then perform a Chef bootstrap (usi
 
 == knife ec2 server delete
 
-Deletes an existing server in the currently configured AWS account.  <b>PLEASE NOTE</b> - this does not delete the associated node and client objects from the Chef server.
+Deletes an existing server in the currently configured AWS account.  <b>PLEASE NOTE</b> - By default, this does not delete the associated node and client objects from the Chef server.  To do so, add the <tt>--purge</tt> flag.
 
 == knife ec2 server list
 

data/knife-ec2.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Adam Jacob","Seth Chisamore"]
   s.email       = ["adam@opscode.com","schisamo@opscode.com"]
   s.homepage = "http://wiki.opscode.com/display/chef"
-  s.summary = "Rackspace Support for Chef's Knife Command"
+  s.summary = "EC2 Support for Chef's Knife Command"
   s.description = s.summary
   s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "fog", "~> 0.8.2"
+  s.add_dependency "fog", "~> 1.3"
+  s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
-
 end

data/lib/chef/knife/ec2_base.rb

@@ -82,7 +82,7 @@ class Chef
         keys.each do |k|
           pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(ssh)|(aws)/i) ? w.upcase  : w.capitalize }
           if Chef::Config[:knife][k].nil?
-            errors << "You did not provided a valid '#{pretty_key}' value."
+            errors << "You did not provide a valid '#{pretty_key}' value."
           end
         end
 

data/lib/chef/knife/ec2_server_create.rb

@@ -57,6 +57,12 @@ class Chef
         :default => ["default"],
         :proc => Proc.new { |groups| groups.split(',') }
 
+      option :tags,
+        :short => "-T T=V[,T=V,...]",
+        :long => "--tags Tag=Value[,Tag=Value...]",
+        :description => "The tags for this server",
+        :proc => Proc.new { |tags| tags.split(',') }
+
       option :availability_zone,
         :short => "-Z ZONE",
         :long => "--availability-zone ZONE",
@@ -86,6 +92,13 @@ class Chef
         :long => "--ssh-password PASSWORD",
         :description => "The ssh password"
 
+      option :ssh_port,
+        :short => "-p PORT",
+        :long => "--ssh-port PORT",
+        :description => "The ssh port",
+        :default => "22",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
       option :identity_file,
         :short => "-i IDENTITY_FILE",
         :long => "--identity-file IDENTITY_FILE",
@@ -103,9 +116,9 @@ class Chef
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template",
+        :description => "Bootstrap a distro using a template; default is 'chef-full'",
         :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
-        :default => "ubuntu10.04-gems"
+        :default => "chef-full"
 
       option :template_file,
         :long => "--template-file TEMPLATE",
@@ -148,7 +161,7 @@ class Chef
         :default => nil
 
       def tcp_test_ssh(hostname)
-        tcp_socket = TCPSocket.new(hostname, 22)
+        tcp_socket = TCPSocket.new(hostname, config[:ssh_port])
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
           Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
@@ -171,6 +184,10 @@ class Chef
       rescue Errno::EHOSTUNREACH
         sleep 2
         false
+      # This happens on EC2 sometimes
+      rescue Errno::ENETUNREACH
+        sleep 2
+        false
       ensure
         tcp_socket && tcp_socket.close
       end
@@ -182,12 +199,25 @@ class Chef
 
         server = connection.servers.create(create_server_def)
 
+        hashed_tags={}
+        tags.map{ |t| key,val=t.split('='); hashed_tags[key]=val} unless tags.nil?
+
+        # Always set the Name tag
+        unless hashed_tags.keys.include? "Name"
+          hashed_tags["Name"] = locate_config_value(:chef_node_name) || server.id
+        end
+
+        hashed_tags.each_pair do |key,val|
+          connection.tags.create :key => key, :value => val, :resource_id => server.id
+        end
+
         msg_pair("Instance ID", server.id)
         msg_pair("Flavor", server.flavor_id)
         msg_pair("Image", server.image_id)
         msg_pair("Region", connection.instance_variable_get(:@region))
         msg_pair("Availability Zone", server.availability_zone)
         msg_pair("Security Groups", server.groups.join(", "))
+        msg_pair("Tags", hashed_tags)
         msg_pair("SSH Key", server.key_name)
 
         print "\n#{ui.color("Waiting for server", :magenta)}"
@@ -196,7 +226,7 @@ class Chef
         server.wait_for { print "."; ready? }
 
         puts("\n")
-        
+
         if vpc_mode?
           msg_pair("Subnet ID", server.subnet_id)
         else
@@ -207,9 +237,9 @@ class Chef
         msg_pair("Private IP Address", server.private_ip_address)
 
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
-        
+
         fqdn = vpc_mode? ? server.private_ip_address : server.dns_name
-        
+
         print(".") until tcp_test_ssh(fqdn) {
           sleep @initial_sleep_delay ||= (vpc_mode? ? 40 : 10)
           puts("done")
@@ -224,6 +254,7 @@ class Chef
         msg_pair("Region", connection.instance_variable_get(:@region))
         msg_pair("Availability Zone", server.availability_zone)
         msg_pair("Security Groups", server.groups.join(", "))
+        msg_pair("Tags", hashed_tags)
         msg_pair("SSH Key", server.key_name)
         msg_pair("Root Device Type", server.root_device_type)
         if server.root_device_type == "ebs"
@@ -259,6 +290,7 @@ class Chef
         bootstrap.name_args = [fqdn]
         bootstrap.config[:run_list] = config[:run_list]
         bootstrap.config[:ssh_user] = config[:ssh_user]
+        bootstrap.config[:ssh_port] = config[:ssh_port]
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
         bootstrap.config[:prerelease] = config[:prerelease]
@@ -291,7 +323,16 @@ class Chef
           exit 1
         end
       end
-      
+
+      def tags
+       tags = locate_config_value(:tags)
+        if !tags.nil? and tags.length != tags.to_s.count('=')
+          ui.error("Tags should be entered in a key = value pair")
+          exit 1
+        end
+       tags
+      end
+
       def create_server_def
         server_def = {
           :image_id => locate_config_value(:image),
@@ -335,7 +376,7 @@ class Chef
                'Ebs.DeleteOnTermination' => delete_term
              }]
         end
-        
+
         server_def
       end
     end

data/lib/chef/knife/ec2_server_delete.rb

@@ -19,6 +19,10 @@
 
 require 'chef/knife/ec2_base'
 
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
+
 class Chef
   class Knife
     class Ec2ServerDelete < Knife
@@ -27,6 +31,33 @@ class Chef
 
       banner "knife ec2 server delete SERVER [SERVER] (options)"
 
+      option :purge,
+        :short => "-P",
+        :long => "--purge",
+        :boolean => true,
+        :default => false,
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the EC2 node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
+
+      # Extracted from Chef::Knife.delete_object, because it has a
+      # confirmation step built in... By specifying the '--purge'
+      # flag (and also explicitly confirming the server destruction!)
+      # the user is already making their intent known.  It is not
+      # necessary to make them confirm two more times.
+      def destroy_item(klass, name, type_name)
+        begin
+          object = klass.load(name)
+          object.destroy
+          ui.warn("Deleted #{type_name} #{name}")
+        rescue Net::HTTPServerException
+          ui.warn("Could not find a #{type_name} named #{name} to delete!")
+        end
+      end
+
       def run
 
         validate!
@@ -56,6 +87,14 @@ class Chef
 
             ui.warn("Deleted server #{server.id}")
 
+            if config[:purge]
+              thing_to_delete = config[:chef_node_name] || instance_id
+              destroy_item(Chef::Node, thing_to_delete, "node")
+              destroy_item(Chef::ApiClient, thing_to_delete, "client")
+            else
+              ui.warn("Corresponding node and client for the #{instance_id} server were not deleted and remain registered with the Chef Server")
+            end
+
           rescue NoMethodError
             ui.error("Could not locate server '#{instance_id}'.  Please verify it was provisioned in the '#{locate_config_value(:region)}' region.")
           end
@@ -65,4 +104,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/ec2_server_list.rb

@@ -62,7 +62,7 @@ class Chef
             end
           end
         end
-        puts ui.list(server_list, :columns_across, 8)
+        puts ui.list(server_list, :uneven_columns_across, 8)
 
       end
     end

data/lib/knife-ec2/version.rb

@@ -1,7 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "0.5.10"
+    VERSION = "0.5.12"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end
-

data/spec/unit/ec2_server_create_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,27 @@
 #
 
 require File.expand_path('../../spec_helper', __FILE__)
+require 'fog'
+require 'chef/knife/bootstrap'
 
 describe Chef::Knife::Ec2ServerCreate do
   before do
-    @knife_ec2_create = Chef::Knife::Ec2ServerCreate.new()
-    @knife_ec2_create.name_args = ['role[base]']
+    @knife_ec2_create = Chef::Knife::Ec2ServerCreate.new
     @knife_ec2_create.initial_sleep_delay = 0
     @knife_ec2_create.stub!(:tcp_test_ssh).and_return(true)
 
-    @ec2_connection = mock()
+    {
+      :image => 'image',
+      :aws_ssh_key_id => 'aws_ssh_key_id',
+      :aws_access_key_id => 'aws_access_key_id',
+      :aws_secret_access_key => 'aws_secret_access_key'
+    }.each do |key, value|
+      Chef::Config[:knife][key] = value
+    end
+
+    @ec2_connection = mock(Fog::Compute::AWS)
+    @ec2_connection.stub_chain(:tags).and_return mock('create', :create => true)
+    @ec2_connection.stub_chain(:images, :get).and_return mock('ami', :root_device_type => 'not_ebs')
     @ec2_servers = mock()
     @new_ec2_server = mock()
 
@@ -36,9 +48,10 @@ describe Chef::Knife::Ec2ServerCreate do
                            :key_name => 'my_ssh_key',
                            :groups => ['group1', 'group2'],
                            :dns_name => 'ec2-75.101.253.10.compute-1.amazonaws.com',
-                           :ip_address => '75.101.253.10',
+                           :public_ip_address => '75.101.253.10',
                            :private_dns_name => 'ip-10-251-75-20.ec2.internal',
-                           :private_ip_address => '10.251.75.20' }
+                           :private_ip_address => '10.251.75.20',
+                           :root_device_type => 'not_ebs' }
 
     @ec2_server_attribs.each_pair do |attrib, value|
       @new_ec2_server.stub!(attrib).and_return(value)
@@ -46,13 +59,12 @@ describe Chef::Knife::Ec2ServerCreate do
   end
 
   describe "run" do
-
     it "creates an EC2 instance and bootstraps it" do
       @new_ec2_server.should_receive(:wait_for).and_return(true)
       @ec2_servers.should_receive(:create).and_return(@new_ec2_server)
       @ec2_connection.should_receive(:servers).and_return(@ec2_servers)
 
-      Fog::AWS::Compute.should_receive(:new).and_return(@ec2_connection)
+      Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
 
       @knife_ec2_create.stub!(:puts)
       @knife_ec2_create.stub!(:print)
@@ -64,6 +76,48 @@ describe Chef::Knife::Ec2ServerCreate do
       @bootstrap.should_receive(:run)
       @knife_ec2_create.run
     end
+  end
+  describe "when setting tags" do
+    before do
+      Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
+      @knife_ec2_create.stub!(:bootstrap_for_node).and_return mock("bootstrap", :run => true)
+      @ec2_connection.stub!(:servers).and_return(@ec2_servers)
+      @new_ec2_server.stub!(:wait_for).and_return(true)
+      @ec2_servers.stub!(:create).and_return(@new_ec2_server)
+      @knife_ec2_create.stub!(:puts)
+      @knife_ec2_create.stub!(:print)
+    end
+
+    it "sets the Name tag to the instance id by default" do
+      @ec2_connection.tags.should_receive(:create).with(:key => "Name",
+                                                        :value => @new_ec2_server.id,
+                                                        :resource_id => @new_ec2_server.id)
+      @knife_ec2_create.run
+    end
+
+    it "sets the Name tag to the chef_node_name when given" do
+      @knife_ec2_create.config[:chef_node_name] = "wombat"
+      @ec2_connection.tags.should_receive(:create).with(:key => "Name",
+                                                        :value => "wombat",
+                                                        :resource_id => @new_ec2_server.id)
+      @knife_ec2_create.run
+    end
+
+    it "sets the Name tag to the specified name when given --tags Name=NAME" do
+      @knife_ec2_create.config[:tags] = ["Name=bobcat"]
+      @ec2_connection.tags.should_receive(:create).with(:key => "Name",
+                                                        :value => "bobcat",
+                                                        :resource_id => @new_ec2_server.id)
+      @knife_ec2_create.run
+    end
+
+    it "sets arbitrary tags" do
+      @knife_ec2_create.config[:tags] = ["foo=bar"]
+      @ec2_connection.tags.should_receive(:create).with(:key => "foo",
+                                                        :value => "bar",
+                                                        :resource_id => @new_ec2_server.id)
+      @knife_ec2_create.run
+    end
 
   end
 
@@ -71,11 +125,13 @@ describe Chef::Knife::Ec2ServerCreate do
     before do
       @knife_ec2_create.config[:ssh_user] = "ubuntu"
       @knife_ec2_create.config[:identity_file] = "~/.ssh/aws-key.pem"
+      @knife_ec2_create.config[:ssh_port] = 22
       @knife_ec2_create.config[:chef_node_name] = "blarf"
       @knife_ec2_create.config[:template_file] = '~/.chef/templates/my-bootstrap.sh.erb'
       @knife_ec2_create.config[:distro] = 'ubuntu-10.04-magic-sparkles'
+      @knife_ec2_create.config[:run_list] = ['role[base]']
 
-      @bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server)
+      @bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server, @new_ec2_server.dns_name)
     end
 
     it "should set the bootstrap 'name argument' to the hostname of the EC2 server" do
@@ -94,6 +150,10 @@ describe Chef::Knife::Ec2ServerCreate do
       @bootstrap.config[:identity_file].should == "~/.ssh/aws-key.pem"
     end
 
+    it "configures the bootstrap to use the correct ssh_port number" do
+      @bootstrap.config[:ssh_port].should == 22
+    end
+
     it "configures the bootstrap to use the configured node name if provided" do
       @bootstrap.config[:chef_node_name].should == 'blarf'
     end
@@ -101,7 +161,7 @@ describe Chef::Knife::Ec2ServerCreate do
     it "configures the bootstrap to use the EC2 server id if no explicit node name is set" do
       @knife_ec2_create.config[:chef_node_name] = nil
 
-      bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server)
+      bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server, @new_ec2_server.dns_name)
       bootstrap.config[:chef_node_name].should == @new_ec2_server.id
     end
 
@@ -110,7 +170,7 @@ describe Chef::Knife::Ec2ServerCreate do
 
       @knife_ec2_create.config[:prerelease] = true
 
-      bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server)
+      bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server, @new_ec2_server.dns_name)
       bootstrap.config[:prerelease].should be_true
     end
 

metadata

@@ -1,45 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-ec2
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.12
   prerelease: 
-  version: 0.5.10
 platform: ruby
-authors: 
+authors:
 - Adam Jacob
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-30 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70349127587980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-description: Rackspace Support for Chef's Knife Command
-email: 
+  prerelease: false
+  version_requirements: *70349127587980
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &70349127587440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *70349127587440
+description: EC2 Support for Chef's Knife Command
+email:
 - adam@opscode.com
 - schisamo@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -52,34 +60,30 @@ files:
 - lib/knife-ec2/version.rb
 - spec/spec_helper.rb
 - spec/unit/ec2_server_create_spec.rb
-has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 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
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Rackspace Support for Chef's Knife Command
-test_files: 
+summary: EC2 Support for Chef's Knife Command
+test_files:
 - spec/spec_helper.rb
 - spec/unit/ec2_server_create_spec.rb