docker-template 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e1d29c866e7782965389da6801b3976f8c8334
-  data.tar.gz: 0a720ebb9dfd3cba920347471a9fefb0e7872fec
+  metadata.gz: 65d8ac03dfdfff807d45042ee8ef216ab95ed5e9
+  data.tar.gz: 5880b1219f93034e09a4aa2e1883b21613ceebcd
 SHA512:
-  metadata.gz: bd655e2e1a910899c3167638c1bd02ba7f4b552a5a90eeacc655f523073b1a3939ad579ee8633ab3c4bac37695307b7e3d9f965b54727075e35384c2eae14030
-  data.tar.gz: 0e36ded8704fe93fdb64bb0bfe6758a50fd108727b793866d3529b10759c33294da746870ffcd7008fc750bab776b4c4b3093b98318a740c8884d5bb79eac04f
+  metadata.gz: db84df63be77fc58635612412aad480149256d0bfe7d0c1091fe48e63c06b1253847992753ba8246f2e7f4c6060afc75406fe084ae493ecc07e9db930903a89a
+  data.tar.gz: 11fd17eb806960784b721c4b66f0849d484c924384a47b6fa539f4f5d5cdc253c3be37f8adfc3a30941faf8e0122c6cadb563cce4013949157b1054d8d0faa13

data/lib/docker/template/cli.rb

@@ -28,20 +28,18 @@ module Docker
       option :mocking,    :type => :boolean, :desc => "Disable Certain Actions."
       option :clean,      :type => :boolean, :desc => "Cleanup your caches."
 
+      # ----------------------------------------------------------------------
+      # rubocop:disable Lint/RescueException
       # ----------------------------------------------------------------------
 
       def build(*args)
         Build.new(args, options).start
+
       rescue Docker::Template::Error::StandardError => e
         $stderr.puts Simple::Ansi.red(e.message)
         exit e.respond_to?(:status) ? \
           e.status : 1
 
-      rescue Excon::Errors::SocketError
-        $stderr.puts "Unable to connect to your Docker Instance."
-        $stderr.puts "Are you absolutely sure that you have the Docker installed?"
-        abort "Unable to build your images."
-
       rescue Exception
         raise unless $ERROR_POSITION
         $ERROR_POSITION.delete_if do |source|
@@ -52,13 +50,12 @@ module Docker
       end
 
       # ----------------------------------------------------------------------
+      # rubocop:enable Lint/RescueException
       # docker-template list [options]
       # ----------------------------------------------------------------------
 
       desc "list [OPTS]", "List all possible builds."
 
-      # ----------------------------------------------------------------------
-      # rubocop:disable Metrics/AbcSize
       # ----------------------------------------------------------------------
 
       def list

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

@@ -19,23 +19,20 @@ module Docker
           end
         end
 
+        # --------------------------------------------------------------------
+        # rubocop:disable Metrics/AbcSize
         # --------------------------------------------------------------------
 
         def reselect_repos
           Template._require "rugged" do
-            git = Rugged::Repository.new(".")
-            repos_dir = Template.root.join(@opts.repos_dir)
-            walker = Rugged::Walker.new(git)
-            walker.push(git.last_commit)
-
-            repos = git.last_commit.parents.each_with_object(Set.new) do |parent, set|
-              git.last_commit.diff(parent).each_delta do |delta, file = delta.new_file[:path]|
-                if Pathutil.new(file).expand_path(Template.root).in_path?(repos_dir)
-                  set.merge(file.split("/").values_at(
-                    1
-                  ))
-                end
-              end
+            git = Rugged::Repository.new(Template.root.to_s)
+            dir = Template.root.join(@opts.repos_dir)
+
+            repos = git.last_commit.diff.each_delta.each_with_object(Set.new) do |delta, set|
+              next unless Pathutil.new(delta.new_file[:path]).expand_path(Template.root).in_path?(dir)
+              set.merge(delta.new_file[:path].split("/").values_at(
+                1
+              ))
             end
 
             @repos = @repos.select do |repo|
@@ -46,6 +43,8 @@ module Docker
           end
         end
 
+        # --------------------------------------------------------------------
+        # rubocop:enable Metrics/AbcSize
         # --------------------------------------------------------------------
 
         private

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

@@ -3,9 +3,7 @@ module Docker
     class CLI
       class List
         def self.build
-          return (
-            new.build
-          )
+          return new.build
         end
 
         # --------------------------------------------------------------------
@@ -19,7 +17,7 @@ module Docker
         def build
           out = ""
 
-          @images.group_by { |image| image.user }.each do |user, images|
+          @images.group_by(&:user).each do |user, images|
             out += "[user] " + Simple::Ansi.blue(user) + "\n" + repos(
               user, images
             )
@@ -33,7 +31,7 @@ module Docker
         def repos(user, images)
           out = ""
 
-          images.group_by { |image| image.name }.each do |name, image|
+          images.group_by(&:name).each do |name, _|
             out += "  ├─ [repo] " + Simple::Ansi.green(name) + "\n"
             out += tags(user, name, images)
             out += remote_aliases(
@@ -49,9 +47,7 @@ module Docker
         def tags(user, name, images)
           out = ""
 
-          images.select { |image| image.name == name && image.user == user \
-              && !image.alias? }.each do |image|
-
+          images.select { |image| image.name == name && image.user == user && !image.alias? }.each do |image|
             out += "  │  ├─ [tag] " + Simple::Ansi.magenta(image.tag) + "\n"
             out += aliases(
               user, name, image.tag, images
@@ -63,19 +59,22 @@ module Docker
 
         # --------------------------------------------------------------------
 
-        def remote_aliases(user, name, images)
+        def remote_aliases(*args)
           out = ""
 
-          images.select { |image| aliased_remote?(image) && image.user == user \
-              && image.name == name }.group_by { |image| image.metadata[:aliases][image.tag] \
-                }.each do |remote, images_|
+          remotes = _remote_aliases(*args).group_by do |image|
+            image.metadata[:aliases][
+              image.tag
+            ]
+          end
 
+          remotes.each do |remote, images_|
             out += "  │  ├─ [remote] "
             out += Simple::Ansi.yellow(remote)
             out += "\n"
 
             images_.each do |image|
-              out +=  "  │  │  ├─ [alias] "
+              out += "  │  │  ├─ [alias] "
               out += Simple::Ansi.yellow(
                 image.tag
               )
@@ -89,20 +88,31 @@ module Docker
 
         # --------------------------------------------------------------------
 
+        def _remote_aliases(user, name, images)
+          images.select do |image|
+            image.user == user && image.name == name && aliased_remote?(
+              image
+            )
+          end
+        end
+
+        # --------------------------------------------------------------------
+
         def aliases(user, name, tag, images, depth: 0)
           out = ""
 
           _aliases(user, name, tag, images).each do |alias_|
-            if alias_.name == name
-              name_ = Simple::Ansi.yellow(
-                alias_.tag
-              )
-
-            else
-              name_ = Simple::Ansi.yellow(
-                "#{alias_.name}:#{alias_.tag}"
-              )
-            end
+            name_ = \
+              if alias_.name == name
+                Simple::Ansi.yellow(
+                  alias_.tag
+                )
+
+              else
+                Simple::Ansi.yellow(
+                  "#{alias_.name}:#{alias_.tag}"
+                )
+              end
 
             out += "  │  │  #{"│  " * depth}├─ [alias] #{name_}\n"
             out += aliases(user, name, alias_.tag, images, {

data/lib/docker/template/metadata.rb

@@ -596,21 +596,23 @@ module Docker
 
       private
       def method_missing(method, *args, shell: false, &block)
-        key = method.to_s.gsub(/\?$/, "")
-        val = self[key] || self[key.singularize] \
-           || self[key.pluralize]
+        key  = method.to_s.gsub(/\?$/, "")
+        val  = self[key] || self[key.singularize] \
+                || self[key.pluralize]
 
         if !args.empty? || block_given?
           super
 
         elsif method !~ /\?$/
-          string_wrapper(
-            val, :shell => shell
-          )
+          string_wrapper(val, {
+            :shell => shell
+          })
 
         else
-          val != false && !val.nil? && (val == true || (val \
-            && val.is_a?(String) && !val.empty?))
+          [true, false].include?(val) ? val : \
+            if val.respond_to?(:empty?)
+              then !val.empty? else !!val
+            end
         end
       end
 

data/lib/docker/template/version.rb

@@ -6,6 +6,6 @@
 
 module Docker
   module Template
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

metadata

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