rake_docker 0.23.0 → 0.24.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de502904698c71b14259c3d9ba227bc056ce6108c6da20943011f585c33b99e
-  data.tar.gz: 282797aa0d998ace0f984aabe225d6c9f7506da286d481f223ef66ff6e649602
+  metadata.gz: eefb362c6bf5ff46977457705c5b7b7a61af8b5c158c0c1657e22cdbe9d5927c
+  data.tar.gz: bcf827cb079c304dc563c28ea248af8c097eee78d7f9063b5fb48102a9dbc691
 SHA512:
-  metadata.gz: a0c8dc3dca487d758878423d4985cbf0fba6bb78c7c668e54b554eb9a44b54b1fc362c1fde2215311a8b94f3c83e82e7ac89081b2aec0e6753a0c64bc2a7ef8f
-  data.tar.gz: 953195aee0aff1f2a81eaa2784999c7af8ee1721fc856776475c5f93104fbacabb78b54a3407166ad7a6e3eb9b12debad79b02a7de82209ac320b2ea513b4749
+  metadata.gz: d445212ce34c610f2481d79fba5b2d73e8e820a7e1745f796087912174b2a3cd7f50dfe99401b56e7fc4225d7a556c8984cf985b79233a37fa005e0dfcaaa2f2
+  data.tar.gz: a6b2eccd2a8c8e4762cdfbf1d2ed50d6c6cd23ae6df53b07926ed38b0826d2661ffbe20eca1ebc2ec3683664b34d3eafc3f2ddee6676b0a17ca44046a1cb80bf

data/.circleci/config.yml

@@ -3,14 +3,14 @@ jobs:
   test:
     working_directory: ~/rake-docker
     docker:
-    - image: ruby:2.3.8
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/steps/test.sh
   prerelease:
     working_directory: ~/rake-docker
     docker:
-    - image: ruby:2.3.8
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh
@@ -21,7 +21,7 @@ jobs:
   release:
     working_directory: ~/rake-docker
     docker:
-    - image: ruby:2.3.8
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh

data/.gitignore

@@ -1,6 +1,7 @@
 ## Standard stuff:
 *.gem
 *.rbc
+/build
 /.config
 /coverage/
 /InstalledFiles

data/.ruby-version

@@ -1 +1 @@
-2.3.8
+2.6.0

data/Gemfile.lock

@@ -1,70 +1,72 @@
 PATH
   remote: .
   specs:
-    rake_docker (0.23.0)
+    rake_docker (0.24.0.pre.1)
       aws-sdk-ecr (~> 1.2)
       colored2 (~> 3.1)
       docker-api (~> 1.34)
+      rake_factory (~> 0.15)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-eventstream (1.0.2)
-    aws-partitions (1.144.0)
-    aws-sdk-core (3.47.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.267.0)
+    aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
-      http-2 (~> 0.10)
       jmespath (~> 1.0)
-    aws-sdk-ecr (1.12.0)
-      aws-sdk-core (~> 3, >= 3.47.0)
+    aws-sdk-ecr (1.24.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.62.0)
-    gem-release (2.0.1)
-    http-2 (0.10.1)
-    i18n (1.1.1)
+    excon (0.71.1)
+    gem-release (2.1.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.1.0)
+    json (2.3.0)
     memfs (1.0.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    rake (12.3.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    minitest (5.14.0)
+    multi_json (1.14.1)
+    rake (13.0.1)
+    rake_factory (0.15.0)
+      activesupport (~> 5.2)
+      rake (~> 13.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    simplecov (0.16.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -72,13 +74,13 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.2)
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   gem-release (~> 2.0)
   memfs (~> 1.0)
-  rake (~> 12.3)
+  rake (~> 13.0)
   rake_docker!
-  rspec (~> 3.8)
+  rspec (~> 3.9)
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/lib/rake_docker.rb

@@ -1,9 +1,12 @@
 require 'rake_docker/version'
+require 'rake_docker/output'
+require 'rake_docker/exceptions'
 require 'rake_docker/tasks'
+require 'rake_docker/task_sets'
 require 'rake_docker/authentication'
 
 module RakeDocker
-  def self.define_image_tasks(&block)
-    RakeDocker::Tasks::All.new(&block)
+  def self.define_image_tasks(opts = {}, &block)
+    RakeDocker::TaskSets::All.define(opts, &block)
   end
 end

data/lib/rake_docker/exceptions.rb

@@ -1,7 +1,4 @@
 module RakeDocker
-  class RequiredParameterUnset < ::StandardError
-  end
-
   class ImageNotFound < ::StandardError
   end
 end

data/lib/rake_docker/output.rb

@@ -0,0 +1,49 @@
+require 'json'
+require 'colored2'
+
+module RakeDocker
+  module Output
+    def self.parse(chunk)
+      chunk.each_line do |line|
+        yield self.parse_line(line)
+      end
+    end
+
+    def self.parse_line(line)
+      begin
+        json = JSON.parse(line.strip)
+      rescue JSON::ParserError
+        return line
+      end
+
+      # Skip progress and aux as they are covered by other status messages
+      return '' if json['progress'] && json['status']
+      return '' if json['aux']
+
+      # Return error flag as a second result
+      return [json['error'], true] if json['error']
+
+      return json['stream'] if json['stream']
+
+      if json['status']
+        if json['id']
+          return json['id'] + ': ' + json['status'] + "\n"
+        else
+          return json['status'] + "\n"
+        end
+      end
+
+      return line
+    end
+
+    def self.print(chunk)
+      self.parse(chunk) do |text, is_error|
+        if is_error
+          $stdout.print text.red + "\n"
+          raise text
+        end
+        $stdout.print text unless text.empty?
+      end
+    end
+  end
+end

data/lib/rake_docker/task_sets.rb

@@ -0,0 +1 @@
+require_relative 'task_sets/all'

data/lib/rake_docker/task_sets/all.rb

@@ -0,0 +1,41 @@
+require 'rake_factory'
+require 'docker'
+
+require_relative '../tasks'
+
+module RakeDocker
+  module TaskSets
+    class All < RakeFactory::TaskSet
+      prepend RakeFactory::Namespaceable
+
+      parameter :image_name, required: true
+      parameter :repository_name, required: true
+      parameter :repository_url, required: true
+
+      parameter :work_directory, required: true
+
+      parameter :copy_spec, default: []
+      parameter :create_spec, default: []
+
+      parameter :argument_names, default: []
+
+      parameter :tags, required: true
+
+      parameter :credentials
+
+      parameter :build_args
+
+      parameter :clean_task_name, default: :clean
+      parameter :prepare_task_name, default: :prepare
+      parameter :build_task_name, default: :build
+      parameter :tag_task_name, default: :tag
+      parameter :push_task_name, default: :push
+
+      task Tasks::Clean, name: ->(ts) { ts.clean_task_name }
+      task Tasks::Prepare, name: ->(ts) { ts.prepare_task_name }
+      task Tasks::Build, name: ->(ts) { ts.build_task_name }
+      task Tasks::Tag, name: ->(ts) { ts.tag_task_name }
+      task Tasks::Push, name: ->(ts) { ts.push_task_name }
+    end
+  end
+end

data/lib/rake_docker/tasks.rb

@@ -3,4 +3,3 @@ require_relative 'tasks/prepare'
 require_relative 'tasks/build'
 require_relative 'tasks/tag'
 require_relative 'tasks/push'
-require_relative 'tasks/all'

data/lib/rake_docker/tasks/build.rb

@@ -1,12 +1,19 @@
+require 'rake_factory'
 require 'docker'
-require_relative '../tasklib'
-require_relative '../../docker_output'
+
+require_relative '../output'
 
 module RakeDocker
   module Tasks
-    class Build < TaskLib
-      parameter :name, :default => :build
-      parameter :argument_names, :default => []
+    class Build < RakeFactory::Task
+      default_name :build
+      default_description ->(t) { "Build #{t.image_name} image" }
+      default_prerequisites ->(t) {
+        t.prepare_task_name ?
+            [Rake.application.current_scope
+                .path_with_task_name(t.prepare_task_name)] :
+            []
+      }
 
       parameter :image_name, :required => true
       parameter :repository_name, :required => true
@@ -17,49 +24,22 @@ module RakeDocker
 
       parameter :work_directory, :required => true
 
-      parameter :prepare_task, :default => :prepare
-
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        prerequisites = prepare_task ?
-            [scoped_task_name(prepare_task)] :
-            []
+      parameter :prepare_task_name, :default => :prepare
 
-        desc "Build #{image_name} image"
-        task name, argument_names => prerequisites do |_, args|
-          params = OpenStruct.new(
-              image_name: image_name,
-              repository_name: repository_name,
-              credentials: credentials,
-              work_directory: work_directory
-          )
+      action do |t|
+        Docker.authenticate!(t.credentials) if t.credentials
 
-          derived_credentials = credentials.respond_to?(:call) ?
-              credentials.call(*[args, params].slice(0, credentials.arity)) :
-              credentials
+        options = {t: t.repository_name}
+        options = options.merge(
+            buildargs: JSON.generate(t.build_args)) if t.build_args
 
-          Docker.authenticate!(derived_credentials) if derived_credentials
-
-          options = {t: repository_name}
-          options = options.merge(
-              buildargs: JSON.generate(build_args)) if build_args
-
-          Docker::Image.build_from_dir(
-              File.join(work_directory, image_name),
-              options) do |chunk|
-            DockerOutput.print chunk
-          end
+        Docker::Image.build_from_dir(
+            File.join(t.work_directory, t.image_name),
+            options
+        ) do |chunk|
+          Output.print chunk
         end
       end
-
-      private
-
-      def scoped_task_name(task_name)
-        Rake.application.current_scope.path_with_task_name(task_name)
-      end
     end
   end
 end

data/lib/rake_docker/tasks/clean.rb

@@ -1,22 +1,18 @@
-require_relative '../tasklib'
+require 'rake_factory'
 
 module RakeDocker
   module Tasks
-    class Clean < TaskLib
-      parameter :name, :default => :clean
+    class Clean < RakeFactory::Task
+      default_name :clean
+      default_description ->(t) {
+        "Clean #{t.image_name} image directory"
+      }
 
       parameter :image_name, :required => true
       parameter :work_directory, :required => true
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Clean #{image_name} image directory"
-        task name do
-          rm_rf File.join(work_directory, image_name)
-        end
+      action do |t|
+        rm_rf File.join(t.work_directory, t.image_name)
       end
     end
   end

data/lib/rake_docker/tasks/prepare.rb

@@ -1,9 +1,12 @@
-require_relative '../tasklib'
+require 'rake_factory'
 
 module RakeDocker
   module Tasks
-    class Prepare < TaskLib
-      parameter :name, :default => :prepare
+    class Prepare < RakeFactory::Task
+      default_name :prepare
+      default_description ->(t) {
+        "Prepare for build of #{t.image_name} image"
+      }
 
       parameter :image_name, :required => true
 
@@ -12,39 +15,32 @@ module RakeDocker
       parameter :copy_spec, :default => []
       parameter :create_spec, :default => []
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Prepare for build of #{image_name} image"
-        task name do
-          image_directory = File.join(work_directory, image_name)
-          mkdir_p image_directory
-
-          copy_spec.each do |entry|
-            from = entry.is_a?(Hash) ? entry[:from] : entry
-            to = entry.is_a?(Hash) ?
-                File.join(image_directory, entry[:to]) :
-                image_directory
-
-            if File.directory?(from)
-              mkdir_p to
-              cp_r from, to
-            else
-              cp from, to
-            end
+      action do |t|
+        image_directory = File.join(t.work_directory, t.image_name)
+        FileUtils.mkdir_p image_directory
+
+        t.copy_spec.each do |entry|
+          from = entry.is_a?(Hash) ? entry[:from] : entry
+          to = entry.is_a?(Hash) ?
+              File.join(image_directory, entry[:to]) :
+              image_directory
+
+          if File.directory?(from)
+            FileUtils.mkdir_p to
+            FileUtils.cp_r from, to
+          else
+            FileUtils.cp from, to
           end
+        end
 
-          create_spec.each do |entry|
-            content = entry[:content]
-            to = entry[:to]
-            file = File.join(image_directory, to)
+        t.create_spec.each do |entry|
+          content = entry[:content]
+          to = entry[:to]
+          file = File.join(image_directory, to)
 
-            mkdir_p(File.dirname(file))
-            File.open(file, 'w') do |f|
-              f.write(content)
-            end
+          FileUtils.mkdir_p(File.dirname(file))
+          File.open(file, 'w') do |f|
+            f.write(content)
           end
         end
       end

data/lib/rake_docker/tasks/push.rb

@@ -1,12 +1,13 @@
+require 'rake_factory'
 require 'docker'
-require 'ostruct'
-require_relative '../tasklib'
 
 module RakeDocker
   module Tasks
-    class Push < TaskLib
-      parameter :name, :default => :push
-      parameter :argument_names, :default => []
+    class Push < RakeFactory::Task
+      default_name :push
+      default_description ->(t) {
+        "Push #{t.image_name} image to repository"
+      }
 
       parameter :image_name, :required => true
       parameter :repository_url, :required => true
@@ -14,43 +15,19 @@ module RakeDocker
       parameter :credentials
       parameter :tags, :required => true
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Push #{image_name} image to repository"
-        task name, argument_names do |_, args|
-          params = OpenStruct.new(
-              image_name: image_name,
-              repository_url: repository_url,
-              credentials: credentials,
-              tag: tags
-          )
-
-          derived_repository_url = repository_url.respond_to?(:call) ?
-              repository_url.call(*[args, params].slice(0, repository_url.arity)) :
-              repository_url
-          derived_credentials = credentials.respond_to?(:call) ?
-              credentials.call(*[args, params].slice(0, credentials.arity)) :
-              credentials
-          derived_tags = tags.respond_to?(:call) ?
-              tags.call(*[args, params].slice(0, tags.arity)) :
-              tags
+      action do |t|
+        Docker.authenticate!(t.credentials) if t.credentials
 
-          Docker.authenticate!(derived_credentials) if derived_credentials
-
-          images = Docker::Image.all(filter: derived_repository_url)
-          if images.empty?
-            raise RakeDocker::ImageNotFound,
-                  "No image found for repository: '#{derived_repository_url}'"
-          end
+        images = Docker::Image.all(filter: t.repository_url)
+        if images.empty?
+          raise ImageNotFound,
+              "No image found for repository: '#{t.repository_url}'"
+        end
 
-          image = images.first
-          derived_tags.each do |tag|
-            image.push(nil, tag: tag) do |chunk|
-              DockerOutput.print chunk
-            end
+        image = images.first
+        t.tags.each do |tag|
+          image.push(nil, tag: tag) do |chunk|
+            Output.print chunk
           end
         end
       end

data/lib/rake_docker/tasks/tag.rb

@@ -1,12 +1,13 @@
+require 'rake_factory'
 require 'docker'
-require 'ostruct'
-require_relative '../tasklib'
 
 module RakeDocker
   module Tasks
-    class Tag < TaskLib
-      parameter :name, :default => :tag
-      parameter :argument_names, :default => []
+    class Tag < RakeFactory::Task
+      default_name :tag
+      default_description ->(t) {
+        "Tag #{t.image_name} image for repository"
+      }
 
       parameter :image_name, :required => true
       parameter :repository_name, :required => true
@@ -14,38 +15,19 @@ module RakeDocker
 
       parameter :tags, :required => true
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Tag #{image_name} image for repository"
-        task name, argument_names do |_, args|
-          params = OpenStruct.new(
-              image_name: image_name,
-              repository_name: repository_name
-          )
-
-          derived_repository_url = repository_url.respond_to?(:call) ?
-              repository_url.call(*[args, params].slice(0, repository_url.arity)) :
-              repository_url
-          derived_tags = tags.respond_to?(:call) ?
-              tags.call(*[args, params].slice(0, tags.arity)) :
-              tags
-
-          images = Docker::Image.all(filter: repository_name)
-          if images.empty?
-            raise RakeDocker::ImageNotFound,
-                  "No image found with name: '#{image_name}'"
-          end
+      action do |t|
+        images = Docker::Image.all(filter: t.repository_name)
+        if images.empty?
+          raise ImageNotFound,
+              "No image found with name: '#{t.image_name}'"
+        end
 
-          image = images.first
+        image = images.first
 
-          derived_tags.each do |tag|
-            image.tag(repo: derived_repository_url,
-                      tag: tag,
-                      force: true)
-          end
+        t.tags.each do |tag|
+          image.tag(repo: t.repository_url,
+              tag: tag,
+              force: true)
         end
       end
     end

data/lib/rake_docker/version.rb

@@ -1,3 +1,3 @@
 module RakeDocker
-  VERSION = '0.23.0'
+  VERSION = '0.24.0.pre.1'
 end

data/rake_docker.gemspec

@@ -21,15 +21,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3.8'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'docker-api', '~> 1.34'
+  spec.add_dependency 'rake_factory', '~> 0.15'
   spec.add_dependency 'aws-sdk-ecr', '~> 1.2'
   spec.add_dependency 'colored2', '~> 3.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'gem-release', '~> 2.0'
   spec.add_development_dependency 'activesupport', '~> 5.2'
   spec.add_development_dependency 'memfs', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_docker
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.34'
+- !ruby/object:Gem::Dependency
+  name: rake_factory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -185,14 +199,14 @@ files:
 - config/secrets/ci/ssh.public
 - config/secrets/rubygems/credentials
 - go
-- lib/docker_output.rb
 - lib/rake_docker.rb
 - lib/rake_docker/authentication.rb
 - lib/rake_docker/authentication/ecr.rb
 - lib/rake_docker/exceptions.rb
-- lib/rake_docker/tasklib.rb
+- lib/rake_docker/output.rb
+- lib/rake_docker/task_sets.rb
+- lib/rake_docker/task_sets/all.rb
 - lib/rake_docker/tasks.rb
-- lib/rake_docker/tasks/all.rb
 - lib/rake_docker/tasks/build.rb
 - lib/rake_docker/tasks/clean.rb
 - lib/rake_docker/tasks/prepare.rb
@@ -219,14 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks for managing images and containers.

data/lib/docker_output.rb

@@ -1,47 +0,0 @@
-require 'json'
-require 'colored2'
-
-module DockerOutput
-  def self.parse(chunk)
-    chunk.each_line do |line|
-      yield self.parse_line(line)
-    end
-  end
-
-  def self.parse_line(line)
-    begin
-      json = JSON.parse(line.strip)
-    rescue JSON::ParserError
-      return line
-    end
-
-    # Skip progress and aux as they are covered by other status messages
-    return '' if json['progress'] && json['status']
-    return '' if json['aux']
-
-    # Return error flag as a second result
-    return [json['error'], true] if json['error']
-
-    return json['stream'] if json['stream']
-
-    if json['status']
-      if json['id']
-        return json['id'] + ': ' + json['status'] + "\n"
-      else
-        return json['status'] + "\n"
-      end
-    end
-
-    return line # Nothing else matches
-  end
-
-  def self.print(chunk)
-    self.parse(chunk) do |text, is_error|
-      if is_error
-        $stdout.print text.red + "\n"
-        raise text
-      end
-      $stdout.print text unless text.empty?
-    end
-  end
-end

data/lib/rake_docker/tasklib.rb

@@ -1,98 +0,0 @@
-require 'rake/tasklib'
-require_relative 'exceptions'
-
-module RakeDocker
-  class TaskLib < ::Rake::TaskLib
-    class << self
-      def parameter_definitions
-        @parameter_definitions ||= {}
-      end
-
-      def parameter(name, options = {})
-        parameter_definition = ParameterDefinition.new(
-            name, options[:default], options[:required])
-        name = parameter_definition.name
-
-        attr_accessor(name)
-
-        parameter_definitions[name] = parameter_definition
-      end
-
-      def setup_defaults_for(instance)
-        parameter_definitions.values.each do |parameter_definition|
-          parameter_definition.apply_default_to(instance)
-        end
-      end
-
-      def check_required_for(instance)
-        dissatisfied = parameter_definitions.values.reject do |definition|
-          definition.satisfied_by?(instance)
-        end
-        unless dissatisfied.empty?
-          names = dissatisfied.map(&:name)
-          raise RequiredParameterUnset,
-                "Required parameter#{names.length > 1 ? 's' : ''} #{names.join(',')} unset."
-        end
-      end
-    end
-
-    def initialize(*args, &block)
-      setup_defaults
-      process_arguments(args)
-      process_block(block)
-      check_required
-      define
-    end
-
-    def setup_defaults
-      self.class.setup_defaults_for(self)
-    end
-
-    def process_arguments(_)
-    end
-
-    def process_block(block)
-      block.call(self) if block
-    end
-
-    def check_required
-      self.class.check_required_for(self)
-    end
-
-    def define
-    end
-
-    private
-
-    class ParameterDefinition
-      attr_reader :name
-
-      def initialize(name, default = nil, required = false)
-        @name = name.to_sym
-        @default = default
-        @required = required
-      end
-
-      def writer_method
-        "#{name}="
-      end
-
-      def reader_method
-        name
-      end
-
-      def apply_default_to(instance)
-        instance.__send__(writer_method, @default) if @default
-      end
-
-      def dissatisfied_by?(instance)
-        value = instance.__send__(reader_method)
-        @required && value.nil?
-      end
-
-      def satisfied_by?(instance)
-        !dissatisfied_by?(instance)
-      end
-    end
-  end
-end

data/lib/rake_docker/tasks/all.rb

@@ -1,93 +0,0 @@
-require 'docker'
-require_relative 'clean'
-require_relative 'prepare'
-require_relative 'build'
-require_relative 'tag'
-require_relative 'push'
-require_relative '../tasklib'
-
-module RakeDocker
-  module Tasks
-    class All < TaskLib
-      parameter :containing_namespace
-
-      parameter :image_name, :required => true
-      parameter :repository_name, :required => true
-      parameter :repository_url, :required => true
-
-      parameter :work_directory, :required => true
-
-      parameter :copy_spec, :default => []
-      parameter :create_spec, :default => []
-
-      parameter :argument_names, :default => []
-
-      parameter :tags, :required => true
-
-      parameter :credentials
-
-      parameter :build_args
-
-      parameter :clean_task_name, :default => :clean
-      parameter :prepare_task_name, :default => :prepare
-      parameter :build_task_name, :default => :build
-      parameter :tag_task_name, :default => :tag
-      parameter :push_task_name, :default => :push
-
-      alias namespace= containing_namespace=
-
-      def define
-        if containing_namespace
-          namespace containing_namespace do
-            define_tasks
-          end
-        else
-          define_tasks
-        end
-      end
-
-      private
-
-      def define_tasks
-        Clean.new do |t|
-          t.name = clean_task_name
-          t.image_name = image_name
-          t.work_directory = work_directory
-        end
-        Prepare.new do |t|
-          t.name = prepare_task_name
-          t.image_name = image_name
-          t.work_directory = work_directory
-          t.copy_spec = copy_spec
-          t.create_spec = create_spec
-        end
-        Build.new  do |t|
-          t.name = build_task_name
-          t.argument_names = argument_names
-          t.image_name = image_name
-          t.repository_name = repository_name
-          t.work_directory = work_directory
-          t.build_args = build_args
-          t.credentials = credentials
-          t.prepare_task = prepare_task_name
-        end
-        Tag.new do |t|
-          t.name = tag_task_name
-          t.argument_names = argument_names
-          t.image_name = image_name
-          t.repository_name = repository_name
-          t.repository_url = repository_url
-          t.tags = tags
-        end
-        Push.new do |t|
-          t.name = push_task_name
-          t.argument_names = argument_names
-          t.image_name = image_name
-          t.repository_url = repository_url
-          t.tags = tags
-          t.credentials = credentials
-        end
-      end
-    end
-  end
-end