docker-template 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9f3e9bddac3bae28544d5f0038392b1759cecc5
-  data.tar.gz: 21e1d6d93297729b417254d0485993abb255eb72
+  metadata.gz: b075d40fa03bed4ef57a9a788c53c778a60cb053
+  data.tar.gz: b8183048b12f4547fd711e0e96ac08bc543e3cd5
 SHA512:
-  metadata.gz: 229ccdf9256aafe1b25412b4e3822c4c4460f691963850370cb4216ae96091b0075911292d9f258879d8f750506ec062e2910500143e31acc7bb0c6ef4ebf259
-  data.tar.gz: 02c5c493e25225d79aadfa50c8d8ad2622c01d2b898aa25890bb568ef883194a54ede235fb439cb430e3d619f194af3ca1c90fa5c7b686f3471610429ad87edc
+  metadata.gz: df02551d54168a59d5095d51f0a1f4763a07e4a16c953c40b3b4597c34941b03dc735451e043a30cd434acff0e6184e0cdcd7653b82492ad085bf31df4640f9e
+  data.tar.gz: 0fa1f9443e84aff442fe796df646ab06f44822ebbb1f4397d92b42988539c09b2a3ede58afa8f2bf56e2664cf993d1d51daebc285bc525aa5cc65c70b2827318

data/Rakefile

@@ -41,13 +41,13 @@ module CompList
   def normalize_command(command)
     if command.is_a?(Array)
       then command.map do |key|
-        key.gsub(
-          /_/, "-"
+        key.tr(
+          "_", "-"
         )
       end
     else
-      command.gsub(
-        /_/, "-"
+      command.tr(
+        "_", "-"
       )
     end
   end
@@ -85,8 +85,7 @@ module CompList
           )}"
         end
 
-        ary |= \
-        opt.aliases
+        ary | opt.aliases
       end
     end
 

data/comp/list

@@ -7,7 +7,6 @@
 # rubocop:disable Style/ElseAlignment
 # ----------------------------------------------------------------------------
 
-
 ARGV.shift
 require "pathutil"
 require "msgpack"

data/lib/docker/template.rb

@@ -83,3 +83,13 @@ module Docker
     end
   end
 end
+
+# ----------------------------------------------------------------------------
+# Trick extras into merging array's into array's for us so users can inherit.
+# ----------------------------------------------------------------------------
+
+class Array
+  def deep_merge(new_)
+    self | new_
+  end
+end

data/lib/docker/template/builder.rb

@@ -63,10 +63,13 @@ module Docker
       # ----------------------------------------------------------------------
 
       def aliased_img
-        return unless alias?
-        @aliased_img ||= Docker::Image.get(
-          aliased_repo.to_s
-        )
+        if alias?
+          then @aliased_img ||= begin
+            Docker::Image.get(
+              aliased_repo ? aliased_repo.to_s : aliased_tag
+            )
+          end
+        end
 
       rescue Docker::Error::NotFoundError
         if alias?
@@ -137,10 +140,19 @@ module Docker
         alias_setup
 
         if @repo.buildable?
-          aliased = self.class.new(aliased_repo)
-          aliased.build unless aliased_img
-          Notify.alias(self)
+          if (repo = aliased_repo)
+            aliased = self.class.new(repo)
+            unless aliased_img
+              aliased.build
+            end
+
+          elsif !aliased_img
+            raise(
+              Error::ImageNotFound, aliased_tag
+            )
+          end
 
+          Notify.alias(self)
           aliased_img.tag(
             @repo.to_tag_h
           )
@@ -294,6 +306,7 @@ module Docker
 
       # ----------------------------------------------------------------------
 
+      rb_delegate :aliased_tag, :to => "repo.metadata"
       rb_delegate :aliased_repo, {
         :to => :repo, :alias_of => :aliased
       }

data/lib/docker/template/cache.rb

@@ -14,22 +14,25 @@ module Docker
       # ----------------------------------------------------------------------
 
       def context(builder, context)
-        if builder.alias? && builder.aliased_repo.cache_dir.exist?
-          parent_cache_dir = builder.aliased_repo.cache_dir
-          $stderr.puts Simple::Ansi.yellow("Copying #{builder.aliased_repo} context to #{builder.repo}")
-          cache_dir = builder.repo.cache_dir
+        builder.repo.cache_dir.rm_rf
+        $stderr.puts Simple::Ansi.yellow(format("Copying context for %s", builder.repo))
+        cache_dir = builder.repo.cache_dir
+        cache_dir.parent.mkdir_p
 
-          parent_cache_dir.cp_r(cache_dir.tap(
-            &:rm_rf
-          ))
-        elsif context
-          builder.repo.cache_dir.rm_rf
-          $stderr.puts Simple::Ansi.yellow("Copying context for #{builder.repo}")
-          cache_dir = builder.repo.cache_dir
-          cache_dir.parent.mkdir_p
+        readme(builder)
+        context.cp_r(cache_dir.tap(
+          &:rm_rf
+        ))
+      end
+
+      # ----------------------------------------------------------------------
+      # rubocop:disable Metrics/LineLength
+      # ----------------------------------------------------------------------
 
-          readme(builder)
-          context.cp_r(cache_dir.tap(
+      def aliased_context(builder)
+        if builder.aliased_repo.cache_dir.exist?
+          $stderr.puts Simple::Ansi.yellow(format("Copying %s context to %s", builder.aliased_repo, builder.repo))
+          builder.aliased_repo.cache_dir.cp_r(builder.repo.cache_dir.tap(
             &:rm_rf
           ))
         end
@@ -38,13 +41,18 @@ module Docker
       # ----------------------------------------------------------------------
       # Cleanup the context caches, removing the caches we no longer need.
       # ----------------------------------------------------------------------
+      # rubocop:enable Metrics/LineLength
+      # ----------------------------------------------------------------------
 
       def cleanup(repo)
-        repo.cache_dir.parent.children.each do |file|
-          unless repo.metadata.tags.include?(file.basename)
-            $stdout.puts Simple::Ansi.yellow("Removing %s." % [
+        cache_dir = repo.cache_dir.parent
+
+        if repo.cacheable? && cache_dir.exist?
+          then cache_dir.children.each do |file|
+            next unless repo.metadata.tags.include?(file.basename)
+            $stdout.puts Simple::Ansi.yellow(format("Removing %s.",
               file.relative_path_from(Template.root)
-            ])
+            ))
 
             file.rm_rf
           end

data/lib/docker/template/cli.rb

@@ -28,9 +28,9 @@ module Docker
       # ----------------------------------------------------------------------
 
       def build(*args)
-        repos = nil; with_profiling do
-          repos = Parser.new(args, options).parse.tap { |o| o.map( \
-            &:build) }.uniq(&:name).map(&:clean)
+        with_profiling do
+          Parser.new(args, options).parse.tap { |o| o.map(&:build) } \
+            .uniq(&:name).map(&:clean)
         end
 
       rescue Docker::Template::Error::StandardError => e
@@ -46,11 +46,13 @@ module Docker
       option :grep, :type => :boolean, :desc => "Make --only a Regexp search."
       option :only, :type => :string,  :desc => "Only a specific repo."
 
+      # ----------------------------------------------------------------------
+      # rubocop:disable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
       def list
         Parser.new([], {}).parse.each do |repo|
-          repo_s = repo_s = repo.to_s.gsub(/^[^\/]+\//, "")
+          repo_s = repo.to_s.gsub(/^[^\/]+\//, "")
           next unless (only.is_a?(Regexp) && repo_s =~ only) \
             || (only && repo_s == only) || !only
 
@@ -58,12 +60,10 @@ module Docker
           $stderr.print " -> ", repo.aliased.to_s, "\n" if repo.alias?
           $stderr.puts unless repo.alias?
         end
-      rescue Docker::Template::Error::StandardError => e
-        $stderr.puts Simple::Ansi.red(e.message)
-        exit e.respond_to?(:status) \
-          ? e.status : 1
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:enable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
       no_tasks do
@@ -94,6 +94,7 @@ module Docker
               MemoryProfiler.report(:top => 10_240) { yield }.pretty_print({\
                 :to_file => "mem.txt"
               })
+
             rescue LoadError
               $stderr.puts "The gem 'memory_profiler' wasn't found."
               $stderr.puts "You can install it with `gem install memory_profiler'"

data/lib/docker/template/error.rb

@@ -15,8 +15,8 @@ module Docker
 
       class PlaceHolderError < StandardError
         def initialize(error)
-          super "PLACEHOLDER ERROR: %s" % (
-            error
+          super format(
+            "PLACEHOLDER ERROR: %s", error
           )
         end
       end
@@ -74,16 +74,6 @@ module Docker
 
       # ----------------------------------------------------------------------
 
-      class NoHookExists < StandardError
-        def initialize(base, point)
-          super "Unknown hook base '#{base}' or hook point '#{
-            point
-          }'"
-        end
-      end
-
-      # ----------------------------------------------------------------------
-
       class NoRootMetadata < StandardError
         def initialize
           super "Metadata without the root flag must provide the root_metadata."
@@ -124,6 +114,16 @@ module Docker
           }"
         end
       end
+
+      # ----------------------------------------------------------------------
+
+      class ImageNotFound < StandardError
+        def initialize(image)
+          super "Unable to find the image #{
+            image
+          }"
+        end
+      end
     end
   end
 end

data/lib/docker/template/metadata.rb

@@ -60,6 +60,8 @@ module Docker
       #   })
       # ```
       # ----------------------------------------------------------------------
+      # rubocop:disable Metrics/AbcSize
+      # ----------------------------------------------------------------------
 
       def initialize(overrides, root: nil)
         if root.is_a?(self.class)
@@ -89,6 +91,8 @@ module Docker
         end
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:enable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
       def _shas
@@ -128,12 +132,13 @@ module Docker
             end
           end
 
-          true
         else
-          @data.include?(
+          return @data.include?(
             val
           )
         end
+
+        true
       end
 
       # ----------------------------------------------------------------------
@@ -257,6 +262,9 @@ module Docker
       # --------------------------------------------------------------------
       # Fallback, determining which route is the best.  Tag > Group > All.
       # --------------------------------------------------------------------
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
+      # ----------------------------------------------------------------------
 
       def fallback(group: current_group, tag: current_tag, query_data: @data)
         if query_data.is_a?(self.class)
@@ -277,6 +285,9 @@ module Docker
       end
 
       # --------------------------------------------------------------------
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
+      # ----------------------------------------------------------------------
 
       def for_all(query_data: @data)
         if query_data.is_a?(self.class)
@@ -430,6 +441,9 @@ module Docker
         end
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       # ----------------------------------------------------------------------
 
       def to_a(raw: false, shell: false)
@@ -450,11 +464,16 @@ module Docker
         end
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:eanble Metrics/CyclomaticComplexity
+      # rubocop:eanble Metrics/PerceivedComplexity
       # ----------------------------------------------------------------------
       # Convert a `Metadata' into a normal hash. If `self' is queryable then
       # we go and start merging values smartly.  This means that we will merge
       # all the arrays into one another and we will merge hashes into hashes.
       # ----------------------------------------------------------------------
+      # rubocop:disable Metrics/AbcSize
+      # ----------------------------------------------------------------------
 
       def to_h(raw: false)
         return @data.to_h if raw || !queryable? || !mergeable_hash?
@@ -487,6 +506,8 @@ module Docker
         end
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:enable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
       def mergeable_hash?(key = nil)
@@ -564,7 +585,7 @@ module Docker
 
       private
       def string_wrapper(obj, shell: false)
-        return obj if obj == true  ||  obj == false  ||  obj.nil?
+        return obj if obj == true || obj == false || obj.nil?
         return obj.to_s(:shell => shell) if obj.is_a?(self.class)
         !obj.is_a?(Array) ? obj.to_s : obj.join(
           "\s"

data/lib/docker/template/normal.rb

@@ -37,9 +37,9 @@ module Docker
 
       private
       def cache_context
-        if @repo.cacheable?
-          Cache.context self, @context
-        end
+        return unless @repo.cacheable?
+        return Cache.aliased_context(self) if alias?
+        Cache.context(self, @context)
       end
     end
   end

data/lib/docker/template/notify.rb

@@ -25,7 +25,7 @@ module Docker
 
       def alias(builder)
         repo = builder.repo
-        aliased_repo = builder.aliased_repo
+        aliased_repo = builder.aliased_repo || builder.aliased_tag
         msg = Simple::Ansi.green("Aliasing #{repo} -> #{aliased_repo}")
         $stderr.puts msg
       end

data/lib/docker/template/parser.rb

@@ -32,6 +32,8 @@ module Docker
         then raise Error::RepoNotFound
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:disable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
       def parse
@@ -42,14 +44,21 @@ module Docker
         }
 
         all.each do |v|
-          hash = to_repo_hash(v)
+          hash = self.class.to_repo_hash(
+            v
+          )
+
           if hash.empty?
-            raise Docker::Template::Error::BadRepoName, v
+            raise(Docker::Template::Error::BadRepoName,
+              v
+            )
 
           else
             Repo.new(hash, @argv).to_repos.each do |r|
-              r.alias?? repos[:aliases] << r : r.builder.scratch?? \
-                repos[:scratch] << r : repos[:simple] << r
+              r.alias?? repos[:aliases] << r : \
+                if r.builder.scratch?
+                  repos[:scratch] << r else repos[:simple] << r
+                end
             end
           end
         end
@@ -59,10 +68,11 @@ module Docker
         )
       end
 
+      # ----------------------------------------------------------------------
+      # rubocop:enable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
-      private
-      def to_repo_hash(val)
+      def self.to_repo_hash(val)
         data = val.split(SPLIT_REGEXP)
 
         return "name" => data[0] if data.one?
@@ -72,6 +82,15 @@ module Docker
 
         {}
       end
+
+      # ----------------------------------------------------------------------
+
+      def self.full_name?(val)
+        parsed = to_repo_hash(val)
+        parsed.key?("name") && (parsed.key?("user") || parsed.key?(
+          "tag"
+        ))
+      end
     end
   end
 end

data/lib/docker/template/repo.rb

@@ -13,7 +13,12 @@ module Docker
 
       def initialize(*hashes)
         @base_meta = hashes.compact.reduce(:deep_merge).freeze
-        raise Error::RepoNotFound, name unless root.exist?
+
+        unless root.exist?
+          raise(
+            Error::RepoNotFound, name
+          )
+        end
       end
 
       # ----------------------------------------------------------------------
@@ -21,9 +26,10 @@ module Docker
       # ----------------------------------------------------------------------
 
       def pushable?
-        (metadata["push"] || metadata["push_only"]) && !metadata[
-          "cache_only"
-        ]
+        (metadata["push"] || metadata["push_only"]) &&
+          !metadata["cache_only"] && !metadata[
+            "clean_only"
+          ]
       end
 
       # ----------------------------------------------------------------------
@@ -31,9 +37,10 @@ module Docker
       # ----------------------------------------------------------------------
 
       def cacheable?
-        (metadata["cache"] || metadata["cache_only"]) && !metadata[
-          "push_only"
-        ]
+        (metadata["cache"] || metadata["cache_only"]) &&
+          !metadata[
+            "push_only"
+          ]
       end
 
       # ----------------------------------------------------------------------
@@ -41,9 +48,10 @@ module Docker
       # ----------------------------------------------------------------------
 
       def buildable?
-        !metadata["push_only"] && !metadata["cache_only"] && !metadata[
-          "clean_only"
-        ]
+        !metadata["push_only"] && !metadata["cache_only"] &&
+          !metadata[
+            "clean_only"
+          ]
       end
 
       # ----------------------------------------------------------------------
@@ -52,11 +60,25 @@ module Docker
       # ----------------------------------------------------------------------
 
       def aliased
-        if alias?
+        full = Parser.full_name?(
+          metadata.aliased_tag
+        )
+
+        if alias? && full
+          self.class.new(to_h.merge(Parser.to_repo_hash(
+            metadata.aliased_tag
+          )))
+
+        elsif alias?
           self.class.new(to_h.merge({
             "tag" => metadata.aliased_tag
           }))
         end
+
+      rescue Error::RepoNotFound => e
+        unless full
+          raise e
+        end
       end
 
       # ----------------------------------------------------------------------

data/lib/docker/template/version.rb

@@ -6,6 +6,6 @@
 
 module Docker
   module Template
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor