dockly 4.0.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cdd9e8a044854b4149effa288483edb90a66ee8f58d35108696f0abc3a21ed95
-  data.tar.gz: 8ee450caf29059b5c7a389683676953c02f3c497809eef2287648504d59c9023
+SHA1:
+  metadata.gz: 1d559fd7ce411c6076af71e0f8f4b6adef86d031
+  data.tar.gz: 03b47c8b32f2f8d3bb9ed086137cae8f866eb442
 SHA512:
-  metadata.gz: 2cf097573867f7c8ddafa597b0e0249780789fe098f6b4ffec3d48ae0b3dfc7cb6e48686214d846ab021c7cee5dec3bdd2c29f3423c1b82341d8173c2570fc05
-  data.tar.gz: 5bb556418f6b975bc1cd2dfffcb0117ee61379b6426be681a80961f4831976319f91fd78e0e81c94bcd4a5ce3a7a1bb093f39d77379b2bb1708d2da7e7cfbaae
+  metadata.gz: 314390a7a78bca39bbdfb10d2dc08e6b97e15b68629699a640d06dfe3f50873b516e5e4f6a144f2b4aa47c0034ca9ba6c90934eccaef840019690ed1f0fcaaeb
+  data.tar.gz: b930cbc3fe513907ef02e8f15437ef3288d3583bbd3fac5df10ae064b00bae4955efd3e9ddb5bd88cce5917df8ed7ca0e02c7a420b25b12817b9f58b07682c0f

data/.github/workflows/unit_test.yml

@@ -0,0 +1,32 @@
+name: Unit Tests
+on: [push, pull_request]
+jobs:
+  docker-rspec:
+    runs-on:
+      - ubuntu-18.04
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 2.6
+          - 2.5
+          - 2.4
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: install bundler
+        run: |
+          gem install bundler -v '~> 1.17.3'
+          bundle update
+      - name: install rpm
+        run: |
+          set -x
+          sudo apt-get update -y
+          sudo apt-get install -y rpm
+      - name: spec tests
+        run: CI=true bundle exec rake

data/README.md

@@ -1,8 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/dockly.png)](http://badge.fury.io/rb/dockly)
-[![Build Status](https://travis-ci.org/swipely/dockly.png?branch=refactor_setup)](https://travis-ci.org/swipely/dockly)
-[![Dependency Status](https://gemnasium.com/swipely/dockly.png)](https://gemnasium.com/swipely/dockly)
 
-![Dockly](https://raw.github.com/swipely/dockly/master/img/dockly.png)
+![Dockly](https://raw.github.com/upserve/dockly/master/img/dockly.png)
 ======================================================================
 
 `dockly` is a gem made to ease the pain of packaging an application. For this gem to be useful, you will want to use [Docker](http://docker.io) for process isolation.
@@ -180,7 +178,7 @@ In addition to the above attributes, `docker` has the following references:
     - class: `Dockly::Docker::ECR`
     - description: an AWS ECR Docker registry to push to in lieu of exporting as a tar -- the registry will be automatically pulled upon installing the package
 
-Need finer control of Docker packages? We also wrote [docker-api](https://github.com/swipely/docker-api).
+Need finer control of Docker packages? We also wrote [docker-api](https://github.com/upserve/docker-api).
 
 `registry`
 --------

data/dockly.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = %w{tomhulihan@swipely.com bright@swipely.com toddlunter@swipely.com}
   gem.description   = %q{Packaging made easy}
   gem.summary       = %q{Packaging made easy}
-  gem.homepage      = "https://github.com/swipely/dockly"
+  gem.homepage      = "https://github.com/upserve/dockly"
   gem.files         = `git ls-files`.split($\)
   gem.license       = 'MIT'
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -14,13 +14,15 @@ Gem::Specification.new do |gem|
   gem.name          = "dockly"
   gem.require_paths = %w{lib}
   gem.version       = Dockly::VERSION
-  gem.add_dependency 'clamp', '~> 0.6'
+  gem.add_dependency 'clamp', '~> 1'
   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 'fpm', '~> 1.2'
   gem.add_dependency 'minigit', '~> 0.0.4'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'

data/lib/dockly/bash_builder.rb

@@ -26,6 +26,6 @@ module Dockly
     generate_snippet_for :registry_import, [:repo, :tag], { :tag => "latest" }
     generate_snippet_for :auth_ecr, [:server_address]
 
-    generate_snippet_for :docker_tag_latest, [:repo, :tag]
+    generate_snippet_for :docker_tag_latest, [:repo, :tag, :new_name]
   end
 end

data/lib/dockly/deb.rb

@@ -226,12 +226,13 @@ private
         if registry.is_a?(Dockly::Docker::ECR)
           scripts << bb.auth_ecr(registry.server_address)
         end
+
         scripts << bb.registry_import(docker.repo, docker.tag)
+        scripts << bb.docker_tag_latest(docker.repo, docker.tag, docker.name)
       else
         scripts += collect_non_registry_scripts(bb)
       end
     end
-
     scripts.join("\n")
   end
 
@@ -252,7 +253,8 @@ private
         scripts << bb.s3_docker_import(docker.s3_url, docker.name, docker.tag)
       end
     end
-    scripts << bb.docker_tag_latest(docker.repo, docker.tag)
+
+    scripts << bb.docker_tag_latest(docker.repo, docker.tag, docker.repo)
   end
 
   def add_startup_script(package, startup_script = "dockly-startup.sh")

data/lib/dockly/docker.rb

@@ -339,7 +339,11 @@ class Dockly::Docker
 
     raise "Could not find image after authentication" if image.nil?
 
-    image.push(registry.to_h, :registry => registry.server_address)
+    image.push(registry.to_h, :registry => registry.server_address) do |resp|
+      if resp.include?('errorDetail')
+        raise "Error pushing to registry: #{resp}"
+      end
+    end
   end
 
   def fetch_import

data/lib/dockly/rpm.rb

@@ -31,5 +31,6 @@ private
     @deb_package.attributes[:rpm_user] = "root"
     @deb_package.attributes[:rpm_group] = "root"
     @deb_package.attributes[:rpm_os] = os
+    @deb_package.attributes[:workdir] = ::Dir.tmpdir
   end
 end

data/lib/dockly/version.rb

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

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/snippets/auth_ecr.erb

@@ -1,5 +1,8 @@
 auth_ecr() {
-  $(aws ecr get-login --region us-east-1 --no-include-email)
+  account_id=$(aws sts get-caller-identity --query Account --output text)
+  region="<%= ENV['AWS_REGION'] || 'us-east-1' %>"
+  aws ecr get-login-password --region $region | \
+    docker login --username AWS --password-stdin $account_id.dkr.ecr.$region.amazonaws.com
 }
 
 worked=1

data/snippets/docker_tag_latest.erb

@@ -1,3 +1,3 @@
 <% if data[:tag] %>
-docker tag <%= data[:repo] %>:<%= data[:tag] %> <%= data[:repo] %>:latest
+docker tag <%= data[:repo] %>:<%= data[:tag] %> <%= data[:new_name] %>:latest
 <% end %>

data/spec/dockly/bash_builder_spec.rb

@@ -32,8 +32,8 @@ describe Dockly::BashBuilder do
 
     context "when there is a tag" do
       it "tags the repo:tag as repo:latest" do
-        output = subject.docker_tag_latest("test_repo", "a_tag")
-        expect(output).to include("docker tag test_repo:a_tag test_repo:latest")
+        output = subject.docker_tag_latest("registry/test_repo", "a_tag", "test_repo")
+        expect(output).to include("docker tag registry/test_repo:a_tag test_repo:latest")
       end
     end
   end

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
@@ -313,6 +317,107 @@ describe Dockly::Docker do
     end
   end
 
+  describe '#push_to_registry', :docker do
+    let(:image) { Docker::Image.create('fromImage' => 'ubuntu:14.04') }
+    let(:ecr) { double(:ecr) }
+
+    context 'when there is no registry' do
+      it 'raises' do
+        expect(subject.registry).to eq(nil)
+
+        expect { subject.push_to_registry(image) }.to raise_error(/No registry/)
+      end
+    end
+
+    context 'when there is a registry' do
+      before do
+        subject.instance_variable_set(:"@ecr", ecr)
+
+        allow(ecr)
+          .to receive(:server_address)
+          .and_return('server_address')
+
+        expect(subject.registry).to eq(ecr)
+      end
+
+      context "that can't be authenticated to" do
+        before do
+          allow(ecr)
+            .to receive(:authenticate!)
+            .and_raise
+        end
+
+        it 'raises' do
+          expect { subject.push_to_registry(image) }
+            .to raise_error(StandardError)
+        end
+      end
+
+      context 'that can be authenticated to' do
+        before do
+          allow(ecr).to receive(:authenticate!)
+
+          allow(Docker::Image)
+            .to receive(:all)
+            .with(all: true)
+            .and_return(available_images)
+        end
+
+        context "but the image isn't found" do
+          let(:available_images) { [] }
+
+          it 'raises' do
+            expect { subject.push_to_registry(image) }
+              .to raise_error(/Could not find image after authentication/)
+          end
+        end
+
+        context 'and the image is found' do
+          let(:available_images) { [image] }
+
+          before do
+            allow(ecr)
+              .to receive(:to_h)
+              .and_return({})
+            allow(image)
+              .to receive(:push)
+              .and_yield(push_message)
+          end
+
+          context 'but the push to the registry fails' do
+            let(:push_message) do
+              <<-EOF
+                {"errorDetail":{"message":"name unknown: The repository with name 'repository'
+                does not exist in the registry with id 'accoundid'"},"error":"name unknown:
+                The repository with name 'repository' does not exist in the registry with id 'accountid'"}
+              EOF
+            end
+
+            it 'raises' do
+              expect { subject.push_to_registry(image) }
+                .to raise_error(/Error pushing to registry/)
+            end
+          end
+
+          context 'and the push to the registry succeeds' do
+            let(:push_message) do
+              <<-EOF
+                {"status":"Pushed","progressDetail":{},"id":"id"}
+                {"status":"sha: digest: digest size: 2048"}
+                {"progressDetail":{},"aux":{"Tag":"sha","Digest":"digest","Size":2048}}
+              EOF
+            end
+
+            it 'passes' do
+              expect(subject.push_to_registry(image))
+                .not_to raise_error
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe '#export_image_diff', :docker do
     let(:images) { [] }
     let(:output) { StringIO.new }

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.0.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Swipely, Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -106,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: minigit
   requirement: !ruby/object:Gem::Requirement
@@ -237,10 +265,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".cane"
+- ".github/workflows/unit_test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -307,11 +335,11 @@ files:
 - spec/fixtures/test-2.tar.gz
 - spec/fixtures/test-3.tar
 - spec/spec_helper.rb
-homepage: https://github.com/swipely/dockly
+homepage: https://github.com/upserve/dockly
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -326,8 +354,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Packaging made easy
 test_files:

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-script:
-  - git fetch --tags
-  - CI=true bundle exec rake
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq rpm
-  - gem install bundler -v 1.17.3