docker-template 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b075d40fa03bed4ef57a9a788c53c778a60cb053
-  data.tar.gz: b8183048b12f4547fd711e0e96ac08bc543e3cd5
+  metadata.gz: 1c347557d3339e68e700c711c0d6707864e952d4
+  data.tar.gz: 832e334ab66bc3da1fe09b380dbc11e8adb047d1
 SHA512:
-  metadata.gz: df02551d54168a59d5095d51f0a1f4763a07e4a16c953c40b3b4597c34941b03dc735451e043a30cd434acff0e6184e0cdcd7653b82492ad085bf31df4640f9e
-  data.tar.gz: 0fa1f9443e84aff442fe796df646ab06f44822ebbb1f4397d92b42988539c09b2a3ede58afa8f2bf56e2664cf993d1d51daebc285bc525aa5cc65c70b2827318
+  metadata.gz: dc72edadc7b070001a11e408deb478bc1c034bba062667df22a5861d4de712595a13dbbbab5632bdd46765c2d3ee8047cfbbf101f2180614a434d1ef05c76f8d
+  data.tar.gz: e8ec4681fa1f842d7d128b639d04ff03f3a3a0236d2dce497fc0c02786ddcbfd5c7b0a29a7f1447c2340e855b03eb6625e7d9ce30a64aeba4c4c4035d4ba160b

data/Gemfile

@@ -10,10 +10,11 @@ gemspec
 
 group :test do
   gem "rspec", :require => false
-  gem "memory_profiler", :require => false
   gem "luna-rspec-formatters", :require => false
   gem "codeclimate-test-reporter", :require => false
+  gem "memory_profiler", :require => false, :platform => :mri
   gem "rubocop", :github => "bbatsov/rubocop", :branch => :master, :require => false
+  gem "rugged", :require => false, :platform => :mri
   gem "luna-rubocop-formatters", :require => false
   gem "benchmark-ips", :require => false
   gem "rspec-helpers", :require => false
@@ -28,12 +29,3 @@ group :development do
     }
   end
 end
-
-group :travis, :optional => true do
-  gem "travis"
-end
-
-group :site, :optional => true do
-  gem "jekyll-assets", :github => "jekyll/jekyll-assets"
-  gem "jekyll", :github => "jekyll/jekyll"
-end

data/README.md

@@ -10,76 +10,4 @@
 [coverage]: https://codeclimate.com/github/envygeeks/docker-template/coverage
 [travis]: https://travis-ci.org/envygeeks/docker-template
 
-Docker Template is an organization and templating system for Docker images. A way to make your life easier and more organized by having repositories within repositories that share data among multiple sets of images.  It is currently used to build all the images for Jekyll and EnvyGeeks.  To see the full docs instead of synapsis and snippets please visit https://github.com/envygeeks/docker-template/tree/master/docs
-
-<!-- TOC depthFrom:1 depthTo:6 withLinks:1 updateOnSave:1 orderedList:0 -->
-
-- [Docker Template](#docker-template)
-	- [Installation](#installation)
-	- [[Organization](https://github.com/envygeeks/docker-template/tree/master/docs/organization.md)](#organizationhttpsgithubcomenvygeeksdocker-templatetreemasterdocsorganizationmd)
-	- [[Metadata](https://github.com/envygeeks/docker-template/tree/master/docs/metadata.md)](#metadatahttpsgithubcomenvygeeksdocker-templatetreemasterdocsmetadatamd)
-	- [[Normal](https://github.com/envygeeks/docker-template/tree/master/docs/templates/normal.md)](#normalhttpsgithubcomenvygeeksdocker-templatetreemasterdocstemplatesnormalmd)
-	- [[Scratch](https://github.com/envygeeks/docker-template/tree/master/docs/templates/scratch.md)](#scratchhttpsgithubcomenvygeeksdocker-templatetreemasterdocstemplatesscratchmd)
-	- [[Copy/](https://github.com/envygeeks/docker-template/tree/master/docs/copy.md)](#copyhttpsgithubcomenvygeeksdocker-templatetreemasterdocscopymd)
-	- [Commands](#commands)
-		- [Build](#build)
-		- [List](#list)
-
-<!-- /TOC -->
-
-## Installation
-
-```bash
-sudo gem install docker-template  
-```
-
-From Gemfile
-
-```ruby
-gem "docker-template", {
-  :github => "envygeeks/docker-template"
-}
-```
-
-<!--
-## [Organization](https://github.com/envygeeks/docker-template/tree/master/docs/organization.md)
-## [Metadata](https://github.com/envygeeks/docker-template/tree/master/docs/metadata.md)
-## [Normal](https://github.com/envygeeks/docker-template/tree/master/docs/templates/normal.md)
-## [Scratch](https://github.com/envygeeks/docker-template/tree/master/docs/templates/scratch.md)
-## [Copy/](https://github.com/envygeeks/docker-template/tree/master/docs/copy.md)
--->
-
-## Commands
-
-### Build
-
-You can build a template by sending either `image`, `user/image`, `image:tag` or `user/image:tag`: `docker-template build image`.  Build supports the following arguments:
-
-```
-Usage:
-  docker-template build [REPOS [OPTS]]
-
-Options:
-  [--cache-only], [--no-cache-only]  # Only cache your repositories, don't build.
-  [--clean-only], [--no-clean-only]  # Only clean your repositories, don't build.
-  [--push-only], [--no-push-only]    # Only push  your repositories, don't build.
-  [--profile], [--no-profile]        # Profile Memory.
-  [--tty], [--no-tty]                # Enable TTY Output.
-  [--push], [--no-push]              # Push Repo After Building.
-  [--cache], [--no-cache]            # Cache your repositories to cache.
-  [--mocking], [--no-mocking]        # Disable Certain Actions.
-  [--clean], [--no-clean]            # Cleanup your caches.
-
-Build all (or some) of your repositories
-```
-
-***You can send as many repos/images as you like, or you can send none, the lack of any repos/images will result in all of the possible images being built from your repos/ folder.  This is good for automated building. NOTE: When building images we sort them, in that scratch images are built first, normal images are built second and aliases are done last, so that if you have dependencies within your dependencies hopefully they will get built first, however this is not always likely if your images rely on another normal image.  In that case you might want to send a manual list for us.***
-
-### List
-
-You can get a list of the possible images that can be built, an example:
-
-```
-envygeeks/alpine:3.3
-envygeeks/alpine:latest -> envygeeks/alpine:3.3
-```
+Docker Template is an organization and templating system for Docker images. A way to make your life easier and more organized by having repositories within repositories that share data among multiple sets of images.  It is currently used to build all the images for Jekyll and EnvyGeeks.  Please see https://github.com/envygeeks/docker-template/wiki for documentation.

data/lib/docker/template.rb

@@ -81,6 +81,20 @@ module Docker
         data._binding
       )
     end
+
+    # ------------------------------------------------------------------------
+
+    def _require(what)
+      require what
+      if block_given?
+        yield
+      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."
+    end
   end
 end
 

data/lib/docker/template/cli.rb

@@ -9,12 +9,15 @@ require "thor"
 module Docker
   module Template
     class CLI < Thor
+      autoload :Build, "docker/template/cli/build"
+      autoload :List,  "docker/template/cli/list"
 
       # ----------------------------------------------------------------------
       # docker-template build [repos [opts]]
       # ----------------------------------------------------------------------
 
       desc "build [REPOS [OPTS]]", "Build all (or some) of your repositories"
+      option :diff,       :type => :boolean, :desc => "Build only modified repositories."
       option :cache_only, :type => :boolean, :desc => "Only cache your repositories, don't build."
       option :clean_only, :type => :boolean, :desc => "Only clean your repositories, don't build."
       option :push_only,  :type => :boolean, :desc => "Only push  your repositories, don't build."
@@ -28,14 +31,24 @@ module Docker
       # ----------------------------------------------------------------------
 
       def build(*args)
-        with_profiling do
-          Parser.new(args, options).parse.tap { |o| o.map(&:build) } \
-            .uniq(&:name).map(&:clean)
-        end
-
+        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
+        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|
+          source =~ %r!#{Regexp.escape(
+            __FILE__
+          )}!o
+        end
       end
 
       # ----------------------------------------------------------------------
@@ -43,83 +56,15 @@ module Docker
       # ----------------------------------------------------------------------
 
       desc "list [OPTS]", "List all possible builds."
-      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.to_s.gsub(/^[^\/]+\//, "")
-          next unless (only.is_a?(Regexp) && repo_s =~ only) \
-            || (only && repo_s == only) || !only
-
-          $stderr.print repo.to_s
-          $stderr.print " -> ", repo.aliased.to_s, "\n" if repo.alias?
-          $stderr.puts unless repo.alias?
-        end
-      end
-
-      # ----------------------------------------------------------------------
-      # rubocop:enable Metrics/AbcSize
-      # ----------------------------------------------------------------------
-
-      no_tasks do
-        def only
-          return @only ||= begin
-            if !options.grep?
-              then options[
-                :only
-              ]
-
-            elsif options.only?
-              Regexp.new(options[
-                :only
-              ])
-            end
-          end
-        end
-
-        # --------------------------------------------------------------------
-        # When a user wishes to profile their builds to see memory being used.
-        # rubocop:disable Lint/RescueException
-        # --------------------------------------------------------------------
-
-        def with_profiling
-          if options.profile?
-            begin
-              require "memory_profiler"
-              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'"
-              abort "Hope you install it so you can report back."
-            end
-
-          else
-            yield
-          end
-
-        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|
-            source =~ %r!#{Regexp.escape(
-              __FILE__
-            )}!o
-          end
-
-          raise
-        end
+        return $stdout.puts(
+          List.build
+        )
       end
     end
   end

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

@@ -0,0 +1,64 @@
+module Docker
+  module Template
+    class CLI
+      class Build
+        def initialize(args, opts)
+          @opts = Metadata.new(opts || {})
+          @repos = Parser.new(args, opts || {}).parse
+          @args = args
+        end
+
+        # --------------------------------------------------------------------
+
+        def start
+          _profile do
+            reselect_repos if @opts.diff?
+            @repos.tap { |o| o.map(&:build) }.uniq(&:name).map(
+              &:clean
+            )
+          end
+        end
+
+        # --------------------------------------------------------------------
+
+        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
+            end
+
+            @repos = @repos.select do |repo|
+              repos.include?(
+                repo.name
+              )
+            end
+          end
+        end
+
+        # --------------------------------------------------------------------
+
+        private
+        def _profile
+          return yield unless @opts.profile?
+          Template._require "memory_profiler" do
+            profiler = MemoryProfiler.report(:top => 10_240) { yield }
+            profiler.pretty_print({
+              :to_file => "profile.txt"
+            })
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,136 @@
+module Docker
+  module Template
+    class CLI
+      class List
+        def self.build
+          return (
+            new.build
+          )
+        end
+
+        # --------------------------------------------------------------------
+
+        def initialize(images = Parser.new([], {}).parse)
+          @images = images
+        end
+
+        # ------------------------------------------------------------------------
+
+        def build
+          out = ""
+
+          @images.group_by { |image| image.user }.each do |user, images|
+            out += "[user] " + Simple::Ansi.blue(user) + "\n" + repos(
+              user, images
+            )
+          end
+
+          out
+        end
+
+        # ------------------------------------------------------------------------
+
+        def repos(user, images)
+          out = ""
+
+          images.group_by { |image| image.name }.each do |name, image|
+            out += "  ├─ [repo] " + Simple::Ansi.green(name) + "\n"
+            out += tags(user, name, images)
+            out += remote_aliases(
+              user, name, images
+            )
+          end
+
+          out
+        end
+
+        # --------------------------------------------------------------------
+
+        def tags(user, name, images)
+          out = ""
+
+          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
+            )
+          end
+
+          out
+        end
+
+        # --------------------------------------------------------------------
+
+        def remote_aliases(user, name, images)
+          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_|
+
+            out += "  │  ├─ [remote] "
+            out += Simple::Ansi.yellow(remote)
+            out += "\n"
+
+            images_.each do |image|
+              out +=  "  │  │  ├─ [alias] "
+              out += Simple::Ansi.yellow(
+                image.tag
+              )
+
+              out += "\n"
+            end
+          end
+
+          out
+        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
+
+            out += "  │  │  #{"│  " * depth}├─ [alias] #{name_}\n"
+            out += aliases(user, name, alias_.tag, images, {
+              :depth => depth + 1
+            })
+          end
+
+          out
+        end
+
+        # --------------------------------------------------------------------
+
+        private
+        def aliased_remote?(image)
+          return image.alias? && !image.aliased
+        end
+
+        # --------------------------------------------------------------------
+
+        private
+        def _aliases(user, name, tag, images)
+          images.select do |image|
+            image.alias? && image.aliased && image.aliased.tag == tag \
+              && image.aliased.name == name && image.aliased.user \
+                == user
+          end
+        end
+      end
+    end
+  end
+end

data/lib/docker/template/metadata.rb

@@ -609,8 +609,8 @@ module Docker
           )
 
         else
-          val != false && !val.nil? && \
-            !val.empty?
+          val != false && !val.nil? && (val == true || (val \
+            && val.is_a?(String) && !val.empty?))
         end
       end
 

data/lib/docker/template/parser.rb

@@ -73,7 +73,7 @@ module Docker
       # ----------------------------------------------------------------------
 
       def self.to_repo_hash(val)
-        data = val.split(SPLIT_REGEXP)
+        data = val.to_s.split(SPLIT_REGEXP)
 
         return "name" => data[0] if data.one?
         return "name" => data[0], "tag"  => data[1] if val =~ COLON_REGEXP && data.size == 2

data/lib/docker/template/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,6 +128,8 @@ files:
 - lib/docker/template/builder.rb
 - lib/docker/template/cache.rb
 - lib/docker/template/cli.rb
+- lib/docker/template/cli/build.rb
+- lib/docker/template/cli/list.rb
 - lib/docker/template/error.rb
 - lib/docker/template/logger.rb
 - lib/docker/template/metadata.rb