knife-ec2 0.10.0 → 0.11.0.rc.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjUzN2RiNmIwZTVkODIxMTU0ODUzZmYwYWY0YmEyNGUyNGRlYWZlMQ==
-  data.tar.gz: !binary |-
-    ZjY0YTZjNjY4MWU4OWMzNjkyZjAxZDg4MmM3ZjBkYTA4YzMyNjZmZg==
+SHA1:
+  metadata.gz: b9614eea778e1b96eac6b905998953099a1e117e
+  data.tar.gz: 05fbdb2db4d97a775228b2b16cab1dd283408413
 SHA512:
-  metadata.gz: !binary |-
-    OGMxOGVkMzU0ZTNmNDczZDQ1NzNhMDRmMDkwYTY0NWRiYTI3N2YxYzdhNTg2
-    MmU0YzhhYTc4MDkxMTgxMWJlNjliOTc3Y2YzOGZlYzE3NmMwOWE4NDRlNTI1
-    NDFiMGU3YjM0ZTViNjlhNmIyOGE5MTk0ZWNmODVlMWRiMmNlMzY=
-  data.tar.gz: !binary |-
-    MWIyMDRjZDUxODBmMmFmYTQzMzZiNjU3YTJhZjcyM2U3MTAyZmIyYzNmMjM5
-    N2FlOGU1MmI5ODk1ODI3ZGMzMjk2YTNmYzdjNTdmZmFlMDZmYzU3NGRjMmZh
-    MTczZjQwYzdiNTY4NWY2YWY5OGMxMGEwYTNiZjIzNWVkNDI1YmI=
+  metadata.gz: d51710f175d77d528c12720bc1b3251f95f28c8b4f47292bfa66dc735b1b6f5c051532d4b50577dbe1566e91f5e7002fdfc005c9bc57f9b45e98f71be589d85b
+  data.tar.gz: fb3c50cb5f6832cc8bb9cbbd22b163ee89d5664c236a860ce05a0e446f13df8c569a9ae57f649af855ed8d26e5d5cd997ed421fc3c19c9f7214ccbb02e26fb54

data/CHANGELOG.md

@@ -4,17 +4,22 @@ Note: this log contains only changes from knife-ec2 release 0.8.0 and later
 -- it does not contain the changes from prior releases. To view change history
 prior to release 0.8.0, please visit the [source repository](https://github.com/opscode/knife-ec2/commits).
 
-## Unreleased changes
-None.
-
-## Latest release: 0.10.0
-* [Issue:#221](https://github.com/opscode/knife-ec2/issues/221) Use IAM role for credentials
+## Latest release: 0.11.0 (2015-05-21)
+* [knife-ec2:#293](https://github.com/chef/knife-ec2/pull/293) s3_source: Lazy load fog library
+* [knife-ec2:#284](https://github.com/chef/knife-ec2/pull/284) Enable Spot Pricing
+* [knife-ec2:#280](https://github.com/chef/knife-ec2/pull/280) Support for EBS volume encryption in knife-ec2 server create options
+* [knife-ec2:#273](https://github.com/chef/knife-ec2/pull/273) Remove -s option for data bag secret and subnets
+* [knife-ec2:#268](https://github.com/chef/knife-ec2/pull/268) Updated gemspec to use fog v1.25
+* [knife-ec2:#265](https://github.com/chef/knife-ec2/pull/265) showing error message for incorrect option input
+* [knife-ec2:#261](https://github.com/chef/knife-ec2/pull/261) Remove 'em-winrm' gem dependency
+
+## Release: 0.10.0.rc.1 (2014-10-08)
 * [Issue:#237](https://github.com/opscode/knife-ec2/issues/237) Provide a way to the validation key and data bag secret from S3
 * [Issue:#243](https://github.com/opscode/knife-ec2/issues/243) Support new AWS CLI configuration file format
 * Update `knife-windows` gem dependency to `knife-windows 0.8.rc.0` for improved Windows authentication integration
 * Update `fog` gem dependency to `fog 1.23.0`
 * Provisioned IOPS support via the `--provisioned-iops` and `--ebs-volume-type` options
-* [KNIFE-464](https://tickets.opscode.com/browse/KNIFE-466) Knife ec2 should use gateway from net::ssh config if available
+* [KNIFE-466](https://tickets.opscode.com/browse/KNIFE-466) Knife ec2 should use gateway from net::ssh config if available
 * [KNIFE-422](https://tickets.opscode.com/browse/KNIFE-422) Knife ec2 server create doesn't respect identity file of gateway server from ssh\_config
 
 ## Release: 0.8.0 (2014-03-10)

data/CONTRIBUTIONS.md

@@ -10,3 +10,4 @@ Example Contribution:
 * **johnbarney**: Added ability to use IAM role credentials
 * **mdellanoce**: Added ability to use SSH config (KNIFE-466)
 * **victorlin**: Added ability to pass identify file for SSH Gateway on the command line (KNIFE-422)
+* **erikfrey**: Support Spot Instances

data/DOC_CHANGES.md

@@ -22,13 +22,8 @@ provisioned IOPS rate given as an argument to this option. It is only valid if
 the EBS volume type is `io1` as specified by the `--ebs-volume-type` option
 for this plugin.
 
-## Option `--use-iam-profile` for server create command
-This option allows the `knife-ec2 server create` command executing on an EC2 instance to use
-IAM role credentials available to the instance as the AWS credentials for
-creating new instances. Specify the IAM profile that the instance should use
-as an argument to this option.
-
 ## Use of secret parameters from S3 for `server create` command
+
 The options below allow some secrets used with the `knife ec2 server create`
 command to be specified as URL's. Examples are also given in the README.md.
 
@@ -52,5 +47,9 @@ for complex command line invocations.
 You can pass an SSH key to be used for authenticating to the SSH Gateway with
 the --ssh-gateway-identity option.
 
+## Support Spot Instances
+You can now request a spot instance at a specific price.
 
-   
+### Option `--spot-price`
+This option allows the maximum desired spot price to be specified. It takes a
+price in US dollars.

data/README.md

@@ -12,6 +12,8 @@ This is the official Chef Knife plugin for EC2. This plugin gives knife the abil
 * IRC: `#chef` and `#chef-hacking` on Freenode
 * Mailing list: <http://lists.opscode.com>
 
+Note: Documentation needs to be updated in chef docs
+
 Installation
 ------------
 If you're using bundler, simply add Chef and Knife EC2 to your `Gemfile`:
@@ -60,7 +62,7 @@ you already have a file with these keys somewhere in this format:
 
     AWSAccessKeyId=Your AWS Access Key ID
     AWSSecretKey=Your AWS Secret Access Key
-        
+
 
 The new config file format used by Amazon's command line tools is also supported:
 
@@ -71,7 +73,7 @@ The new config file format used by Amazon's command line tools is also supported
 In this case, you can point the <tt>aws_credential_file</tt> option to
 this file in your <tt>knife.rb</tt> file, like so:
 
-```ruby        
+```ruby
 knife[:aws_credential_file] = "/path/to/credentials/file/in/above/format"
 ```
 
@@ -131,7 +133,8 @@ Provisions a new server in the Amazon EC2 and then perform a Chef bootstrap
     knife ec2 server create -I ami-d0f89fb9 --ssh-key your-public-key-id -f m1.medium --ssh-user ubuntu --identity-file ~/.ssh/your-private-key
 
     # A Windows instance via the WinRM protocol -- --ssh-key is still required due to EC2 API operations that need it to grant access to the Windows instance
-    knife ec2 server create -I ami-173d747e -G windows -f m1.medium --user-data ~/your-user-data-file -x '.\a_local_user' -P 'yourpassword' --ssh-key your-public-key-id
+    # `--spot-price` option lets you specify the spot pricing
+    knife ec2 server create -I ami-173d747e -G windows -f m1.medium --user-data ~/your-user-data-file -x '.\a_local_user' -P 'yourpassword' --ssh-key your-public-key-id --spot-price price-in-USD
 
 View additional information on configuring Windows images for bootstrap in the documentation for [knife-windows](http://docs.opscode.com/plugin_knife_windows.html).
 
@@ -141,13 +144,6 @@ Deletes an existing server in the currently configured AWS account. **By default
 #### `knife ec2 server list`
 Outputs a list of all servers in the currently configured AWS account. **Note, this shows all instances associated with the account, some of which may not be currently managed by the Chef server.**
 
-#### `knife ec2 instance data`
-Generates instance metadata in meant to be used with Opscode's custom AMIs. This will read your knife configuration `~/.chef/knife.rb` for the validation certificate and Chef server URL to use and output in JSON format. The subcommand also accepts a list of roles/recipes that will be in the node's initial run list.
-
-**Note**: 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 `knife ec2 server create` 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/EC2+Bootstrap+Fast+Start+Guide).
-
 License and Authors
 -------------------
 - Author:: Adam Jacob (<adam@getchef.com>)

data/RELEASE_NOTES.md

@@ -6,16 +6,11 @@ Example Note:
 ## Example Heading
 Details about the thing that changed that needs to get included in the Release Notes in markdown.
 -->
-# knife-ec2 0.10.rc.1 release notes:
-This release of `knife-ec2` adds improvements around ssh configuration and EC2
-IOPS provisioning. There is also a dependency update for the `fog` and `knife-windows` gems
-to improve support for additional EC2 capabilities and Windows authentication
-enhancements respectively.
+# knife-ec2 0.11.0 release notes:
+This release of `knife-ec2` adds features like spot pricing, EBS volume encryption support and some bug fixes. There is also a dependency update for the `fog` gem and 'em-winrm' dependency is removed.
 
-Our MVP for this release is **Michael Dellanoce**, who contributed improvements
-that allow re-use of your existing SSH configuration with knife-ec2,
-particularly useful when dealing with SSH gateways. Michael, thank you for
-taking the time to develop this feature.
+Special thanks go to contributors **Erik Frey** for addressing
+[knife-ec2:#94](https://github.com/chef/knife-ec2/pull/94) and **Igor Shpakov** for lazy loading fog library.
 
 See the [CHANGELOG](https://github.com/opscode/knife-ec2/blob/master/CHANGELOG.md) for a list of all changes in this release, and review
 [DOC_CHANGES.md](https://github.com/opscode/knife-ec2/blob/master/DOC_CHANGES.md) for relevant documentation updates.
@@ -24,21 +19,20 @@ Issues with `knife-ec2` should be reported in the issue system at
 https://github.com/opscode/knife-ec2/issues. Learn more about how you can
 contribute features and bug fixes to `knife-ec2` at https://github.com/opscode/knife-ec2/blob/master/CONTRIBUTING.md.
 
-## Features added in knife-ec2 0.10.0
+## Features added in knife-ec2 0.11.0
 
-* Ability to specify validation key and data bag secrets via an S3 bucket
-* Support for new AWS client configuration
+* Support for Spot Instances (from Erik Frey)
+* Lazy loading of fog library (from Igor Shpakov)
+* Support for EBS volume encryption in `knife-ec2 server create` options
 * Added ability to use IAM role credentials
-* Provisioned IOPS support
-* SSH workstation configuration integration (from Michael Dellanoce and Victor Lin)
 
 ## knife-ec2 on RubyGems and Github
 https://rubygems.org/gems/knife-ec2
 https://github.com/opscode/knife-ec2
 
-## Issues fixed in knife-ec2 0.10.0
+## Issues fixed in knife-ec2 0.11.0
 
-* Update `knife-windows` gem dependency to `knife-windows 0.8.0` for improved Windows authentication integration
-* Update `fog` gem dependency to `fog 1.23.0`
-* [KNIFE-464](https://tickets.opscode.com/browse/KNIFE-466) Knife ec2 should use gateway from net::ssh config if available
-* [KNIFE-422](https://tickets.opscode.com/browse/KNIFE-422) Knife ec2 server create doesn't respect identity file of gateway server from ssh\_config
+* Update `fog` gem dependency to `fog v1.25`
+* Remove 'em-winrm' gem dependency
+* [knife-ec2:#273](https://github.com/chef/knife-ec2/pull/273) Remove -s option for data bag secret and subnets
+* [knife-ec2:#265](https://github.com/chef/knife-ec2/pull/265) showing error message for incorrect option input

data/knife-ec2.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   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',           '~> 1.23.0'
+  s.add_dependency 'fog',           '~> 1.25.0'
   s.add_dependency 'knife-windows', '>= 0.8.2'
 
   s.add_development_dependency 'mixlib-config', '~> 2.0'
-  s.add_development_dependency 'chef',          '>= 11.16.2'
+  s.add_development_dependency 'chef',          '>= 11.16.2', '< 12'
   s.add_development_dependency 'rspec',         '~> 2.14'
   s.add_development_dependency 'rake',          '~> 10.1'
   s.add_development_dependency 'sdoc',          '~> 0.3'

data/lib/chef/knife/ec2_server_create.rb

@@ -187,7 +187,6 @@ class Chef
         :proc => lambda { |o| o.split(/[\s,]+/) }
 
       option :secret,
-        :short => "-s SECRET",
         :long => "--secret ",
         :description => "The secret key to use to encrypt data bag item values",
         :proc => lambda { |s| Chef::Config[:knife][:secret] = s }
@@ -209,7 +208,6 @@ class Chef
         :proc => lambda { |o| JSON.parse(o) }
 
       option :subnet_id,
-        :short => "-s SUBNET-ID",
         :long => "--subnet SUBNET-ID",
         :description => "create node in this Virtual Private Cloud Subnet ID (implies VPC mode)",
         :proc => Proc.new { |key| Chef::Config[:knife][:subnet_id] = key }
@@ -293,6 +291,17 @@ class Chef
         :description => "Path to the validation key",
         :proc => proc { |m| Chef::Config[:validation_key_url] = m }
 
+      option :ebs_encrypted,
+        :long => "--ebs-encrypted",
+        :description => "Enables EBS volume encryption",
+        :boolean => true,
+        :default => false
+
+      option :spot_price,
+        :long => "--spot-price PRICE",
+        :description => "The maximum hourly USD price for the instance",
+        :default => nil
+
       def run
         $stdout.sync = true
 
@@ -303,7 +312,22 @@ class Chef
         # For VPC EIP assignment we need the allocation ID so fetch full EIP details
         elastic_ip = connection.addresses.detect{|addr| addr if addr.public_ip == requested_elastic_ip}
 
-        @server = connection.servers.create(create_server_def)
+        if locate_config_value(:spot_price)
+          spot_request = connection.spot_requests.create(create_server_def)
+          msg_pair("Spot Request ID", spot_request.id)
+          msg_pair("Spot Request Type", spot_request.request_type)
+          msg_pair("Spot Price", spot_request.price)
+          print ui.color("Waiting for Spot Request fulfillment:  ", :cyan)
+          spot_request.wait_for do
+            @spinner ||= %w{| / - \\}
+            print "\b" + @spinner.rotate!.first
+            ready?
+          end
+          puts("\n")
+          @server = connection.servers.get(spot_request.instance_id)
+        else
+          @server = connection.servers.create(create_server_def)
+        end
 
         hashed_tags={}
         tags.map{ |t| key,val=t.split('='); hashed_tags[key]=val} unless tags.nil?
@@ -429,6 +453,18 @@ class Chef
           msg_pair("Standard or Provisioned IOPS", device_map['volumeType'])
           msg_pair("IOPS rate", device_map['iops'])
 
+          print "\n#{ui.color("Block devices", :magenta)}\n"
+          print "#{ui.color("===========================", :magenta)}\n"
+          @server.block_device_mapping.each do |device_map|
+            msg_pair("Device Name", device_map['deviceName'])
+            msg_pair("Volume ID", device_map['volumeId'])
+            msg_pair("Delete on Terminate", device_map['deleteOnTermination'].to_s)
+            msg_pair("Standard or Provisioned IOPS", device_map['volumeType'])
+            msg_pair("IOPS rate", device_map['iops'])
+            print "\n"
+          end
+          print "#{ui.color("===========================", :magenta)}\n"
+
           if config[:ebs_size]
             if ami.block_device_mapping.first['volumeSize'].to_i < config[:ebs_size].to_i
               volume_too_large_warning = "#{config[:ebs_size]}GB " +
@@ -629,6 +665,27 @@ class Chef
           msg opt_parser
           exit 1
         end
+
+        if(config[:security_groups] && config[:security_groups].class == String)
+          ui.error("Invalid value type for knife[:security_groups] in knife configuration file (i.e knife.rb). Type should be array. e.g - knife[:security_groups] = ['sgroup1']")
+          exit 1
+        end
+
+        if(config[:security_group_ids] && config[:security_group_ids].class == String)
+          ui.error("Invalid value type for knife[:security_group_ids] in knife configuration file (i.e knife.rb). Type should be array. e.g - knife[:security_group_ids] = ['sgroup1']")
+          exit 1
+        end
+
+        if (locate_config_value(:ebs_encrypted) and !locate_config_value(:flavor))
+          ui.error("--ebs_encrypted option requires valid flavor to be specified.")
+          exit 1
+        elsif (locate_config_value(:ebs_encrypted) and ! %w(m3.medium  m3.large  m3.xlarge m3.2xlarge c4.large c4.xlarge
+                                           c4.2xlarge c4.4xlarge c4.8xlarge c3.large c3.xlarge c3.2xlarge
+                                           c3.4xlarge c3.8xlarge cr1.8xlarge r3.large r3.xlarge r3.2xlarge
+                                           r3.4xlarge r3.8xlarge i2.xlarge i2.2xlarge i2.4xlarge i2.8xlarge g2.2xlarge).include?(locate_config_value(:flavor)))
+          ui.error("--ebs_encrypted option is not supported for #{locate_config_value(:flavor)} flavor.")
+          exit 1
+        end
       end
 
       def tags
@@ -655,7 +712,8 @@ class Chef
           :security_group_ids => locate_config_value(: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)
+          :availability_zone => locate_config_value(:availability_zone),
+          :price => locate_config_value(:spot_price)
         }
         server_def[:subnet_id] = locate_config_value(:subnet_id) if vpc_mode?
         server_def[:private_ip_address] = locate_config_value(:private_ip_address) if vpc_mode?
@@ -679,7 +737,12 @@ class Chef
         end
 
         if ami.root_device_type == "ebs"
-          ami_map = ami.block_device_mapping.first
+          if locate_config_value(:ebs_encrypted)
+            ami_map = ami.block_device_mapping[1]
+          else
+            ami_map = ami.block_device_mapping.first
+          end
+
           ebs_size = begin
                        if config[:ebs_size]
                          Integer(config[:ebs_size]).to_s
@@ -716,6 +779,7 @@ class Chef
                'Ebs.VolumeType' => config[:ebs_volume_type],
              }]
           server_def[:block_device_mapping].first['Ebs.Iops'] = iops_rate unless iops_rate.empty?
+          server_def[:block_device_mapping].first['Ebs.Encrypted'] = true if locate_config_value(:ebs_encrypted)
         end
 
         (config[:ephemeral] || []).each_with_index do |device_name, i|
@@ -801,7 +865,7 @@ class Chef
         gw_user ||= ssh_gateway_config[:user]
 
         # Always use the gateway keys from the SSH Config
-        gateway_keys = ssh_gateway_config[:keys]        
+        gateway_keys = ssh_gateway_config[:keys]
 
         # Use the keys specificed on the command line if available (overrides SSH Config)
         if config[:ssh_gateway_identity]
@@ -835,7 +899,7 @@ class Chef
                                 if vpc_mode? && !config[:associate_public_ip]
                                   server.private_ip_address
                                 else
-                                  server.dns_name
+                                  server.dns_name || server.public_ip_address
                                 end
                               end
       end

data/lib/chef/knife/s3_source.rb

@@ -1,5 +1,3 @@
-require 'fog'
-
 class Chef
   class Knife
     class S3Source
@@ -30,6 +28,7 @@ class Chef
       end
 
       def fog
+        require 'fog' # lazy load the fog library to speed up the knife run
         @fog ||= Fog::Storage::AWS.new(
           aws_access_key_id: Chef::Config[:knife][:aws_access_key_id],
           aws_secret_access_key: Chef::Config[:knife][:aws_secret_access_key]

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "0.10.0"
+    VERSION = "0.11.0.rc.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/spec_helper.rb

@@ -2,13 +2,13 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'chef'
 require 'chef/knife/winrm_base'
 require 'chef/knife/ec2_server_create'
-require 'chef/knife/ec2_instance_data'
 require 'chef/knife/ec2_server_delete'
 require 'chef/knife/ec2_server_list'
 
 # Clear config between each example
 # to avoid dependencies between examples
 RSpec.configure do |c|
+  c.filter_run_excluding :exclude => true
   c.before(:each) do
     Chef::Config.reset
     Chef::Config[:knife] ={}

data/spec/unit/ec2_server_create_spec.rb

@@ -787,6 +787,13 @@ describe Chef::Knife::Ec2ServerCreate do
       server_def[:associate_public_ip].should == true
     end
 
+    it "sets the spot price" do
+      @knife_ec2_create.config[:spot_price] = '1.99'
+      server_def = @knife_ec2_create.create_server_def
+
+      server_def[:price].should == '1.99'
+    end
+
     context "when using ebs volume type and ebs provisioned iops rate options" do
       before do
         @knife_ec2_create.stub_chain(:ami, :root_device_type).and_return("ebs")
@@ -888,6 +895,7 @@ describe Chef::Knife::Ec2ServerCreate do
       Net::SSH::Config.stub(:for).and_return(:user => "darius")
       @knife_ec2_create.get_ssh_gateway_for(hostname).should be_nil
     end
+
   end
 
   describe "ssh_connect_host" do
@@ -895,7 +903,8 @@ describe Chef::Knife::Ec2ServerCreate do
       @new_ec2_server.stub(
         :dns_name => 'public_name',
         :private_ip_address => 'private_ip',
-        :custom => 'custom'
+        :custom => 'custom',
+        :public_ip_address => '111.111.111.111'
       )
       @knife_ec2_create.stub(:server => @new_ec2_server)
     end
@@ -906,6 +915,13 @@ describe Chef::Knife::Ec2ServerCreate do
       end
     end
 
+    describe "when dns name not exist" do
+      it 'should use public_ip_address ' do
+        @new_ec2_server.stub(:dns_name).and_return(nil)
+        @knife_ec2_create.ssh_connect_host.should == '111.111.111.111'
+      end
+    end
+
     describe "with vpc_mode?" do
       it 'should use private ip' do
         @knife_ec2_create.stub(:vpc_mode? => true)

data/spec/unit/s3_source_deps_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+#This spec can only be run separately from the rest due to inclusion of fog library in other specs.
+#rspec spec/unit/s3_source_deps_spec.rb
+
+describe 'Check Dependencies', :exclude => Object.constants.include?(:Fog) do
+  before(:each) do
+  end
+  it 'should not load fog by default' do
+    begin
+      Fog::Storage::AWS.new()
+    rescue Exception => e
+      expect(e).to be_a_kind_of(NameError)
+    end
+  end
+
+  it 'lazy loads fog' do
+    begin
+      Chef::Knife::S3Source.fetch('test')
+    rescue Exception => e
+      expect(e).to be_a_kind_of(ArgumentError)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0.rc.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -9,104 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.16.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.16.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 description: EC2 Support for Chef's Knife Command
@@ -117,8 +123,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTIONS.md
@@ -131,7 +137,6 @@ files:
 - 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
 - lib/chef/knife/ec2_server_list.rb
@@ -140,6 +145,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/ec2_server_create_spec.rb
 - spec/unit/ec2_server_delete_spec.rb
+- spec/unit/s3_source_deps_spec.rb
 - spec/unit/s3_source_spec.rb
 homepage: https://github.com/opscode/knife-ec2
 licenses:
@@ -151,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: EC2 Support for Chef's Knife Command
@@ -169,5 +175,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/ec2_server_create_spec.rb
 - spec/unit/ec2_server_delete_spec.rb
+- spec/unit/s3_source_deps_spec.rb
 - spec/unit/s3_source_spec.rb
-has_rdoc: 

data/lib/chef/knife/ec2_instance_data.rb

@@ -1,56 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 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'
-
-class Chef
-  class Knife
-    class Ec2InstanceData < Knife
-      
-      deps do
-        require 'chef/json_compat'
-      end
-
-      banner "knife ec2 instance data (options)"
-
-      option :edit,
-        :short => "-e",
-        :long => "--edit",
-        :description => "Edit the instance data"
-
-      option :run_list,
-        :short => "-r RUN_LIST",
-        :long => "--run-list RUN_LIST",
-        :description => "Comma separated list of roles/recipes to apply",
-        :proc => lambda { |o| o.split(/[\s,]+/) },
-        :default => []
-
-      def run
-        data = {
-          "chef_server" => Chef::Config[:chef_server_url],
-          "validation_client_name" => Chef::Config[:validation_client_name],
-          "validation_key" => IO.read(Chef::Config[:validation_key]),
-          "attributes" => { "run_list" => config[:run_list] }
-        }
-        data = edit_data(data) if config[:edit]
-        ui.output(data)
-      end
-    end
-  end
-end
-