docker-template 0.8.0 → 0.10.0

data/lib/docker/template/cli/build.rb

@@ -1,29 +1,44 @@
+# Frozen-string-literal: true
+# Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
+# Encoding: utf-8
+
 module Docker
   module Template
     class CLI
       class Build
         def initialize(args, opts)
-          @opts = Metadata.new(opts || {})
+          @opts = Meta.new(opts || {})
           @repos = Parser.new(args, opts || {}).parse
           @args = args
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         def start
           _profile do
-            reselect_repos if @opts.diff?
+            changed! if @opts.diff?
+            exclude! if @opts.exclude?
             @repos.tap { |o| o.map(&:build) }.uniq(&:name).map(
               &:clean
             )
           end
         end
 
-        # --------------------------------------------------------------------
+        # --
+
+        def exclude!
+          Parser.new(@opts[:exclude].map { |v| v.split(/,\s*/) }.flatten.compact).parse.each do |repo|
+            @repos.delete_if do |v|
+              v.name == repo.name && v.tag == repo.tag
+            end
+          end
+        end
+
+        # --
         # rubocop:disable Metrics/AbcSize
-        # --------------------------------------------------------------------
+        # --
 
-        def reselect_repos
+        def changed!
           Template._require "rugged" do
             git = Rugged::Repository.new(Template.root.to_s)
             dir = Template.root.join(@opts.repos_dir)
@@ -43,9 +58,9 @@ module Docker
           end
         end
 
-        # --------------------------------------------------------------------
+        # --
         # rubocop:enable Metrics/AbcSize
-        # --------------------------------------------------------------------
+        # --
 
         private
         def _profile

data/lib/docker/template/cli/list.rb

@@ -6,13 +6,13 @@ module Docker
           return new.build
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         def initialize(images = Parser.new([], {}).parse)
           @images = images
         end
 
-        # ------------------------------------------------------------------------
+        # --
 
         def build
           out = ""
@@ -26,7 +26,7 @@ module Docker
           out
         end
 
-        # ------------------------------------------------------------------------
+        # --
 
         def repos(user, images)
           out = ""
@@ -42,7 +42,7 @@ module Docker
           out
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         def tags(user, name, images)
           out = ""
@@ -57,13 +57,13 @@ module Docker
           out
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         def remote_aliases(*args)
           out = ""
 
           remotes = _remote_aliases(*args).group_by do |image|
-            image.metadata[:aliases][
+            image.meta[:aliases][
               image.tag
             ]
           end
@@ -86,7 +86,7 @@ module Docker
           out
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         def _remote_aliases(user, name, images)
           images.select do |image|
@@ -96,7 +96,7 @@ module Docker
           end
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         def aliases(user, name, tag, images, depth: 0)
           out = ""
@@ -123,14 +123,14 @@ module Docker
           out
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         private
         def aliased_remote?(image)
           return image.alias? && !image.aliased
         end
 
-        # --------------------------------------------------------------------
+        # --
 
         private
         def _aliases(user, name, tag, images)

data/lib/docker/template/error.rb

@@ -1,8 +1,6 @@
-# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
-# ----------------------------------------------------------------------------
 
 module Docker
   module Template
@@ -11,17 +9,15 @@ module Docker
         StandardError
       )
 
-      # ----------------------------------------------------------------------
+      # --
 
-      class PlaceHolderError < StandardError
-        def initialize(error)
-          super format(
-            "PLACEHOLDER ERROR: %s", error
-          )
+      class UnsuccessfulAuth < StandardError
+        def initialize
+          super "Unable to authorize you to Dockerhub, something is wrong."
         end
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       class BadExitStatus < StandardError
         attr_reader :status
@@ -33,7 +29,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       class BadRepoName < StandardError
         def initialize(name)
@@ -43,18 +39,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
-
-      class InvalidRepoType < StandardError
-        def initialize(type)
-          build_types = Template.config.build_types.join(", ")
-          super "Uknown repo type given '#{type}' not in '#{
-            build_types
-          }'"
-        end
-      end
-
-      # ----------------------------------------------------------------------
+      # --
 
       class InvalidTargzFile < StandardError
         def initialize(tar_gz)
@@ -64,7 +49,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       class InvalidYAMLFile < StandardError
         def initialize(file)
@@ -72,23 +57,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
-
-      class NoRootMetadata < StandardError
-        def initialize
-          super "Metadata without the root flag must provide the root_metadata."
-        end
-      end
-
-      # ----------------------------------------------------------------------
-
-      class NoRootfsMkimg < StandardError
-        def initialize
-          super "Unable to find rootfs.rb in your repo folder."
-        end
-      end
-
-      # ----------------------------------------------------------------------
+      # --
 
       class NoSetupContext < StandardError
         def initialize
@@ -96,7 +65,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       class NotImplemented < StandardError
         def initialize
@@ -104,7 +73,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       class RepoNotFound < StandardError
         def initialize(repo = nil)
@@ -115,7 +84,7 @@ module Docker
         end
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       class ImageNotFound < StandardError
         def initialize(image)

data/lib/docker/template/logger.rb

@@ -1,19 +1,44 @@
-# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
-# ----------------------------------------------------------------------------
 
 module Docker
   module Template
     class Logger
-      def initialize(builder = nil)
-        @lines = { 0 => 0 }
-        @builder = \
-          builder
+      class << self
+        attr_writer :stdout, :stderr
+
+        # --
+
+        def stdout
+          return @stdout || $stdout
+        end
+
+        # --
+
+        def stderr
+          return @stderr || $stderr
+        end
       end
 
-      # ----------------------------------------------------------------------
+      # --
+
+      def initialize(repo = nil, stdout = nil, stderr = nil)
+        @stdout = stdout || self.class.stdout
+        @stderr = stderr || self.class.stderr
+        @repo   = repo
+        @lines  = {
+          0 => 0
+        }
+      end
+
+      # --
+
+      def output?
+        return !!@output
+      end
+
+      # --
 
       def increment
         @lines.update({
@@ -21,61 +46,84 @@ module Docker
         })
       end
 
-      # ----------------------------------------------------------------------
+      # --
       # A simple TTY stream that just prints out the data that it is given.
       # This is the logger that most will use for most of their building.
-      # ----------------------------------------------------------------------
+      # --
 
       def tty(stream)
-        $stdout.print stream
+        @output = true
+        @stdout.print(encode_str(
+          stream
+        ))
       end
 
-      # ----------------------------------------------------------------------
+      # --
       # A simple logger that accepts a multi-type stream.
-      # ----------------------------------------------------------------------
+      # --
 
       def simple(type, str)
-        type == :stderr ? $stderr.print(str) : $stdout.print(str)
+        str = encode_str(str ||= "")
+        type == :stderr ? @stderr.print(str) : \
+          @stdout.print(str)
       end
 
-      # ----------------------------------------------------------------------
+      # --
       # A more complex streamer designed for the actual output of the Docker.
-      # ----------------------------------------------------------------------
+      # --
+      # This method will save parts into a buffer until it can either parse
+      # that buffer or it parses the actual part itself, if it can parse the
+      # part itself, it will first dump the buffer as errors and then parse.
+      # --
+      # This method has to buffer because Docker-API (or Excon, it's depend)
+      # gives us no indication of whether or not this is part of a larger chunk
+      # it just dumps it on us, so we have to blindly work around that.
+      # --
+
+      def api(part, *args)
+        part = encode_str(part)
+        chunked_part = @chunks.push(part).join if @chunks && !@chunks.empty?
+        chunked_part = part if !@chunks
+        stream = JSON.parse(
+          chunked_part
+        )
 
-      def api(part, *_)
-        stream = JSON.parse(part)
-        retried ||= false
+        if chunked_part == part && @chunks && !@chunks.empty?
+          then @chunks.each do |chunk|
+            @stderr.puts format("Unparsable JSON: %s",
+              chunk
+            )
+          end
+        end
 
+        @chunks = nil
         return progress_bar(stream) if stream.any_key?("progress", "progressDetail")
         return output(stream["status"] || stream["stream"]) if stream.any_key?("status", "stream")
         return progress_error(stream) if stream.any_key?("errorDetail", "error")
-
         warn Simple::Ansi.red("Unhandled Stream.")
-        $stdout.puts(
+        @stdout.puts(
           part
         )
 
-      # Addresses a Docker 1.9 bug.
+        @output = true
       rescue JSON::ParserError => e
-        if !retried
-          retried = true
-          part = "#{part}\" }"
-          retry
-        else
-          raise e
-        end
+        (@chunks ||= []).push(
+          part
+        )
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       def output(msg)
         unless filter_matches?(msg)
-          $stdout.puts msg
+          @stdout.puts msg
           increment
         end
+
+        @output = true
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       def progress_error(stream)
         abort Object::Simple::Ansi.red(
@@ -83,7 +131,20 @@ module Docker
         )
       end
 
-      # ----------------------------------------------------------------------
+      # --
+      # Some applications return some invalid ASCII so we need to work
+      # around that so that no errors happen.  This mostly happens
+      # with Node.js NPM.
+      # --
+
+      private
+      def encode_str(str)
+        str.encode("utf-8", {
+          :invalid => :replace, :undef => :replace, :replace => ""
+        })
+      end
+
+      # --
 
       private
       def progress_bar(stream)
@@ -91,16 +152,16 @@ module Docker
 
         return unless id
         before, diff = progress_diff(id)
-        $stderr.print before if before
+        @stderr.print before if before
         str = stream["progress"] || stream["status"]
         str = "#{id}: #{str}\r"
 
-        $stderr.print(Object::Simple::Ansi.jump(
+        @stderr.print(Object::Simple::Ansi.jump(
           str, diff
         ))
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       private
       def progress_diff(id)
@@ -113,13 +174,13 @@ module Docker
         return before, 0
       end
 
-      # ----------------------------------------------------------------------
+      # --
 
       private
       def filter_matches?(msg)
-        return false unless @builder
+        return false unless @repo
 
-        @builder.repo.metadata["log_filters"].any? do |filter|
+        @repo.meta["log_filters"].any? do |filter|
           filter.is_a?(Regexp) && msg =~ filter || msg == filter
         end
       end