docker-template 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ab5af00f7a613c19f9dc69c35fa5213e4d8ec1ea8f535a5114f2d9600b14a6
-  data.tar.gz: 80d15462ac2b38f3a8b01e0c1d45e315f4c5b608af97f17c78a0498af4de9649
+  metadata.gz: 9c619f82805d6347fc614a212828d5bcb1b185783171a771c2720c9f277c175a
+  data.tar.gz: d1dc93f95b9f840b82e5d4d29017d7b681660a1f3921626d128f140508676c21
 SHA512:
-  metadata.gz: c34c91d94b3b341cad25d5be242e8fef2d565b16f1b6f19a72846dfe006e02260c485c9f6f27c55393dfb7c0aa079d9c5f0212f44526b1db1233d8fb2835841a
-  data.tar.gz: 34c2673aeeb6ab68055417a6c6a53e5d7bef9d85fa86f673d29b89fa898b98326bbc8305817663a06d3ee607f7bf8025e7da5b93d77dcfa727c620b0de2fbe37
+  metadata.gz: 10fa2829cfb98fb41a19dfbd92ef71926024c4e0e3bee74d2950823e7cd397e8fcca4728d56e0b1bec89a37b1a2951f573329ebe513646d267c290d5d0e01570
+  data.tar.gz: 97c360cb05d1356f81189bc226228fb57d0f16e946f84b886c16b8e6dec78d410253a39289d03a29511ff10e89adbdb3a67bffaa2e786610ee1497d9a77e964a

data/Rakefile

@@ -1,130 +1,12 @@
 # Frozen-string-literal: true
-# Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
+# Copyright: 2017 - 2018 - MIT License
+# Source: https://github.com/envygeeks/devfiles
+# Author: Jordon Bedwell
 # Encoding: utf-8
 
-$LOAD_PATH.unshift(File.expand_path(
-  "../lib", __FILE__
-))
-
-# --
-
-require "simple/ansi"
-require "rspec/core/rake_task"
-require "docker/template/cli"
-require "open3"
-
-# --
-
-task :default => [:spec]
-RSpec::Core::RakeTask.new :spec
-task :test => :spec
-
-# --
-# TODO: Cleanup and remove this whenever you can.
-# --
-module CompList
-  module_function
-
-  # --
-  # Update the pak file to have all the completions.
-  # --
-  def update(data = get_commands, msgp = data.to_msgpack)
-    pak_file.binwrite(
-      msgp
-    )
-  end
-
-  # --
-
-  def normalize_command(command)
-    if command.is_a?(Array)
-      then command.map do |key|
-        key.tr(
-          "_", "-"
-        )
-      end
-    else
-      command.tr(
-        "_", "-"
-      )
-    end
-  end
-
-  # --
-  # Provides the base "_reply" for your auto-complete data output.
-  # --
-  def base(const, skip = %w(help))
-    keys = const.all_commands.keys
-    return "_reply" => normalize_command(keys), "help" => {
-      "_reply" => normalize_command(keys) - skip
-    }
-  end
-
-  # --
-
-  def add_opts(out, const)
-    const.all_commands.each do |key, val, command = normalize_command(key)|
-      val.options.map do |_, opt|
-        out[command] ||= { "_reply" => [] }
-        ary = out[command][
-          "_reply"
-        ]
-
-        if !opt.boolean?
-          ary << "#{
-            opt.switch_name
-          }="
-
-        else
-          ary << opt.switch_name
-          ary << "--no-#{opt.switch_name.gsub(
-            /\A--/, ""
-          )}"
-        end
-
-        ary | opt.aliases
-      end
-    end
-
-    out
-  end
-
-  # --
-  # Recursively pulls out and set's up your commands and opts.
-  # --
-  def get_commands(const = Docker::Template::CLI)
-    out = base(
-      const
-    )
-
-    const.subcommands.each do |key, command = normalize_command(key)|
-      const_list = const.to_namespace.push(command.to_namespace)
-      out[command] = send(__method__, Thor::Namespace.resolv(
-        const_list
-      ))
-    end
-
-    add_opts(
-      out, const
-    )
-  end
-
-  # --
-
-  def pak_file
-    Pathutil.new("comp/list.pak").expand_path.tap(
-      &:touch
-    )
-  end
-end
-
-# --
-
-namespace :update do
-  desc "Update the completion list."
-  task "comp-list" do
-    require "msgpack"
-    require "docker/template"
-    CompList.update
-  end
+task default: [:spec]
+task(:spec) { exec "script/test" }
+task(:test) { exec "script/test" }
+Dir.glob("script/rake.d/*.rake").each do |v|
+  load v
 end

data/lib/docker/template.rb

@@ -35,7 +35,7 @@ module Docker
 
     def root
       @root ||= begin
-        Pathutil.new(Dir.pwd)
+        Pathutil.new(Dir.pwd).realpath
       end
     end
 
@@ -78,26 +78,22 @@ module Docker
     def _require(what)
       require what
       if block_given?
-        yield
+        yield true
       end
-
     rescue LoadError
-      $stderr.puts "The gem '#{what}' wasn't found."
-      $stderr.puts "You can install it with `gem install #{what}'"
-      abort "Hope you install it so you can report back."
+      if block_given?
+        yield false
+      end
     end
 
     # --
 
     def tmpdir
       if ENV["DOCKER_TEMPLATE_TMPDIR"]
-        # Don't destroy a user created directory.
-        return Pathutil.new(ENV["DOCKER_TEMPLATE_TMPDIR"]).tap(
-          &:mkdir_p
-        )
+        dir = Pathutil.new(ENV["DOCKER_TEMPLATE_TMPDIR"])
+          .tap(&:mkdir_p)
       else
         dir = root.join("tmp")
-
         if !dir.exist?
           # Make the directory and then throw it out at exit.
           dir.mkdir_p; ObjectSpace.define_finalizer(dir, proc do
@@ -107,6 +103,8 @@ module Docker
 
         dir
       end
+
+      dir.realpath
     end
   end
 end

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

@@ -39,7 +39,9 @@ module Docker
         # --
 
         def changed!
-          Template._require "rugged" do
+          Template._require "rugged" do |loaded|
+            return true unless loaded
+
             git = Rugged::Repository.new(Template.root.to_s)
             dir = Template.root.join(@opts.repos_dir)
 

data/lib/docker/template/repo.rb

@@ -143,10 +143,9 @@ module Docker
       # --
 
       def tmpdir(*args, root: Template.tmpdir)
-        args.unshift(user, name, tag)
-        Pathutil.tmpdir(
-          args, nil, root
-        )
+        args.unshift(user.gsub(/[^A-Za-z0-9_\-]+/, "--"), name, tag)
+        out = Pathutil.tmpdir(args, nil, root)
+        out.realpath
       end
 
       # --

data/lib/docker/template/version.rb

@@ -4,6 +4,6 @@
 
 module Docker
   module Template
-    VERSION = "0.19.0"
+    VERSION = "0.20.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,20 +114,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rugged
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.25.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.25.1
 description: Build and template awesome Docker images a variety of ways.
 email:
 - jordon@envygeeks.io
@@ -187,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build and template Docker images a variety of ways.