knife-ec2 0.5.12 → 0.5.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    knife-ec2 (0.5.11)
+    knife-ec2 (0.5.14)
       chef (>= 0.10.10)
       fog (~> 1.3)
 
@@ -9,8 +9,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    bunny (0.7.9)
-    chef (0.10.10)
+    bunny (0.8.0)
+    chef (10.12.0)
       bunny (>= 0.6.0)
       erubis
       highline (>= 1.6.9)
@@ -19,7 +19,7 @@ GEM
       mixlib-cli (>= 1.1.0)
       mixlib-config (>= 1.1.2)
       mixlib-log (>= 1.3.0)
-      mixlib-shellout (~> 1.0.0.rc)
+      mixlib-shellout
       moneta
       net-ssh (~> 2.2.2)
       net-ssh-multi (~> 1.1.0)
@@ -27,13 +27,13 @@ GEM
       rest-client (>= 1.0.4, < 1.7.0)
       treetop (~> 1.4.9)
       uuidtools
-      yajl-ruby (>= 1.1.0)
+      yajl-ruby (~> 1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    excon (0.13.4)
-    fog (1.3.1)
+    excon (0.14.3)
+    fog (1.4.0)
       builder
-      excon (~> 0.13.0)
+      excon (~> 0.14.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -41,19 +41,19 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.1)
-    highline (1.6.12)
+    formatador (0.2.3)
+    highline (1.6.13)
     ipaddress (0.8.0)
     json (1.6.1)
-    mime-types (1.18)
+    mime-types (1.19)
     mixlib-authentication (1.1.4)
       mixlib-log
     mixlib-cli (1.2.2)
     mixlib-config (1.1.2)
-    mixlib-log (1.3.0)
+    mixlib-log (1.4.1)
     mixlib-shellout (1.0.0)
     moneta (0.6.0)
-    multi_json (1.3.4)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.2.2)
@@ -62,8 +62,8 @@ GEM
     net-ssh-multi (1.1)
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.5.2)
-    ohai (0.6.12)
+    nokogiri (1.5.5)
+    ohai (6.14.0)
       ipaddress
       mixlib-cli
       mixlib-config
@@ -81,12 +81,15 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
+    rspec_junit_formatter (0.1.1)
+      builder
+      rspec (~> 2.0)
     ruby-hmac (0.4.0)
-    systemu (2.5.0)
+    systemu (2.5.2)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    uuidtools (2.1.2)
+    uuidtools (2.1.3)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -95,3 +98,7 @@ PLATFORMS
 DEPENDENCIES
   knife-ec2!
   rspec (~> 2.7.0)
+  rspec-core
+  rspec-expectations
+  rspec-mocks
+  rspec_junit_formatter

data/README.rdoc

@@ -65,7 +65,7 @@ Generates instance metadata in meant to be used with Opscode's custom AMIs. This
 
 <b>PLEASE NOTE</b> - Using Opscode's custom AMIs reflect an older way of launching instances in EC2 for Chef and should be considered DEPRECATED. Leveraging this plugins's <tt>knife ec2 server create</tt> subcommands with a base AMIs directly from your Linux distribution (ie Ubuntu AMIs from Canonical) is much preferred and more flexible.  Although this subcommand will remain, the Opscode custom AMIs are currently out of date.
 
-In-depth usage instructions can be found on the {Chef Wiki}[http://wiki.opscode.com/display/chef/Amazon+EC2+AMIs+with+Chef].
+In-depth usage instructions can be found on the {Chef Wiki}[http://wiki.opscode.com/display/chef/EC2+Bootstrap+Fast+Start+Guide].
 
 = LICENSE:
 

data/knife-ec2.gemspec

@@ -18,5 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.add_dependency "fog", "~> 1.3"
   s.add_dependency "chef", ">= 0.10.10"
+  %w(rspec-core rspec-expectations rspec-mocks  rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
+
   s.require_paths = ["lib"]
 end

data/lib/chef/knife/ec2_base.rb

@@ -67,7 +67,7 @@ class Chef
 
       def locate_config_value(key)
         key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
+        config[key] || Chef::Config[:knife][key]
       end
 
       def msg_pair(label, value, color=:cyan)

data/lib/chef/knife/ec2_flavor_list.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/ec2_base'
+
+class Chef
+  class Knife
+    class Ec2FlavorList < Knife
+
+      include Knife::Ec2Base
+
+      banner "knife ec2 flavor list (options)"
+
+      def run
+
+        validate!
+
+        flavor_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Architecture', :bold),
+          ui.color('RAM', :bold),
+          ui.color('Disk', :bold),
+          ui.color('Cores', :bold)
+        ]
+        connection.flavors.sort_by(&:id).each do |flavor|
+          flavor_list << flavor.id.to_s
+          flavor_list << flavor.name
+          flavor_list << "#{flavor.bits.to_s}-bit"
+          flavor_list << "#{flavor.ram.to_s}"
+          flavor_list << "#{flavor.disk.to_s} GB"
+          flavor_list << flavor.cores.to_s
+        end
+        puts ui.list(flavor_list, :columns_across, 6)
+      end
+    end
+  end
+end

data/lib/chef/knife/ec2_server_create.rb

@@ -36,6 +36,7 @@ class Chef
       banner "knife ec2 server create (options)"
 
       attr_accessor :initial_sleep_delay
+      attr_reader :server
 
       option :flavor,
         :short => "-f FLAVOR",
@@ -53,10 +54,15 @@ class Chef
       option :security_groups,
         :short => "-G X,Y,Z",
         :long => "--groups X,Y,Z",
-        :description => "The security groups for this server",
-        :default => ["default"],
+        :description => "The security groups for this server; not allowed when using VPC",
         :proc => Proc.new { |groups| groups.split(',') }
 
+      option :security_group_ids,
+        :short => "-g X,Y,Z",
+        :long => "--security-group-ids X,Y,Z",
+        :description => "The security group ids for this server; required when using VPC",
+        :proc => Proc.new { |security_group_ids| security_group_ids.split(',') }
+
       option :tags,
         :short => "-T T=V[,T=V,...]",
         :long => "--tags Tag=Value[,Tag=Value...]",
@@ -141,17 +147,25 @@ class Chef
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
 
+      option :json_attributes,
+        :short => "-j JSON",
+        :long => "--json-attributes JSON",
+        :description => "A JSON string to be added to the first run of chef-client",
+        :proc => lambda { |o| JSON.parse(o) },
+        :default => {}
+
+
       option :subnet_id,
         :short => "-s SUBNET-ID",
         :long => "--subnet SUBNET-ID",
         :description => "create node in this Virtual Private Cloud Subnet ID (implies VPC mode)",
         :default => false
 
-      option :no_host_key_verify,
-        :long => "--no-host-key-verify",
-        :description => "Disable host key verification",
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
+        :description => "Verify host key, enabled by default.",
         :boolean => true,
-        :default => false
+        :default => true
 
       option :aws_user_data,
         :long => "--user-data USER_DATA_FILE",
@@ -197,68 +211,81 @@ class Chef
 
         validate!
 
-        server = connection.servers.create(create_server_def)
+        @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
+          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
+          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("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("Availability Zone", @server.availability_zone)
+
+        # If we don't specify a security group or security group id, Fog will
+        # pick the appropriate default one. In case of a VPC we don't know the
+        # default security group id at this point unless we look it up, hence
+        # 'default' is printed if no id was specified.
+        printed_security_groups = "default"
+        printed_security_groups = @server.groups.join(", ") if @server.groups 
+        msg_pair("Security Groups", printed_security_groups) unless vpc_mode? or (@server.groups.nil? and @server.security_group_ids)
+
+        printed_security_group_ids = "default"
+        printed_security_group_ids = @server.security_group_ids.join(", ") if @server.security_group_ids
+        msg_pair("Security Group Ids", printed_security_group_ids) if vpc_mode? or @server.security_group_ids
+
         msg_pair("Tags", hashed_tags)
-        msg_pair("SSH Key", server.key_name)
+        msg_pair("SSH Key", @server.key_name)
 
         print "\n#{ui.color("Waiting for server", :magenta)}"
 
         # wait for it to be ready to do stuff
-        server.wait_for { print "."; ready? }
+        @server.wait_for { print "."; ready? }
 
         puts("\n")
 
         if vpc_mode?
-          msg_pair("Subnet ID", server.subnet_id)
+          msg_pair("Subnet ID", @server.subnet_id)
         else
-          msg_pair("Public DNS Name", server.dns_name)
-          msg_pair("Public IP Address", server.public_ip_address)
-          msg_pair("Private DNS Name", server.private_dns_name)
+          msg_pair("Public DNS Name", @server.dns_name)
+          msg_pair("Public IP Address", @server.public_ip_address)
+          msg_pair("Private DNS Name", @server.private_dns_name)
         end
-        msg_pair("Private IP Address", server.private_ip_address)
+        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
+        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")
         }
 
-        bootstrap_for_node(server,fqdn).run
+        bootstrap_for_node(@server,fqdn).run
 
         puts "\n"
-        msg_pair("Instance ID", server.id)
-        msg_pair("Flavor", server.flavor_id)
-        msg_pair("Image", server.image_id)
+        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("Availability Zone", @server.availability_zone)
+        msg_pair("Security Groups", printed_security_groups) unless vpc_mode? or (@server.groups.nil? and @server.security_group_ids)
+        msg_pair("Security Group Ids", printed_security_group_ids) if vpc_mode? or @server.security_group_ids
         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"
-          device_map = server.block_device_mapping.first
+        msg_pair("SSH Key", @server.key_name)
+        msg_pair("Root Device Type", @server.root_device_type)
+        if @server.root_device_type == "ebs"
+          device_map = @server.block_device_mapping.first
           msg_pair("Root Volume ID", device_map['volumeId'])
           msg_pair("Root Device Name", device_map['deviceName'])
           msg_pair("Root Device Delete on Terminate", device_map['deleteOnTermination'])
@@ -274,15 +301,16 @@ class Chef
           end
         end
         if vpc_mode?
-          msg_pair("Subnet ID", server.subnet_id)
+          msg_pair("Subnet ID", @server.subnet_id)
         else
-          msg_pair("Public DNS Name", server.dns_name)
-          msg_pair("Public IP Address", server.public_ip_address)
-          msg_pair("Private DNS Name", server.private_dns_name)
+          msg_pair("Public DNS Name", @server.dns_name)
+          msg_pair("Public IP Address", @server.public_ip_address)
+          msg_pair("Private DNS Name", @server.private_dns_name)
         end
-        msg_pair("Private IP Address", server.private_ip_address)
+        msg_pair("Private IP Address", @server.private_ip_address)
         msg_pair("Environment", config[:environment] || '_default')
         msg_pair("Run List", config[:run_list].join(', '))
+        msg_pair("JSON Attributes",config[:json_attributes]) unless config[:json_attributes].empty?
       end
 
       def bootstrap_for_node(server,fqdn)
@@ -295,12 +323,13 @@ class Chef
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
         bootstrap.config[:prerelease] = config[:prerelease]
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+        bootstrap.config[:first_boot_attributes] = config[:json_attributes]
         bootstrap.config[:distro] = locate_config_value(:distro)
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:environment] = config[:environment]
         # may be needed for vpc_mode
-        bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+        bootstrap.config[:host_key_verify] = config[:host_key_verify]
         bootstrap
       end
 
@@ -322,6 +351,12 @@ class Chef
           ui.error("You have not provided a valid image (AMI) value.  Please note the short option for this value recently changed from '-i' to '-I'.")
           exit 1
         end
+        
+        if vpc_mode? and !!config[:security_groups]
+          ui.error("You are using a VPC, security groups specified with '-G' are not allowed, specify one or more security group ids with '-g' instead.")
+          exit 1
+        end
+
       end
 
       def tags
@@ -337,6 +372,7 @@ class Chef
         server_def = {
           :image_id => locate_config_value(:image),
           :groups => config[:security_groups],
+          :security_group_ids => config[:security_group_ids],
           :flavor_id => locate_config_value(:flavor),
           :key_name => Chef::Config[:knife][:aws_ssh_key_id],
           :availability_zone => locate_config_value(:availability_zone)

data/lib/chef/knife/ec2_server_delete.rb

@@ -31,6 +31,8 @@ class Chef
 
       banner "knife ec2 server delete SERVER [SERVER] (options)"
 
+      attr_reader :server
+
       option :purge,
         :short => "-P",
         :long => "--purge",
@@ -65,27 +67,27 @@ class Chef
         @name_args.each do |instance_id|
 
           begin
-            server = connection.servers.get(instance_id)
+            @server = connection.servers.get(instance_id)
 
-            msg_pair("Instance ID", server.id)
-            msg_pair("Flavor", server.flavor_id)
-            msg_pair("Image", server.image_id)
+            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("SSH Key", server.key_name)
-            msg_pair("Root Device Type", server.root_device_type)
-            msg_pair("Public DNS Name", server.dns_name)
-            msg_pair("Public IP Address", server.public_ip_address)
-            msg_pair("Private DNS Name", server.private_dns_name)
-            msg_pair("Private IP Address", server.private_ip_address)
+            msg_pair("Availability Zone", @server.availability_zone)
+            msg_pair("Security Groups", @server.groups.join(", "))
+            msg_pair("SSH Key", @server.key_name)
+            msg_pair("Root Device Type", @server.root_device_type)
+            msg_pair("Public DNS Name", @server.dns_name)
+            msg_pair("Public IP Address", @server.public_ip_address)
+            msg_pair("Private DNS Name", @server.private_dns_name)
+            msg_pair("Private IP Address", @server.private_ip_address)
 
             puts "\n"
             confirm("Do you really want to delete this server")
 
-            server.destroy
+            @server.destroy
 
-            ui.warn("Deleted server #{server.id}")
+            ui.warn("Deleted server #{@server.id}")
 
             if config[:purge]
               thing_to_delete = config[:chef_node_name] || instance_id

data/lib/knife-ec2/version.rb

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

data/spec/unit/ec2_server_create_spec.rb

@@ -47,6 +47,7 @@ describe Chef::Knife::Ec2ServerCreate do
                            :availability_zone => 'us-west-1',
                            :key_name => 'my_ssh_key',
                            :groups => ['group1', 'group2'],
+                           :security_group_ids => ['sg-00aa11bb'],
                            :dns_name => 'ec2-75.101.253.10.compute-1.amazonaws.com',
                            :public_ip_address => '75.101.253.10',
                            :private_dns_name => 'ip-10-251-75-20.ec2.internal',
@@ -75,6 +76,7 @@ describe Chef::Knife::Ec2ServerCreate do
       Chef::Knife::Bootstrap.stub!(:new).and_return(@bootstrap)
       @bootstrap.should_receive(:run)
       @knife_ec2_create.run
+      @knife_ec2_create.server.should_not == nil
     end
   end
   describe "when setting tags" do
@@ -130,6 +132,7 @@ describe Chef::Knife::Ec2ServerCreate do
       @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]']
+      @knife_ec2_create.config[:json_attributes] = "{'my_attributes':{'foo':'bar'}"
 
       @bootstrap = @knife_ec2_create.bootstrap_for_node(@new_ec2_server, @new_ec2_server.dns_name)
     end
@@ -138,6 +141,10 @@ describe Chef::Knife::Ec2ServerCreate do
       @bootstrap.name_args.should == ['ec2-75.101.253.10.compute-1.amazonaws.com']
     end
 
+    it "should set the bootstrap 'first_boot_attributes' correctly" do
+      @bootstrap.config[:first_boot_attributes].should == "{'my_attributes':{'foo':'bar'}"
+    end
+
     it "configures sets the bootstrap's run_list" do
       @bootstrap.config[:run_list].should == ['role[base]']
     end
@@ -187,4 +194,63 @@ describe Chef::Knife::Ec2ServerCreate do
     end
   end
 
+  describe "when validating the command-line parameters" do
+    before do
+      Fog::Compute::AWS.stub(:new).and_return(@ec2_connection)
+      @knife_ec2_create.ui.stub!(:error)
+    end
+
+    it "disallows security group names when using a VPC" do
+      @knife_ec2_create.config[:subnet_id] = 'subnet-1a2b3c4d'
+      @knife_ec2_create.config[:security_group_ids] = 'sg-aabbccdd'
+      @knife_ec2_create.config[:security_groups] = 'groupname'
+
+      lambda { @knife_ec2_create.validate! }.should raise_error SystemExit
+    end
+  end
+
+  describe "when creating the server definition" do
+    before do
+      Fog::Compute::AWS.stub(:new).and_return(@ec2_connection)
+    end
+
+    it "sets the specified security group names" do
+      @knife_ec2_create.config[:security_groups] = ['groupname']
+      server_def = @knife_ec2_create.create_server_def
+
+      server_def[:groups].should == ['groupname']
+    end
+
+    it "sets the specified security group ids" do
+      @knife_ec2_create.config[:security_group_ids] = ['sg-aabbccdd']
+      server_def = @knife_ec2_create.create_server_def
+
+      server_def[:security_group_ids].should == ['sg-aabbccdd']
+    end
+
+    it "sets the image id from CLI arguments over knife config" do
+      @knife_ec2_create.config[:image] = "ami-aaa"
+      Chef::Config[:knife][:image] = "ami-zzz"
+      server_def = @knife_ec2_create.create_server_def
+
+      server_def[:image_id].should == "ami-aaa"
+    end
+
+    it "sets the flavor id from CLI arguments over knife config" do
+      @knife_ec2_create.config[:flavor] = "massive"
+      Chef::Config[:knife][:flavor] = "bitty"
+      server_def = @knife_ec2_create.create_server_def
+
+      server_def[:flavor_id].should == "massive"
+    end
+
+    it "sets the availability zone from CLI arguments over knife config" do
+      @knife_ec2_create.config[:availability_zone] = "dis-one"
+      Chef::Config[:knife][:availability_zone] = "dat-one"
+      server_def = @knife_ec2_create.create_server_def
+
+      server_def[:availability_zone].should == "dis-one"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70349127587980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70349127587980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70349127587440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,76 @@ dependencies:
         version: 0.10.10
   type: :runtime
   prerelease: false
-  version_requirements: *70349127587440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.10
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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: EC2 Support for Chef's Knife Command
 email:
 - adam@opscode.com
@@ -53,6 +127,7 @@ files:
 - Rakefile
 - knife-ec2.gemspec
 - lib/chef/knife/ec2_base.rb
+- lib/chef/knife/ec2_flavor_list.rb
 - lib/chef/knife/ec2_instance_data.rb
 - lib/chef/knife/ec2_server_create.rb
 - lib/chef/knife/ec2_server_delete.rb
@@ -80,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: EC2 Support for Chef's Knife Command