knife-ec2 0.11.0.rc.0 → 0.11.0

data/spec/unit/ec2_server_delete_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::Ec2ServerDelete do
     before(:each) do
       {
         :image => 'image',
-        :aws_ssh_key_id => 'aws_ssh_key_id',
+        :ssh_key_name => 'ssh_key_name',
         :aws_access_key_id => 'aws_access_key_id',
         :aws_secret_access_key => 'aws_secret_access_key'
       }.each do |key, value|
@@ -40,98 +40,100 @@ describe Chef::Knife::Ec2ServerDelete do
                              :groups => ['group1', 'group2'],
                              :security_group_ids => ['sg-00aa11bb'],
                              :dns_name => 'ec2-75.101.253.10.compute-1.amazonaws.com',
-                             :iam_instance_profile => {}, 
+                             :iam_instance_profile => {},
                              :public_ip_address => '75.101.253.10',
                              :private_dns_name => 'ip-10-251-75-20.ec2.internal',
                              :private_ip_address => '10.251.75.20',
-                             :root_device_type => 'not_ebs' }
+                             :root_device_type => 'not_ebs',
+                             :tags => {'Name' => 'foo'}
+                            }
         @knife_ec2_delete = Chef::Knife::Ec2ServerDelete.new
         @ec2_servers = double()
-        @knife_ec2_delete.ui.stub(:confirm)
-        @knife_ec2_delete.stub(:msg_pair)
+        allow(@knife_ec2_delete.ui).to receive(:confirm)
+        allow(@knife_ec2_delete).to receive(:msg_pair)
         @ec2_server = double(@ec2_server_attribs)
         @ec2_connection = double(Fog::Compute::AWS)
-        @ec2_connection.stub(:servers).and_return(@ec2_servers)
-        @knife_ec2_delete.ui.stub(:warn)
+        allow(@ec2_connection).to receive(:servers).and_return(@ec2_servers)
+        allow(@knife_ec2_delete.ui).to receive(:warn)
       end
 
     it "should invoke validate!" do
       knife_ec2_delete = Chef::Knife::Ec2ServerDelete.new
-      knife_ec2_delete.should_receive(:validate!)
+      expect(knife_ec2_delete).to receive(:validate!)
       knife_ec2_delete.run
     end
 
     it "should use invoke fog api to delete instance if instance id is passed" do
-      @ec2_servers.should_receive(:get).with('foo').and_return(@ec2_server)
-      Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
+      expect(@ec2_servers).to receive(:get).with('foo').and_return(@ec2_server)
+      expect(Fog::Compute::AWS).to receive(:new).and_return(@ec2_connection)
       @knife_ec2_delete.name_args = ['foo']
-      @knife_ec2_delete.should_receive(:validate!)
-      @ec2_server.should_receive(:destroy)
+      expect(@knife_ec2_delete).to receive(:validate!)
+      expect(@ec2_server).to receive(:destroy)
       @knife_ec2_delete.run
     end
 
     it "should use node_name to figure out instance id if not specified explicitly" do
-        @ec2_servers.should_receive(:get).with('foo').and_return(@ec2_server)
-        Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
-        @knife_ec2_delete.should_receive(:validate!)
-        @ec2_server.should_receive(:destroy)
+        expect(@ec2_servers).to receive(:get).with('foo').and_return(@ec2_server)
+        expect(Fog::Compute::AWS).to receive(:new).and_return(@ec2_connection)
+        expect(@knife_ec2_delete).to receive(:validate!)
+        expect(@ec2_server).to receive(:destroy)
         @knife_ec2_delete.config[:purge] = false
         @knife_ec2_delete.config[:chef_node_name] = 'baz'
         double_node = double(Chef::Node)
-        double_node.should_receive(:attribute?).with('ec2').and_return(true)
-        double_node.should_receive(:[]).with('ec2').and_return('instance_id'=>'foo')
+        expect(double_node).to receive(:attribute?).with('ec2').and_return(true)
+        expect(double_node).to receive(:[]).with('ec2').and_return('instance_id'=>'foo')
         double_search = double(Chef::Search::Query)
-        double_search.should_receive(:search).with(:node,"name:baz").and_return([[double_node],nil,nil])
-        Chef::Search::Query.should_receive(:new).and_return(double_search)
+        expect(double_search).to receive(:search).with(:node,"name:baz").and_return([[double_node],nil,nil])
+        expect(Chef::Search::Query).to receive(:new).and_return(double_search)
         @knife_ec2_delete.name_args = []
         @knife_ec2_delete.run
     end
 
     describe "when --purge is passed" do
       it "should use the node name if its set" do
-        @ec2_servers.should_receive(:get).with('foo').and_return(@ec2_server)
-        Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
+        expect(@ec2_servers).to receive(:get).with('foo').and_return(@ec2_server)
+        expect(Fog::Compute::AWS).to receive(:new).and_return(@ec2_connection)
         @knife_ec2_delete.name_args = ['foo']
-        @knife_ec2_delete.should_receive(:validate!)
-        @ec2_server.should_receive(:destroy)
+        expect(@knife_ec2_delete).to receive(:validate!)
+        expect(@ec2_server).to receive(:destroy)
         @knife_ec2_delete.config[:purge] = true
         @knife_ec2_delete.config[:chef_node_name] = 'baz'
-        Chef::Node.should_receive(:load).with('baz').and_return(double(:destroy=>true))
-        Chef::ApiClient.should_receive(:load).with('baz').and_return(double(:destroy=>true))
+        expect(Chef::Node).to receive(:load).with('baz').and_return(double(:destroy=>true))
+        expect(Chef::ApiClient).to receive(:load).with('baz').and_return(double(:destroy=>true))
         @knife_ec2_delete.run
       end
 
       it "should search for the node name using the instance id when node name is not specified" do
-        @ec2_servers.should_receive(:get).with('i-foo').and_return(@ec2_server)
-        Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
+        expect(@ec2_servers).to receive(:get).with('i-foo').and_return(@ec2_server)
+        expect(Fog::Compute::AWS).to receive(:new).and_return(@ec2_connection)
         @knife_ec2_delete.name_args = ['i-foo']
-        @knife_ec2_delete.should_receive(:validate!)
-        @ec2_server.should_receive(:destroy)
+        expect(@knife_ec2_delete).to receive(:validate!)
+        expect(@ec2_server).to receive(:destroy)
         @knife_ec2_delete.config[:purge] = true
         @knife_ec2_delete.config[:chef_node_name] = nil
         double_search = double(Chef::Search::Query)
         double_node = double(Chef::Node)
-        double_node.should_receive(:name).and_return("baz")
-        Chef::Node.should_receive(:load).with('baz').and_return(double(:destroy=>true))
-        Chef::ApiClient.should_receive(:load).with('baz').and_return(double(:destroy=>true))
-        double_search.should_receive(:search).with(:node,"ec2_instance_id:i-foo").and_return([[double_node],nil,nil])
-        Chef::Search::Query.should_receive(:new).and_return(double_search)
+        expect(double_node).to receive(:name).and_return("baz")
+        expect(Chef::Node).to receive(:load).with('baz').and_return(double(:destroy=>true))
+        expect(Chef::ApiClient).to receive(:load).with('baz').and_return(double(:destroy=>true))
+        expect(double_search).to receive(:search).with(:node,"ec2_instance_id:i-foo").and_return([[double_node],nil,nil])
+        expect(Chef::Search::Query).to receive(:new).and_return(double_search)
         @knife_ec2_delete.run
       end
 
       it "should use  the instance id if search does not return anything" do
-        @ec2_servers.should_receive(:get).with('i-foo').and_return(@ec2_server)
-        Fog::Compute::AWS.should_receive(:new).and_return(@ec2_connection)
+        expect(@ec2_servers).to receive(:get).with('i-foo').and_return(@ec2_server)
+        expect(Fog::Compute::AWS).to receive(:new).and_return(@ec2_connection)
         @knife_ec2_delete.name_args = ['i-foo']
-        @knife_ec2_delete.should_receive(:validate!)
-        @ec2_server.should_receive(:destroy)
+        expect(@knife_ec2_delete).to receive(:validate!)
+        expect(@ec2_server).to receive(:destroy)
         @knife_ec2_delete.config[:purge] = true
         @knife_ec2_delete.config[:chef_node_name] = nil
-        Chef::Node.should_receive(:load).with('i-foo').and_return(double(:destroy=>true))
-        Chef::ApiClient.should_receive(:load).with('i-foo').and_return(double(:destroy=>true))
+        expect(Chef::Node).to receive(:load).with('i-foo').and_return(double(:destroy=>true))
+        expect(Chef::ApiClient).to receive(:load).with('i-foo').and_return(double(:destroy=>true))
         double_search = double(Chef::Search::Query)
-        double_search.should_receive(:search).with(:node,"ec2_instance_id:i-foo").and_return([[],nil,nil])
-        Chef::Search::Query.should_receive(:new).and_return(double_search)
+        expect(double_search).to receive(:search).with(:node,"ec2_instance_id:i-foo").and_return([[],nil,nil])
+        expect(Chef::Search::Query).to receive(:new).and_return(double_search)
         @knife_ec2_delete.run
       end
     end

data/spec/unit/s3_source_spec.rb

@@ -3,8 +3,8 @@ require 'fog'
 
 describe Chef::Knife::S3Source do
   before(:each) do
-    @bucket_name = 'my.bucket'
-    @test_file_path = 'path/to/file.pem'
+    @bucket_name = 'mybucket'
+    @test_file_path = 'path/file.pem'
     @test_file_content = "TEST CONTENT\n"
 
     Fog.mock!
@@ -27,27 +27,49 @@ describe Chef::Knife::S3Source do
 
     @s3_connection = double(Fog::Storage::AWS)
     @s3_source = Chef::Knife::S3Source.new
-
-    @s3_source.url = "s3://#{@bucket_name}/#{@test_file_path}"
   end
 
-  it 'converts URI to path with leading / removed' do
-    @s3_source.instance_eval { path }
-    @s3_source.instance_eval { path }.should eq(@test_file_path)
-  end
+  context "for http URL format" do
+    it 'converts URI to path with leading / removed' do
+      @s3_source.url = "http://s3.amazonaws.com/#{@bucket_name}/#{@test_file_path}"
+      @s3_source.instance_eval { path }
+      expect(@s3_source.instance_eval { path }).to eq(@test_file_path)
+    end
 
-  it 'correctly retrieves the bucket name from the URI' do
-    @s3_source.instance_eval { bucket }
-    @s3_source.instance_eval { bucket }.should eq(@bucket_name)
-  end
+    it 'correctly retrieves the bucket name from the URI' do
+      @s3_source.url = "http://s3.amazonaws.com/#{@bucket_name}/#{@test_file_path}"
+      @s3_source.instance_eval { bucket }
+      expect(@s3_source.instance_eval { bucket }).to eq(@bucket_name)
+    end
+
+    it 'gets back the correct bucket contents' do
+      @s3_source.url = "http://s3.amazonaws.com/#{@bucket_name}/#{@test_file_path}"
+      expect(@s3_source.body).to eq(@test_file_content)
+    end
 
-  it 'gets back the correct bucket contents' do
-    @s3_source.body.should eq(@test_file_content)
+    it 'gets back a bucket object with bucket_obj' do
+      @s3_source.url = "http://s3.amazonaws.com/#{@bucket_name}/#{@test_file_path}"
+      @s3_source.instance_eval { bucket_obj }
+      expect(@s3_source.instance_eval { bucket_obj }).to be_kind_of(Fog::Storage::AWS::Directory)
+    end
   end
 
-  it 'gets back a bucket object with bucket_obj' do
-    @s3_source.instance_eval { bucket_obj }
-    @s3_source.instance_eval { bucket_obj }.should
-      be_kind_of(Fog::Storage::AWS::Directory)
+  context "for s3 URL format" do
+    it 'correctly retrieves the bucket name from the URI' do
+      @s3_source.url = "s3://#{@bucket_name}/#{@test_file_path}"
+      @s3_source.instance_eval { bucket }
+      expect(@s3_source.instance_eval { bucket }).to eq(@bucket_name)
+    end
+
+    it 'gets back the correct bucket contents' do
+      @s3_source.url = "s3://#{@bucket_name}/#{@test_file_path}"
+      expect(@s3_source.body).to eq(@test_file_content)
+    end
+
+    it 'gets back a bucket object with bucket_obj' do
+      @s3_source.url = "s3://#{@bucket_name}/#{@test_file_path}"
+      @s3_source.instance_eval { bucket_obj }
+      expect(@s3_source.instance_eval { bucket_obj }).to be_kind_of(Fog::Storage::AWS::Directory)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 0.11.0.rc.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.29.0
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
@@ -40,53 +40,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: chef
   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:
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.16.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: 12.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.16.2
-    - - "<"
+        version: '12.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: 12.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.4
@@ -177,3 +163,4 @@ test_files:
 - spec/unit/ec2_server_delete_spec.rb
 - spec/unit/s3_source_deps_spec.rb
 - spec/unit/s3_source_spec.rb
+has_rdoc: