dockly 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb949e588205c02f1c15dbc3b609b7d14e3fd24
-  data.tar.gz: 52ab9c8916b071f0035400ced4c4fd73cf407885
+  metadata.gz: 817b3a75ce89c73e9ad40e97913c7e694f6d5d39
+  data.tar.gz: 7a0a50ba3a0c833f77deefda46eace5917b0b1d2
 SHA512:
-  metadata.gz: e5ec4ce34a0bc5b270451dbd717988038a4ad3344e1a2f1d497a089cf287f3da1d8d3b940291575b8d69f75a9d00df685e36a1ec2cd9134e3d651d190f32dd75
-  data.tar.gz: 3400f1bf912778501d3b360d75a17d22e959ad68d1a5dee63bbfe9785d73bbb9a42fac4465486f8445469dbd6fd9f99b67c38be066edfd2f2dbd860d808d4ca9
+  metadata.gz: d3e29e2b40e5dede34e76d19a7635b2e8d051fc799b41961871a5fee4e2011c1616954518aef46cae0f591561452180816e786aa0a919a9b0713c9c94b6c61a3
+  data.tar.gz: d4f4dc7bd97cbca3071ef9099ae8150b77b826daa4ba62c999d88ddb15dd62f175523f0c802d0e949d361c933179c987cb887fe1066917a8ad10f9387ed5bbef

data/dockly.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'docker-api', '>= 1.14.0'
   gem.add_dependency 'dockly-util', '>= 0.0.9', '< 1.0'
   gem.add_dependency 'excon'
-  gem.add_dependency 'aws-sdk', '~> 2.0'
+  gem.add_dependency 'aws-sdk-core', '~> 3'
+  gem.add_dependency 'aws-sdk-s3', '~> 1'
+  gem.add_dependency 'aws-sdk-ecr', '~> 1'
   gem.add_dependency 'foreman'
   gem.add_dependency 'fpm', '~> 1.2.0'
   gem.add_dependency 'minigit', '~> 0.0.4'

data/lib/dockly.rb

@@ -4,7 +4,9 @@ require 'dockly/util/git'
 require 'foreman/cli_fix'
 require 'foreman/export/base_fix'
 require 'minigit'
-require 'aws-sdk'
+require 'aws-sdk-core'
+require 'aws-sdk-s3'
+require 'aws-sdk-ecr'
 require 'open3'
 
 module Dockly

data/lib/dockly/version.rb

@@ -1,6 +1,6 @@
 module Dockly
   MAJOR = 4
-  MINOR = 1
+  MINOR = 2
   PATCH = 0
   RELEASE = nil
 

data/spec/dockly/build_cache/base_spec.rb

@@ -14,8 +14,11 @@ describe Dockly::BuildCache::Base do
   describe '#up_to_date?' do
     context 'when the object exists in s3' do
       before do
-        allow(subject.connection)
-          .to receive(:head_object)
+        allow(Dockly)
+          .to receive(:s3)
+          .and_return(
+            Aws::S3::Client.new(stub_responses: true)
+          )
       end
 
       its(:up_to_date?) { should be_true }
@@ -23,9 +26,13 @@ describe Dockly::BuildCache::Base do
 
     context 'when the object does not exist in s3' do
       before do
-        allow(subject.connection)
-          .to receive(:head_object)
-          .and_raise(Aws::S3::Errors::NoSuchKey.new('Some Error', 500))
+        allow(Dockly)
+          .to receive(:s3)
+          .and_return(
+            Aws::S3::Client.new(
+              stub_responses: { :head_object => 'NoSuchKey' }
+            )
+          )
       end
 
       its(:up_to_date?) { should be_false }
@@ -37,9 +44,12 @@ describe Dockly::BuildCache::Base do
     let(:object) { double(:object) }
 
     before do
-      allow(subject.connection)
-        .to receive(:get_object)
-        .and_return(object)
+      allow(Dockly)
+        .to receive(:s3)
+        .and_return(Aws::S3::Client.new(
+          stub_responses: { :get_object => object }
+        ))
+
       allow(object)
         .to receive(:body)
         .and_return(StringIO.new('hey dad').tap(&:rewind))

data/spec/dockly/deb_spec.rb

@@ -205,14 +205,19 @@ describe Dockly::Deb do
         pre_install "ls"
         post_install "rd /s /q C:\*"
         build_dir 'build/deb/s3'
+        s3_bucket 'bucket'
       end
     end
 
     context 'when the object does exist' do
       before do
-        allow(Dockly.s3)
-          .to receive(:head_object)
-          .and_return({})
+        allow(Dockly)
+          .to receive(:s3)
+          .and_return(
+            Aws::S3::Client.new(
+              stub_responses: { :head_object => {} }
+            )
+          )
       end
 
       it 'is true' do
@@ -222,12 +227,16 @@ describe Dockly::Deb do
 
     context 'when the object does not exist' do
       before do
-        allow(Dockly.s3)
-          .to receive(:head_object)
-          .and_raise(StandardError.new('object does not exist'))
+        allow(Dockly)
+          .to receive(:s3)
+          .and_return(
+            Aws::S3::Client.new(
+              stub_responses: { :head_object => 'ObjectDoesNotExist' }
+            )
+          )
       end
 
-      it 'is true' do
+      it 'is false' do
         expect(subject.exists?).to be_false
       end
     end
@@ -267,12 +276,24 @@ describe Dockly::Deb do
       context 'when the package has been created' do
         before { subject.create_package! }
 
+        let(:client) do
+          client = Aws::S3::Client.new(stub_responses: true)
+          client.stub_responses(
+            :put_object, ->(context) do
+              expect(context.params[:bucket]).to eq(bucket_name)
+              expect(context.params[:key]).to eq(subject.s3_object_name)
+              expect(context.params).to have_key(:body)
+
+              {}
+            end
+          )
+          client
+        end
+
         it 'inserts the deb package into that bucket' do
-          expect(Dockly.s3).to receive(:put_object) do |hash|
-            expect(hash[:bucket]).to eq(bucket_name)
-            expect(hash[:key]).to eq(subject.s3_object_name)
-            expect(hash).to have_key(:body)
-          end
+          expect(Dockly)
+            .to receive(:s3)
+            .and_return(client)
 
           subject.upload_to_s3
         end

data/spec/dockly/docker_spec.rb

@@ -204,11 +204,15 @@ describe Dockly::Docker do
         let(:url) { 's3://bucket/object' }
         let(:data) { 'sweet, sweet data' }
 
+        let(:client) { double() }
+
         before do
-          allow(Dockly.s3)
+          allow(client)
             .to receive(:get_object)
-            .with(bucket: 'bucket', key: 'object')
+            .with(hash_including({ bucket: 'bucket', key: 'object' }))
             .and_yield(data)
+
+          allow(Dockly).to receive(:s3).and_return(client)
         end
 
         it 'pulls the file from S3' do

data/spec/dockly/rpm_spec.rb

@@ -11,6 +11,7 @@ describe Dockly::Rpm do
         pre_install "ls"
         post_install "rd /s /q C:\*"
         build_dir 'build'
+        s3_bucket 'bucket'
       end
     end
     let(:filename) { "build/rpm/my-sweet-rpm_77.0.8_x86_64.rpm" }
@@ -173,14 +174,17 @@ describe Dockly::Rpm do
         pre_install "ls"
         post_install "rd /s /q C:\*"
         build_dir 'build/rpm/s3'
+        s3_bucket 'bucket'
       end
     end
 
     context 'when the object does exist' do
       before do
-        allow(Dockly.s3)
-          .to receive(:head_object)
-          .and_return({})
+        allow(Dockly)
+          .to receive(:s3)
+          .and_return(
+            Aws::S3::Client.new(stub_responses: true)
+          )
       end
 
       it 'is true' do
@@ -190,9 +194,13 @@ describe Dockly::Rpm do
 
     context 'when the object does not exist' do
       before do
-        allow(Dockly.s3)
-          .to receive(:head_object)
-          .and_raise(StandardError.new('object does not exist'))
+        allow(Dockly)
+          .to receive(:s3)
+          .and_return(
+            Aws::S3::Client.new(
+              stub_responses: { :head_object => 'NoSuchKey' }
+            )
+          )
       end
 
       it 'is true' do
@@ -235,12 +243,24 @@ describe Dockly::Rpm do
       context 'when the package has been created' do
         before { subject.create_package! }
 
+        let(:client) do
+          client = Aws::S3::Client.new(stub_responses: true)
+          client.stub_responses(
+            :put_object, ->(context) do
+              expect(context.params[:bucket]).to eq(bucket_name)
+              expect(context.params[:key]).to eq(subject.s3_object_name)
+              expect(context.params).to have_key(:body)
+
+              {}
+            end
+          )
+          client
+        end
+
         it 'inserts the rpm package into that bucket' do
-          expect(Dockly.s3).to receive(:put_object) do |hash|
-            expect(hash[:bucket]).to eq(bucket_name)
-            expect(hash[:key]).to eq(subject.s3_object_name)
-            expect(hash).to have_key(:body)
-          end
+          expect(Dockly)
+            .to receive(:s3)
+            .and_return(client)
 
           subject.upload_to_s3
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -73,19 +73,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ecr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement