knife-ec2 0.12.0 → 0.13.0

data/spec/unit/s3_source_spec.rb

@@ -1,75 +1,75 @@
-require File.expand_path('../../spec_helper', __FILE__)
-require 'fog'
-
-describe Chef::Knife::S3Source do
-  before(:each) do
-    @bucket_name = 'mybucket'
-    @test_file_path = 'path/file.pem'
-    @test_file_content = "TEST CONTENT\n"
-
-    Fog.mock!
-
-    {
-      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
-
-    fog = Fog::Storage::AWS.new(
-      aws_access_key_id: 'aws_access_key_id',
-      aws_secret_access_key: 'aws_secret_access_key'
-    )
-    test_dir_obj = fog.directories.create('key' => @bucket_name)
-    test_file_obj = test_dir_obj.files.create('key' => @test_file_path)
-    test_file_obj.body = @test_file_content
-    test_file_obj.save
-
-    @s3_connection = double(Fog::Storage::AWS)
-    @s3_source = Chef::Knife::S3Source.new
-  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.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 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
-
-  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
+require File.expand_path('../../spec_helper', __FILE__)
+require 'fog/aws'
+
+describe Chef::Knife::S3Source do
+  before(:each) do
+    @bucket_name = 'mybucket'
+    @test_file_path = 'path/file.pem'
+    @test_file_content = "TEST CONTENT\n"
+
+    Fog.mock!
+
+    {
+      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
+
+    fog = Fog::Storage::AWS.new(
+      aws_access_key_id: 'aws_access_key_id',
+      aws_secret_access_key: 'aws_secret_access_key'
+    )
+    test_dir_obj = fog.directories.create('key' => @bucket_name)
+    test_file_obj = test_dir_obj.files.create('key' => @test_file_path)
+    test_file_obj.body = @test_file_content
+    test_file_obj.save
+
+    @s3_connection = double(Fog::Storage::AWS)
+    @s3_source = Chef::Knife::S3Source.new
+  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.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 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
+
+  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.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -9,22 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
@@ -103,8 +117,8 @@ dependencies:
         version: '0.3'
 description: EC2 Support for Chef's Knife Command
 email:
-- adam@opscode.com
-- schisamo@opscode.com
+- adam@chef.io
+- schisamo@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -131,9 +145,10 @@ files:
 - spec/spec_helper.rb
 - spec/unit/ec2_server_create_spec.rb
 - spec/unit/ec2_server_delete_spec.rb
+- spec/unit/ec2_server_list_spec.rb
 - spec/unit/s3_source_deps_spec.rb
 - spec/unit/s3_source_spec.rb
-homepage: https://github.com/opscode/knife-ec2
+homepage: https://github.com/chef/knife-ec2
 licenses:
 - Apache-2.0
 metadata: {}
@@ -153,14 +168,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: EC2 Support for Chef's Knife Command
-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
+test_files: []
 has_rdoc: