rake_docker 2.18.0.pre.3 → 2.18.0.pre.4

data/lib/rake_docker/output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'colored2'
 
@@ -5,45 +7,100 @@ module RakeDocker
   module Output
     def self.parse(chunk)
       chunk.each_line do |line|
-        yield self.parse_line(line)
+        yield 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']
+      json, error = try_parse_json(line)
+      return to_unparseable(line) if error
 
-      # Return error flag as a second result
-      return [json['error'], true] if json['error']
+      return to_skipped(json) if line_skippable?(json)
+      return to_error(json) if line_includes_error?(json)
+      return to_stream(json) if line_includes_stream?(json)
+      return to_status_with_id(json) if line_includes_status_and_id?(json)
+      return to_status(json) if line_includes_status?(json)
 
-      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
+      to_fallthrough(line)
+    end
 
-      return line
+    def self.try_parse_json(line)
+      [JSON.parse(line.strip), false]
+    rescue JSON::ParserError
+      [nil, true]
     end
 
     def self.print(chunk)
-      self.parse(chunk) do |text, is_error|
-        if is_error
-          $stdout.print text.red + "\n"
+      parse(chunk) do |text, error|
+        if error
+          $stdout.print "#{text.red}\n"
           raise text
         end
         $stdout.print text unless text.empty?
       end
     end
+
+    def self.line_includes_id?(json)
+      json['id']
+    end
+
+    def self.line_includes_status?(json)
+      json['status']
+    end
+
+    def self.line_includes_progress?(json)
+      json['progress']
+    end
+
+    def self.line_includes_aux?(json)
+      json['aux']
+    end
+
+    def self.line_includes_error?(json)
+      json['error']
+    end
+
+    def self.line_includes_stream?(json)
+      json['stream']
+    end
+
+    def self.line_includes_status_and_id?(json)
+      line_includes_status?(json) &&
+        line_includes_id?(json)
+    end
+
+    def self.line_skippable?(json)
+      (line_includes_status?(json) &&
+        line_includes_progress?(json)) ||
+        line_includes_aux?(json)
+    end
+
+    def self.to_unparseable(line)
+      [line, false]
+    end
+
+    def self.to_skipped(_)
+      ['', false]
+    end
+
+    def self.to_status_with_id(json)
+      ["#{json['id']}: #{json['status']}\n", false]
+    end
+
+    def self.to_status(json)
+      ["#{json['status']}\n", false]
+    end
+
+    def self.to_stream(json)
+      [json['stream'], false]
+    end
+
+    def self.to_error(json)
+      [json['error'], true]
+    end
+
+    def self.to_fallthrough(line)
+      [line, false]
+    end
   end
 end

data/lib/rake_docker/task_sets/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'docker'
 
@@ -17,7 +19,7 @@ module RakeDocker
       parameter :ready_check
 
       parameter :reporter,
-          default: RakeDocker::Container::PrintingReporter.new
+                default: RakeDocker::Container::PrintingReporter.new
 
       parameter :provision_task_name, default: :provision
       parameter :destroy_task_name, default: :destroy

data/lib/rake_docker/task_sets/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'docker'
 

data/lib/rake_docker/task_sets.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require_relative 'task_sets/image'
 require_relative 'task_sets/container'

data/lib/rake_docker/tasks/build.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'docker'
 
@@ -7,39 +9,44 @@ module RakeDocker
   module Tasks
     class Build < RakeFactory::Task
       default_name :build
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Build #{t.image_name} image"
-      }
-      default_prerequisites RakeFactory::DynamicValue.new { |t|
-        t.prepare_task_name ?
-            [Rake.application.current_scope
-                .path_with_task_name(t.prepare_task_name)] :
-            []
-      }
+      end)
+      default_prerequisites(RakeFactory::DynamicValue.new do |t|
+        if t.prepare_task_name
+          [Rake.application.current_scope
+               .path_with_task_name(t.prepare_task_name)]
+        else
+          []
+        end
+      end)
 
-      parameter :image_name, :required => true
-      parameter :repository_name, :required => true
+      parameter :image_name, required: true
+      parameter :repository_name, required: true
 
       parameter :credentials
 
       parameter :build_args
       parameter :platform
 
-      parameter :work_directory, :required => true
+      parameter :work_directory, required: true
 
       parameter :prepare_task_name, default: :prepare
 
       action do |t|
         Docker.authenticate!(t.credentials) if t.credentials
 
-        options = {t: t.repository_name}
-        options = options.merge(
-            buildargs: JSON.generate(t.build_args)) if t.build_args
+        options = { t: t.repository_name }
+        if t.build_args
+          options = options.merge(
+            buildargs: JSON.generate(t.build_args)
+          )
+        end
         options = options.merge(platform: t.platform) if t.platform
 
         Docker::Image.build_from_dir(
-            File.join(t.work_directory, t.image_name),
-            options
+          File.join(t.work_directory, t.image_name),
+          options
         ) do |chunk|
           Output.print chunk
         end

data/lib/rake_docker/tasks/clean.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeDocker
   module Tasks
     class Clean < RakeFactory::Task
       default_name :clean
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Clean #{t.image_name} image directory"
-      }
+      end)
 
-      parameter :image_name, :required => true
-      parameter :work_directory, :required => true
+      parameter :image_name, required: true
+      parameter :work_directory, required: true
 
       action do |t|
         rm_rf File.join(t.work_directory, t.image_name)

data/lib/rake_docker/tasks/destroy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 require_relative '../container'
@@ -6,19 +8,20 @@ module RakeDocker
   module Tasks
     class Destroy < RakeFactory::Task
       default_name :destroy
-      default_description RakeFactory::DynamicValue.new { |t|
-        "Destroy #{t.container_name ? "#{t.container_name} " : ""}container."
-      }
+      default_description(RakeFactory::DynamicValue.new do |t|
+        "Destroy #{t.container_name ? "#{t.container_name} " : ''}container."
+      end)
 
-      parameter :container_name, :required => true
+      parameter :container_name, required: true
 
       parameter :reporter, default: Container::PrintingReporter.new
 
       action do |t|
         puts "Destroying #{t.container_name} container"
         destroyer = Container::Destroyer.new(
-            t.container_name,
-            reporter: t.reporter)
+          t.container_name,
+          reporter: t.reporter
+        )
         destroyer.execute
       end
     end

data/lib/rake_docker/tasks/prepare.rb

@@ -1,29 +1,29 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeDocker
   module Tasks
     class Prepare < RakeFactory::Task
       default_name :prepare
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Prepare for build of #{t.image_name} image"
-      }
+      end)
 
-      parameter :image_name, :required => true
+      parameter :image_name, required: true
 
-      parameter :work_directory, :required => true
+      parameter :work_directory, required: true
 
-      parameter :copy_spec, :default => []
-      parameter :create_spec, :default => []
+      parameter :copy_spec, default: []
+      parameter :create_spec, default: []
 
       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
+          from = resolve_from(entry)
+          to = resolve_to(entry, image_directory)
 
           if File.directory?(from)
             FileUtils.mkdir_p(to)
@@ -45,6 +45,18 @@ module RakeDocker
           end
         end
       end
+
+      def resolve_from(entry)
+        entry.is_a?(Hash) ? entry[:from] : entry
+      end
+
+      def resolve_to(entry, image_directory)
+        if entry.is_a?(Hash)
+          File.join(image_directory, entry[:to])
+        else
+          image_directory
+        end
+      end
     end
   end
 end

data/lib/rake_docker/tasks/provision.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 require_relative '../container'
@@ -6,12 +8,12 @@ module RakeDocker
   module Tasks
     class Provision < RakeFactory::Task
       default_name :provision
-      default_description RakeFactory::DynamicValue.new { |t|
-        "Provision #{t.container_name ? "#{t.container_name} " : ""}container."
-      }
+      default_description(RakeFactory::DynamicValue.new do |t|
+        "Provision #{t.container_name ? "#{t.container_name} " : ''}container."
+      end)
 
-      parameter :container_name, :required => true
-      parameter :image, :required => true
+      parameter :container_name, required: true
+      parameter :image, required: true
       parameter :ports
       parameter :environment
 
@@ -22,12 +24,13 @@ module RakeDocker
       action do |t|
         puts "Provisioning #{t.container_name} container"
         provisioner = Container::Provisioner.new(
-            t.container_name,
-            t.image,
-            ports: t.ports,
-            environment: t.environment,
-            ready?: t.ready_check,
-            reporter: t.reporter)
+          t.container_name,
+          t.image,
+          ports: t.ports,
+          environment: t.environment,
+          ready?: t.ready_check,
+          reporter: t.reporter
+        )
         provisioner.execute
       end
     end

data/lib/rake_docker/tasks/publish.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeDocker
   module Tasks
     class Publish < RakeFactory::Task
       default_name :publish
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Publish #{t.image_name} image"
-      }
+      end)
 
       parameter :image_name
 

data/lib/rake_docker/tasks/push.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'docker'
 
@@ -5,15 +7,15 @@ module RakeDocker
   module Tasks
     class Push < RakeFactory::Task
       default_name :push
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Push #{t.image_name} image to repository"
-      }
+      end)
 
-      parameter :image_name, :required => true
-      parameter :repository_url, :required => true
+      parameter :image_name, required: true
+      parameter :repository_url, required: true
 
       parameter :credentials
-      parameter :tags, :required => true
+      parameter :tags, required: true
 
       action do |t|
         Docker.authenticate!(t.credentials) if t.credentials
@@ -21,7 +23,7 @@ module RakeDocker
         images = Docker::Image.all(filter: t.repository_url)
         if images.empty?
           raise ImageNotFound,
-              "No image found for repository: '#{t.repository_url}'"
+                "No image found for repository: '#{t.repository_url}'"
         end
 
         image = images.first

data/lib/rake_docker/tasks/tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'docker'
 
@@ -5,29 +7,29 @@ module RakeDocker
   module Tasks
     class Tag < RakeFactory::Task
       default_name :tag
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Tag #{t.image_name} image for repository"
-      }
+      end)
 
-      parameter :image_name, :required => true
-      parameter :repository_name, :required => true
-      parameter :repository_url, :required => true
+      parameter :image_name, required: true
+      parameter :repository_name, required: true
+      parameter :repository_url, required: true
 
-      parameter :tags, :required => true
+      parameter :tags, required: true
 
       action do |t|
         images = Docker::Image.all(filter: t.repository_name)
         if images.empty?
           raise ImageNotFound,
-              "No image found with name: '#{t.image_name}'"
+                "No image found with name: '#{t.image_name}'"
         end
 
         image = images.first
 
         t.tags.each do |tag|
           image.tag(repo: t.repository_url,
-              tag: tag,
-              force: true)
+                    tag: tag,
+                    force: true)
         end
       end
     end

data/lib/rake_docker/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'tasks/clean'
 require_relative 'tasks/prepare'
 require_relative 'tasks/build'

data/lib/rake_docker/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeDocker
-  VERSION = '2.18.0.pre.3'
+  VERSION = '2.18.0.pre.4'
 end

data/lib/rake_docker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_docker/version'
 require 'rake_docker/output'
 require 'rake_docker/container'

data/rake_docker.gemspec

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rake_docker/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  rake_docker.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'rake_docker'
+  spec.version = RakeDocker::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary = 'Rake tasks for managing images and containers.'
+  spec.description = 'Allows building, tagging and pushing images and '\
+                     'creating, starting, stopping and removing containers '\
+                     'from within rake tasks.'
+  spec.homepage = 'https://github.com/infrablocks/rake_docker'
+  spec.license = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\x0").select do |f|
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_dependency 'aws-sdk-ecr', '~> 1.2'
+  spec.add_dependency 'colored2', '~> 3.1'
+  spec.add_dependency 'docker-api', '>= 1.34', '< 3.0'
+  spec.add_dependency 'rake_factory', '~> 0.23'
+
+  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'memfs'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_github'
+  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_ssh'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
+
+  spec.metadata['rubygems_mfa_required'] = 'false'
+end