docker-template 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d0075b312802d3ab8aee4e2bdf38a14e16bb4d
-  data.tar.gz: e6e7000b38bf0d87811b44db51df2df2102fbe73
+  metadata.gz: a041995698dcbe6253e4c997a940e1e7eb492e4b
+  data.tar.gz: 39b3a79d100a7ddb4f75d7352b1dac9db157ee94
 SHA512:
-  metadata.gz: ad1e04a185def81c78bee7541ecef733dfcd7a0581f3f3b3a641e0386849d968ddef43593fd2c60f6e348cf60a115c32ea450a624ea6f913b35d0c8dfdf31ad7
-  data.tar.gz: 434e39f96bd70f58670aec3cb1b8bb57028fb1985bc5a09fa6a0e87d8845091ea6ddf3732e280ee05c40b9653339d3efcf39df1acb6c5fe61b5fae806f981255
+  metadata.gz: 1e2949a9cd7ce54000508599cd1c31b07dbdbf654596b3d6984977f2bfa75cc7932bb1a6cd097af97f77122fd5434f150f00b10011cf689edb35455013fd69e8
+  data.tar.gz: e2997be78cc2d37d48cd7ef3184b6481992fcc6befc0d595835d396d7935230e852a76128b933f55aeaa618b1fa31fbf5e16b3416fecd01d325cfbe0ec38e888

data/Rakefile

@@ -2,8 +2,11 @@
 # Copyright: 2015 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
 
-$:.unshift(File.expand_path("../lib", __FILE__))
+$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
+require "docker/template/ansi"
 require "rspec/core/rake_task"
+require "open3"
+
 task :default => [:spec]
 RSpec::Core::RakeTask.new :spec
 task :test => :spec
@@ -15,6 +18,40 @@ task :build do
 end
 
 task :pry do
-  exec "bundle", "exec", "pry", "-Ilib/", \
+  sh "bundle", "exec", "pry", "-Ilib/", \
     "-rdocker/template"
 end
+
+task :analysis do
+  ansi = Docker::Template::Ansi
+  cmd = [
+    "docker", "run", "--rm", "--env=CODE_PATH=#{Dir.pwd}", \
+    "--volume=#{Dir.pwd}:/code", "--volume=/var/run/docker.sock:/var/run/docker.sock", \
+    "--volume=/tmp/cc:/tmp/cc", "-i", "codeclimate/codeclimate", "analyze"
+  ]
+
+  file = File.open(".analysis", "w+")
+  Open3.popen3(cmd.shelljoin) do |_, out, err, _|
+    while data = out.gets
+      file.write data
+      if data =~ /\A==/
+        $stdout.print ansi.yellow(data)
+
+      elsif data !~ %r!\A[0-9\-]+!
+        $stdout.puts data
+
+      else
+        h, d = data.split(":", 2)
+        $stdout.print ansi.cyan(h)
+        $stdout.print ":", d
+      end
+    end
+
+    while data = err.gets
+      file.write data
+      $stderr.print ansi.red(data)
+    end
+  end
+
+  file.close
+end

data/bin/docker-template

@@ -3,9 +3,7 @@
 # Copyright: 2015 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
 
-$:.unshift(File.expand_path(
-  "../lib", __dir__
-))
+$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 
 trap :SIGINT do
   $stderr.puts "\nApparently that's all for now."
@@ -20,5 +18,5 @@ rescue LoadError
   require "docker/template"
 end
 
-Docker::Template::Interface. \
-  start($0)
+Docker::Template::Interface \
+  .start($PROGRAM_NAME)

data/lib/docker/template.rb

@@ -12,7 +12,9 @@ require "erb"
 require "set"
 
 module Docker
-  module Template module_function
+  module Template
+    module_function
+
     autoload :Util, "docker/template/util"
     autoload :Config, "docker/template/config"
     autoload :Ansi, "docker/template/ansi"
@@ -31,8 +33,12 @@ module Docker
     autoload :Alias, "docker/template/alias"
     autoload :Auth, "docker/template/auth"
 
+    def repo_is_root?
+      root.join("copy").exist? && !root.join("../..", config["repos_dir"]).exist?
+    end
+
     def config
-      return @config ||= begin
+      @config ||= begin
         Config.new
       end
     end
@@ -40,7 +46,7 @@ module Docker
     #
 
     def root
-      return @root ||= begin
+      @root ||= begin
         Pathname.new(Dir.pwd)
       end
     end
@@ -51,17 +57,23 @@ module Docker
     # guarantees that an absolute path will work.
 
     def repos_root
-      return @repos_root ||= begin
+      @repos_root ||= begin
         root.join(config["repos_dir"])
       end
     end
 
+    #
+
+    def repo_root_for(name)
+      repo_is_root?? root : repos_root.join(name)
+    end
+
     # Provides the root to Docker template, wherever it is installed so that
-    # we can do things, mostly ignore files for the profiler.  Otherwise it's
+    # we can do things, mostly ignore files for the profiler. Otherwise it's
     # not really used, it's just an encapsulator.
 
     def gem_root
-      return @gem_root ||= begin
+      @gem_root ||= begin
         path = File.expand_path("../../", __dir__)
         Pathname.new(path)
       end
@@ -71,7 +83,7 @@ module Docker
     # from our templates and use it if you wish to.
 
     def template_root
-      return @template_root ||= begin
+      @template_root ||= begin
         gem_root.join("lib/docker/template/templates")
       end
     end

data/lib/docker/template/alias.rb

@@ -18,7 +18,7 @@ module Docker
 
       private
       def prebuild
-          repo = @aliased.parent_repo
+        repo   = @aliased.parent_repo
         simple = @aliased.repo.type == "simple"
         @aliased.class.new(repo, @aliased.rootfs_img) unless simple
         @aliased.class.new(repo).build if simple

data/lib/docker/template/ansi.rb

@@ -4,18 +4,28 @@
 
 module Docker
   module Template
-    module Ansi module_function
-      Escape = "%c" % 27
-      Match = /#{Escape}\[(?:\d+)(?:;\d+)?(j|k|m|s|u|A|B)|\e\(B\e\[m/ix.freeze
-      Colors = { :red => 31, :green => 32, :black => 30, :magenta => 35,
-        :yellow => 33, :white => 37, :blue => 34, :cyan => 36 }
+    module Ansi
+      module_function
+
+      ESCAPE = format("%c", 27)
+      MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze
+      COLORS = {
+        :red => 31,
+        :green => 32,
+        :black => 30,
+        :magenta => 35,
+        :yellow => 33,
+        :white => 37,
+        :blue => 34,
+        :cyan => 36
+      }
 
       # Strip ANSI from the current string.  It also strips cursor stuff,
       # well some of it, and it also strips some other stuff that a lot of
       # the other ANSI strippers don't.
 
       def strip(str)
-        str.gsub Match, ""
+        str.gsub MATCH, ""
       end
 
       # Reset the vterm view if it's supported.  Depending on how badly
@@ -23,24 +33,24 @@ module Docker
       # with a few empty lines added on the top.
 
       def clear
-        $stdout.print("%c[H%c[2J" % [27, 27])
+        $stdout.print(format("%c[H%c[2J", 27, 27))
       end
 
       #
 
       def has?(str)
-        !!(str =~ Match)
+        !!(str =~ MATCH)
       end
 
       # Jump the cursor up and then back down or just up and down.  This is
       # useful when streaming async downloads from something like Docker.  It
       # also works better than using `tput`
 
-      def jump(str = "", up: nil, down: nil, both: nil, clear: true)
-        str = clear_line(str) if clear
+      def jump(str = "", up: nil, down: nil, both: nil)
+        str = clear_line(str)
 
-        return "%c[%dA%s%c[%dB" % [27, up || both, str, 27, down || both] if (up && down) || both
-        up ? "%c[%dA%s" % [27, up, str] : "%s%c[%dB" % [str, 27, down]
+        return format("%c[%dA%s%c[%dB", 27, up || both, str, 27, down || both) if (up && down) || both
+        up ? format("%c[%dA%s", 27, up, str) : format("%s%c[%dB", str, 27, down)
       end
 
       # Reset the color back to the default color so that you do not leak any
@@ -48,26 +58,26 @@ module Docker
       # used as part of a wrapper so that we don't leak colors.
 
       def reset(str = "")
-        @ansi_reset ||= "%c[0m" % 27
+        @ansi_reset ||= format("%c[0m", 27)
         "#{@ansi_reset}#{str}"
       end
 
       #
 
       def clear_line(str = "")
-        @ansi_clear_line ||= "%c[2K\r" % 27
+        @ansi_clear_line ||= format("%c[2K\r", 27)
         "#{@ansi_clear_line}#{str}\r"
       end
 
-      # SEE: `self::Colors` for a list of methods.  They are mostly
+      # SEE: `self::COLORS` for a list of methods.  They are mostly
       # standard base colors supported by pretty much any xterm-color, we do
       # not need more than the base colors so we do not include them.
       # Actually... if I'm honest we don't even need most of the
       # base colors.
 
-      Colors.each do |color, num|
+      COLORS.each do |color, num|
         define_method color do |str|
-          "#{"%c" % 27}[#{num}m#{str}#{reset}"
+          "#{format("%c", 27)}[#{num}m#{str}#{reset}"
         end; module_function color
       end
     end

data/lib/docker/template/auth.rb

@@ -4,7 +4,7 @@ module Docker
       module_function
 
       def auth!
-        return unless login = get_info
+        return unless login = credentials
         login["auths"].each do |server, auth|
           username, password = Base64.decode64(auth["auth"]).split(":", 2)
           Docker.authenticate!({
@@ -16,9 +16,9 @@ module Docker
         end
       end
 
-      def get_info
+      def credentials
         path = Pathname.new("~/.docker/config.json").expand_path
-        return JSON.parse(path.read) if path.exist?
+        JSON.parse(path.read) if path.exist?
       end
     end
   end

data/lib/docker/template/common.rb

@@ -35,9 +35,9 @@ module Docker
 
       def parent_repo
         return false unless aliased?
-        @parent_repo ||= Repo.new(@repo.to_h.merge({
-          "tag" => @repo.aliased
-        }))
+        @parent_repo ||= begin
+          Repo.new(@repo.to_h.merge("tag" => @repo.aliased))
+        end
       end
 
       #
@@ -58,14 +58,8 @@ module Docker
 
         Ansi.clear
         Util.notify_build(@repo, rootfs: rootfs?)
-        logger = Stream.new.method(:log)
         copy_build_and_verify
-
-        Dir.chdir(@context) do
-          @img = Docker::Image.build_from_dir(".", &logger)
-          @img.tag  rootfs??  @repo.to_rootfs_h  :  @repo.to_tag_h
-          push
-        end
+        chdir_build
       rescue SystemExit => exit_
         unlink img: true
         raise exit_
@@ -77,6 +71,16 @@ module Docker
 
       #
 
+      def chdir_build
+        Dir.chdir(@context) do
+          @img = Docker::Image.build_from_dir(".", &Stream.new.method(:log))
+          @img.tag rootfs?? @repo.to_rootfs_h : @repo.to_tag_h
+          push
+        end
+      end
+
+      #
+
       private
       def copy_build_and_verify
         unless respond_to?(:setup_context, true)

data/lib/docker/template/config.rb

@@ -18,11 +18,13 @@ module Docker
       def_delegator :@config, :keys
       def_delegator :@config, :to_h
       def_delegator :@config, :to_enum
+      def_delegator :@config, :key?, :has_default?
       def_delegator :@config, :has_key?
+      def_delegator :@config, :key?
       def_delegator :@config, :each
       def_delegator :@config, :[]
 
-      Defaults = {
+      DEFAULTS = {
         "type" => "simple",
         "user" => "envygeeks",
         "local_prefix" => "local",
@@ -33,24 +35,24 @@ module Docker
         "copy_dir" => "copy",
         "tag" => "latest",
 
-        "aliases" => {},
-           "pkgs" => { "tag" => {}, "type" => {}, "all" => nil },
-        "entries" => { "tag" => {}, "type" => {}, "all" => nil },
-       "releases" => { "tag" => {}, "type" => {}, "all" => nil },
-       "versions" => { "tag" => {}, "type" => {}, "all" => nil },
-            "env" => { "tag" => {}, "type" => {}, "all" => nil },
-           "tags" => {}
+        "env"      => { "tag" => {}, "type" => {}, "all" => nil },
+        "pkgs"     => { "tag" => {}, "type" => {}, "all" => nil },
+        "entries"  => { "tag" => {}, "type" => {}, "all" => nil },
+        "releases" => { "tag" => {}, "type" => {}, "all" => nil },
+        "versions" => { "tag" => {}, "type" => {}, "all" => nil },
+        "aliases"  => {},
+        "tags"     => {}
       }.freeze
 
-      EmptyDefaults = {
+      EMPTY_DEFAULTS = {
         "tags" => { "latest" => "normal" }
       }
 
       #
 
       def initialize
-        @config = Defaults.deep_merge(read_config_from)
-        @config = @config.merge(EmptyDefaults) do |key, oval, nval|
+        @config = DEFAULTS.deep_merge(read_config_from)
+        @config = @config.merge(EMPTY_DEFAULTS) do |_, oval, nval|
           oval.nil? || oval.empty?? nval : oval
         end
 
@@ -70,14 +72,8 @@ module Docker
 
       #
 
-      def has_default?(key)
-        return @config.has_key?(key)
-      end
-
-      #
-
       def build_types
-        return @build_types ||= %W(simple scratch).freeze
+        @build_types ||= %W(simple scratch).freeze
       end
     end
   end

data/lib/docker/template/interface.rb

@@ -32,12 +32,11 @@ module Docker
 
       private
       def sync
-        if wants_sync?
-          Parser.new.parse.each do |repo|
-            next unless repo.syncable?
-            repo.builder.tap(&:sync). \
-              unlink(sync: false)
-          end
+        return unless wants_sync?
+        Parser.new.parse.each do |repo|
+          next unless repo.syncable?
+          repo.builder.tap(&:sync) \
+            .unlink(sync: false)
         end
       end
 
@@ -45,7 +44,7 @@ module Docker
 
       private
       def argv_without_flags
-        return @argv.select do |val|
+        @argv.select do |val|
           !["--sync", "--push"].include?(val)
         end
       end
@@ -81,9 +80,9 @@ module Docker
 
       private
       def self.discover
-        rtn = bins.select do |path|
+        rtn = bins.find do |path|
           path.basename.fnmatch?("docker") && path.executable_real?
-        end.first
+        end
 
         if rtn
           rtn.to_s

data/lib/docker/template/metadata.rb

@@ -10,12 +10,12 @@ module Docker
       # Provides aliases for the root element so you can do something like:
       #   * data["release"].fallback
 
-      Aliases = {
-          "entry" =>  "entries",
+      ALIASES = {
+        "entry" => "entries",
         "release" => "releases",
         "version" => "versions",
-         "script" =>  "scripts",
-          "image" =>   "images"
+        "script" => "scripts",
+        "image" => "images"
       }
 
       def_delegator :@metadata, :keys
@@ -26,6 +26,7 @@ module Docker
       def_delegator :@metadata, :delete
       def_delegator :@metadata, :each
       def_delegator :@metadata, :to_h
+      def_delegator :@metadata, :key?
       route_to_ivar :is_root, :@is_root, bool: true
       route_to_hash :for_all, :self, :all
 
@@ -34,22 +35,24 @@ module Docker
         @root_metadata = root_metadata || {}
         @metadata = metadata || {}
 
-        if is_root?
-          @base = Template.config
-          @root_metadata = @metadata
-        end
+        return unless is_root?
+        @root_metadata = @metadata
+        @base = Template.config
+      end
+
+      #
+
+      def as_gem_version
+        "#{self["repo"]}@#{self["version"].fallback}"
       end
 
       #
 
       def aliased
-        aliases = from_root("aliases")
         tag = from_root("tag")
-
-        if aliases.has_key?(tag)
-          return aliases[tag]
-        end
-      tag
+        aliases = from_root("aliases")
+        return aliases[tag] if aliases.key?(tag)
+        tag
       end
 
       # Queries providing a default value if on the root repo hash otherwise
@@ -72,8 +75,8 @@ module Docker
 
       #
 
-      def merge(_new)
-        @metadata.merge!(_new)
+      def merge(new_)
+        @metadata.merge!(new_)
         self
       end
 
@@ -86,18 +89,19 @@ module Docker
       #
 
       def as_hash
-        {}.merge(for_all.to_h). \
-           merge(by_type.to_h). \
-           merge(by_tag. to_h)
+        {} \
+          .merge(for_all.to_h) \
+          .merge(by_type.to_h) \
+          .merge(by_tag. to_h)
       end
 
       #
 
       def as_set
-        Set.new. \
-          merge(for_all.to_a). \
-          merge(by_type.to_a). \
-          merge(by_tag .to_a)
+        Set.new \
+          .merge(for_all.to_a) \
+          .merge(by_type.to_a) \
+          .merge(by_tag .to_a)
       end
 
       #
@@ -118,7 +122,7 @@ module Docker
 
       def by_tag
         return unless tag = aliased
-        return unless has_key?("tag")
+        return unless key?("tag")
         hash = self["tag"]
         hash[tag]
       end
@@ -129,8 +133,8 @@ module Docker
 
       def by_type
         return unless tag = aliased
-        type = @root_metadata["tags"][tag]
-        return unless has_key?("type")
+        type = from_root("tags")[tag]
+        return unless key?("type")
         return unless type
 
         hash = self["type"]
@@ -141,10 +145,10 @@ module Docker
 
       private
       def determine_key(key)
-        if is_root? && !has_key?(key) && Aliases.has_key?(key)
-          key = Aliases[key]
+        if is_root? && !key?(key) && ALIASES.key?(key)
+          key = ALIASES[key]
         end
-      key
+        key
       end
 
       #

data/lib/docker/template/parser.rb

@@ -5,9 +5,9 @@
 module Docker
   module Template
     class Parser
-      SlashRegexp = /\//.freeze
-      SplitRegexp = /:|\//.freeze
-      ColonRegexp = /:/.freeze
+      SLASH_REGEXP = /\//.freeze
+      SPLIT_REGEXP = /:|\//.freeze
+      COLON_REGEXP = /:/.freeze
 
       def initialize(argv = [].freeze)
         @argv = argv.freeze
@@ -19,7 +19,7 @@ module Docker
 
       def all
         return @argv unless @argv.empty?
-        Docker::Template.repos_root.children.map do |path|
+        Template.repos_root.children.map do |path|
           path.basename.to_s
         end
       rescue Errno::ENOENT
@@ -34,22 +34,24 @@ module Docker
           raise Docker::Template::Error::BadRepoName, val if hash.empty?
           out += as == :repos ? Repo.new(hash).to_repos : [hash]
         end
-      out
+        out
       end
 
       #
 
       private
       def build_repo_hash(val)
-        data, hsh = val.split(SplitRegexp), {}
+        data = val.split(SPLIT_REGEXP)
+        hsh  = {}
+
         if data.size == 1
           hsh["repo"] = data[0]
 
-        elsif val =~ ColonRegexp && data.size == 2
+        elsif val =~ COLON_REGEXP && data.size == 2
           hsh["repo"] = data[0]
           hsh[ "tag"] = data[1]
 
-        elsif val =~ SlashRegexp && data.size == 2
+        elsif val =~ SLASH_REGEXP && data.size == 2
           hsh["user"] = data[0]
           hsh["repo"] = data[1]
 
@@ -58,7 +60,6 @@ module Docker
           hsh["repo"] = data[1]
           hsh[ "tag"] = data[2]
         end
-
         hsh
       end
     end

data/lib/docker/template/patches/hash.rb

@@ -4,18 +4,17 @@
 
 class Hash
   def to_env
-    inject({}) do |hsh, (key, val)|
+    each_with_object({}) do |(key, val), hsh|
       val = val.is_a?(Array) ? val.join(" ") : val.to_s
       key = key.to_s.upcase
       hsh[key] = val
-    hsh
     end
   end
 
   #
 
   def any_keys?(*keys)
-    keys.map(&method(:has_key?)).any? do |val|
+    keys.map(&method(:key?)).any? do |val|
       val == true
     end
   end
@@ -23,32 +22,31 @@ class Hash
   #
 
   def leftover_keys?(*keys)
-    return (self.keys - keys).any?
+    (self.keys - keys).any?
   end
 
   #
 
-  def has_keys?(*keys)
+  def keys?(*keys)
     return false unless rtn = true && any?
     while rtn && key = keys.shift
-      rtn = has_key?(key) || false
+      rtn = key?(key) || false
     end
-
-  rtn
+    rtn
   end
 
   #
 
   def to_env_ary
-    inject([]) do |array, (key, val)|
-      array.push("#{key}=#{val}")
+    each_with_object([]) do |(key, val), ary|
+      ary << "#{key}=#{val}"
     end
   end
 
   #
 
   def deep_merge(newh)
-    merge(newh) do |key, oval, nval|
+    merge(newh) do |_, oval, nval|
       if oval.is_a?(self.class) && nval.is_a?(self.class)
         then oval.deep_merge(nval) else nval
       end
@@ -58,19 +56,16 @@ class Hash
   #
 
   def stringify
-    inject({}) do |hsh, (key, val)|
+    each_with_object({}) do |(key, val), hsh|
       hsh[key.to_s] = val.is_a?(Array) || val.is_a?(Hash) ? val.stringify : val.to_s
-    hsh
     end
   end
 
   #
 
   def stringify_keys
-    inject({}) do |hsh, (key, val)|
+    each_with_object({}) do |(key, val), hsh|
       hsh[key.to_s] = val
-
-    hsh
     end
   end
 end

data/lib/docker/template/patches/pathname.rb

@@ -11,7 +11,7 @@ class Pathname
   #
 
   def write(data)
-    File.write(self.to_s, data)
+    File.write(to_s, data)
   end
 
   #
@@ -25,7 +25,7 @@ class Pathname
   #
 
   def expanded_realpath
-    return @expanded_real_path ||= begin
+    @expanded_real_path ||= begin
       expanded_path.realpath
     end
   end
@@ -39,7 +39,7 @@ class Pathname
   #
 
   def glob(*args)
-    Dir.glob(self.join(*args)).map do |path|
+    Dir.glob(join(*args)).map do |path|
       self.class.new(path)
     end
   end

data/lib/docker/template/repo.rb

@@ -12,6 +12,7 @@ module Docker
     class Repo
       extend Forwardable, Routable
 
+      def_delegator :builder, :build
       route_to_hash :name, :@base_metadata, :repo
       route_to_hash [:tag, :type, :user], :metadata
       def_delegator :@base_metadata, :to_h
@@ -19,12 +20,12 @@ module Docker
       def_delegator :metadata, :tags
 
       def initialize(base_metadata)
-        raise ArgumentError, "Metadata not a hash" if !base_metadata.is_a?(Hash)
-        
+        raise ArgumentError, "Metadata not a hash" unless base_metadata.is_a?(Hash)
+
         @base_metadata = base_metadata.freeze
         @sync_allowed  = type == "simple" ? true : false
-        raise Error::InvalidRepoType, type if !Template.config.build_types.include?(type)
-        raise Error::RepoNotFound, name if !root.exist?
+        raise Error::InvalidRepoType, type unless Template.config.build_types.include?(type)
+        raise Error::RepoNotFound, name unless root.exist?
       end
 
       def builder
@@ -32,14 +33,6 @@ module Docker
         const.new(self)
       end
 
-      # Simply initializes the the builder and passes itself onto
-      # it so that it the builder can take over and do it's job cleanly
-      # without us needing to care about what's going on.
-
-      def build
-        return builder.build
-      end
-
       #
 
       def disable_sync!
@@ -68,7 +61,7 @@ module Docker
       #
 
       def building_all?
-       !@base_metadata.has_key?("tag")
+        !@base_metadata.key?("tag")
       end
 
       #
@@ -81,8 +74,8 @@ module Docker
       #
 
       def root
-        return @root ||= begin
-          Template.repos_root.join(name)
+        @root ||= begin
+          Template.repo_root_for(name)
         end
       end
 
@@ -90,9 +83,9 @@ module Docker
 
       def to_tag_h
         {
-          "force" => true,
-           "repo" => "#{user}/#{name}",
-            "tag" => tag,
+          "tag"   => tag,
+          "repo"  => "#{user}/#{name}",
+          "force" => true
         }
       end
 
@@ -102,9 +95,9 @@ module Docker
         prefix = metadata["local_prefix"]
 
         {
-          "force" => true,
-           "repo" => "#{prefix}/rootfs",
-            "tag" => name
+          "tag"   => name,
+          "repo"  => "#{prefix}/rootfs",
+          "force" => true
         }
       end
 
@@ -133,11 +126,12 @@ module Docker
 
       def to_repos
         if building_all?
-          base, set = to_h, Set.new
+          set  = Set.new
+          base = to_h
+
           tags.each do |tag|
-            set.add(self.class.new(base.merge({
-              "tag" => tag
-            })))
+            base = base.merge("tag" => tag)
+            set << self.class.new(base)
           end
 
           set
@@ -151,8 +145,8 @@ module Docker
       #
 
       def metadata
-        return @metadata ||= begin
-          metadata = Template.repos_root.join(name)
+        @metadata ||= begin
+          metadata = Template.repo_root_for(name)
           metadata = Template.config.read_config_from(metadata)
           Metadata.new(metadata).merge(@base_metadata)
         end
@@ -172,7 +166,7 @@ module Docker
           "BUILD_TYPE" => type,
           "COPY" => copy_dir,
           "TAR" => tar_gz,
-          "TAG" => tag,
+          "TAG" => tag
         }).to_env
       end
     end

data/lib/docker/template/scratch.rb

@@ -77,7 +77,7 @@ module Docker
         # and stream the logs after it's exited if we have given no output,
         # we want you to always get the output that was given.
 
-        if !output_given
+        unless output_given
           img.streaming_logs "stdout" => true, "stderr" => true do |type, str|
             type == :stdout ? $stdout.print(str) : $stderr.print(Ansi.red(str))
           end
@@ -87,10 +87,7 @@ module Docker
           raise Error::BadExitStatus, status
         end
       ensure
-        if img
-          img.stop rescue nil
-          img.delete
-        end
+        img.tap(&:stop).delete("force" => true) if img
       end
 
       #
@@ -130,7 +127,7 @@ module Docker
       def start_args
         {
           "Binds" => [
-            "#{@copy.to_s}:#{@copy.to_s}:ro", "#{@tar_gz.to_s}:#{@tar_gz.to_s}"
+            "#{@copy}:#{@copy}:ro", "#{@tar_gz}:#{@tar_gz}"
           ]
         }
       end

data/lib/docker/template/simple.rb

@@ -14,17 +14,15 @@ module Docker
 
       def sync
         copy_build_and_verify unless @context
-        Util.create_dockerhub_context( \
-          self, @context)
+        Util.create_dockerhub_context(self, @context)
       end
 
       #
 
       def unlink(img: false, sync: true)
-        self.sync if sync && @repo.syncable?
         @img.delete "force" => true if @img && img
-        @context.rmtree if @context && \
-          @context.directory?
+        @context.rmtree if @context && @context.directory?
+        self.sync if sync && @repo.syncable?
       end
 
       #

data/lib/docker/template/stream.rb

@@ -6,7 +6,7 @@ module Docker
   module Template
     class Stream
       def initialize
-        @lines  = {}
+        @lines = {}
       end
 
       #
@@ -38,9 +38,9 @@ module Docker
         end
 
         before, diff = progress_diff(id)
-        $stdout.print  before if before
+        $stdout.print before if before
         str = stream["progress"] || stream["status"]
-        str = "%s: %s\r" % [id, str]
+        str = "#{id}: #{str}\r"
 
         $stdout.print(Ansi.jump(str, both: diff))
       end
@@ -49,12 +49,13 @@ module Docker
 
       private
       def progress_diff(id)
-        if @lines.has_key?(id)
+        if @lines.key?(id)
           return nil, @lines.size - @lines[id]
         end
 
         @lines[id] = @lines.size
         before = "\n" unless @lines.size == 1
+        # rubocop:disable RedundantReturn
         return before, 0
       end
     end

data/lib/docker/template/util.rb

@@ -4,7 +4,9 @@
 
 module Docker
   module Template
-    module Util module_function
+    module Util
+      module_function
+
       autoload :Copy, "docker/template/util/copy"
       autoload :Data, "docker/template/util/data"
 
@@ -24,15 +26,28 @@ module Docker
       #
 
       def create_dockerhub_context(builder, context)
-        tags = builder.repo.root.join("tags")
-        readme = builder.repo.root.children.select { |val| val.to_s =~ /readme/i }.first
-        context = tags.join(builder.repo.aliased) if builder.aliased?
-        dir = tags.join(builder.repo.tag)
-
+        dir = builder.repo.root.join("tags", builder.repo.tag)
+        context = get_context(builder, context)
         FileUtils.mkdir_p dir
-        $stdout.puts Ansi.yellow("Storing a Docker context for #{builder.repo}")
+
+        $stdout.puts Ansi.yellow("Copying context for #{builder.repo}")
+        Util::Copy.file(readme_file(builder), dir)
         Util::Copy.directory(context, dir)
-        Util::Copy.file(readme, dir)
+      end
+
+      #
+
+      def get_context(builder, context)
+        return context unless builder.aliased?
+        builder.repo.root.join("tags", builder.repo.aliased)
+      end
+
+      #
+
+      def readme_file(builder)
+        builder.repo.root.children.find do |val|
+          val.to_s =~ /readme/i
+        end
       end
     end
   end

data/lib/docker/template/util/copy.rb

@@ -8,7 +8,7 @@ module Docker
       class Copy
         def initialize(from, to)
           @root = Template.root.realpath
-          @repos_root = Template.repos_root.realpath
+          @repos_root = Template.repo_is_root?? Template.root.realpath : Template.repos_root.realpath
           @from = from.to_pathname
           @to = to.to_pathname
         end
@@ -30,18 +30,15 @@ module Docker
         def directory
           FileUtils.cp_r(@from.children, @to, :dereference_root => false)
           @from.all_children.select(&:symlink?).each do |path|
+            path = @to.join(path.relative_path_from(@from))
             resolved = path.realpath
-            pth = path.relative_path_from(@from)
-            pth = @to.join(path)
 
             unless in_path?(resolved)
-              raise Errno::EPERM, "#{pth} not in #{@root}"
+              raise Errno::EPERM, "#{path} not in #{@root}"
             end
 
-            FileUtils.rm_r(pth)
-            FileUtils.cp_r(resolved, pth, {
-              :dereference_root => false
-            })
+            FileUtils.rm_r(path)
+            FileUtils.cp_r(resolved, path, :dereference_root => false)
           end
         end
 
@@ -56,9 +53,7 @@ module Docker
         #
 
         def file
-          if !@from.symlink?
-            return FileUtils.cp(@from, @to)
-          end
+          return FileUtils.cp(@from, @to) unless @from.symlink?
 
           resolved = @from.realpath
           allowed = resolved.in_path?(@root)
@@ -73,8 +68,8 @@ module Docker
         private
         def in_path?(resolved)
           resolved.in_path?(@repos_root) || \
-          resolved.in_path?(@from.realpath) || \
-          resolved.in_path?(@root)
+            resolved.in_path?(@from.realpath) || \
+            resolved.in_path?(@root)
         end
       end
     end

data/lib/docker/template/util/data.rb

@@ -18,7 +18,7 @@ module Docker
         end
 
         def _binding
-          return binding
+          binding
         end
       end
     end

data/lib/docker/template/version.rb

@@ -4,6 +4,6 @@
 
 module Docker
   module Template
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jordon Bedwell