dockit 1.5.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c40987081b98c965edfea96bb2a0cc7ab63af9d
-  data.tar.gz: 0d971302e111c506db391ca58dd645639c026c14
+  metadata.gz: ef7365a09071c0358f23ed17ed670b15bd9f3f91
+  data.tar.gz: 062246eb13c406ba75125f815d95b45b0bc17268
 SHA512:
-  metadata.gz: 8134542caaba7a54ecc86af187e00dcb90961bd7b86c7be612a6f2dd960e1ac6a1a146ea0ad7a1a5117a0d079ce1479bbd9270769810ec5bdc9d3ab66cd16e54
-  data.tar.gz: 9de444276285f5bea7eb2b10ea85a5d5b6b60585836a2fd53adde70820d3246c84384fdade0b5e37d888d028143c9a6714a51a4eabd3a78f2ef80b475ea7bbeb
+  metadata.gz: d71b2c9f2af87dd739037fe54dee9de742b4de441f47f5f83c7e21381a6ce14b60a39f046e855794a825445dc64ddb2e84d134e28eb84a836c84c71ef513578e
+  data.tar.gz: 71fdb7a5879d9ec895bfe9f60315d7720d020b11ba76e27d761e9b94738be8624e621152303c0ba52d8adb164f2632ef5abac8a02a28cb752f3eb716b0e2c746

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.8.0

data/lib/dockit.rb

@@ -16,6 +16,26 @@ module Dockit
     def debug(msg)
       $stderr.puts "DEBUG: " + msg.join(' ')
     end
+
+    def self.print_chunk(chunk)
+      begin
+        chunk = JSON.parse(chunk)
+      rescue Docker::Error::UnexpectedResponseError => e
+        $stderr.puts "Response parse error:", e.message, chunk
+      end
+
+      progress = chunk['progress']
+      id = progress ? '' : chunk['id']
+      $stdout.puts(
+        if chunk['errorDetail']
+          'ERROR: ' +  chunk['errorDetail']['message']
+        elsif chunk['stream']
+          chunk['stream']
+        else
+          [chunk['status'], id, progress, progress ? "\r" : "\n"].join(' ')
+        end
+      )
+    end
   end
 
   # This class encapsulates the environment used in the Dockit cli.

data/lib/dockit/cli.rb

@@ -42,7 +42,7 @@ class Default < Thor
   class_option :locals, type: :hash, aliases: ['l'],
                banner: "key:value [key:value ...]",
                desc: "variables to pass to yaml file."
-  class_option :timeout, type: :numeric, desc: 'Timeout for excon', default: 60
+  class_option :timeout, type: :numeric, desc: 'Timeout for excon', default: 180
 
   def initialize(*args)
     super
@@ -52,7 +52,7 @@ class Default < Thor
     Docker.options[:read_timeout] = options.timeout
 
     unless @@root_echoed
-      puts "Project root: #{dockit.root}"
+      say "Project root: #{dockit.root}", :red
       @@root_echoed=true
     end
   end
@@ -125,10 +125,16 @@ class Default < Thor
   option :containers, type: :boolean, default: true , desc: "remove exited containers"
   option :volumes   , type: :boolean, default: true , desc: 'remove dangling volumes'
   option :force     , type: :boolean, default: false, desc: "stop and remove all"
+  option 'except-containers', type: :array, desc: "container names to leave if :force", aliases: %[C]
+  option 'except-images', type: :array, desc: "image tags (name:version) to leave if :force", aliases: %[I]
+
   def cleanup
     force = options[:force]
-    Dockit::Container.clean(force: force) if options[:containers]
-    Dockit::Image.clean(force: force)     if options[:images]
+    Dockit::Container.clean(
+      force: force, except: options['except-containers']) if options[:containers]
+
+    Dockit::Image.clean(
+      force: force, except: options['except-images']) if options[:images]
 
     if options[:volumes] && Docker.version['ApiVersion'].to_f >= 1.21
       Dockit::Volume.clean
@@ -171,10 +177,30 @@ class Default < Thor
   desc 'git-build', 'build from git (gem) repository'
   option :branch, desc: '<tree-ish> git reference', default: 'master'
   option :gem, type: :boolean, desc: "update Gemfiles export"
+  option :package, type: :boolean, desc: "update package config export"
+  long_desc <<-LONGDESC
+     Dockit.yaml keys used:
+     \x5 repos_path: optional treeish path
+     \x5 repos: repository location
+     \x5 package: optional (default 'Gemfile*')
+
+    `dockit git-build` will export {branch}:repos_path from the
+     repository location specified in the :repos key to 'repos.tar.gz'
+
+     The '--package' option will export the files in the :package key (or
+     Gemfile*) in Dockit.yaml separately to 'package.tar.gz'. This is docker
+     best practice for building rails apps.
+
+     *Note* The default (Gemfile*) will be removed in version 2.0.
+
+     The deprecated '--gem' option is will export the packages to
+     'gemfile.tar.gz'.
+  LONGDESC
+
   def git_build(service=nil)
     exec(service) do |s|
       unless repos = s.config.get(:repos)
-        say "'repos' not defined in config file. Exiting",:red
+        say "'repos' not defined in config file. Exiting", :red
         exit 1
       end
       path    = s.config.get(:repos_path)
@@ -185,10 +211,12 @@ class Default < Thor
                 end
       say "Exporting in #{Dir.pwd}", :green
       say "<- #{repos} #{treeish}", :green
-      if options.gem
-        # grab the Gemfiles separately for the bundler Dockerfile hack
-        say "-> Gemfiles", :green
-        export(repos, treeish, 'gemfile.tar.gz', 'Gemfile*')
+
+      if options.gem || options.package
+        packages = s.config.get(:package) || 'Gemfile*'
+        archive  = options.gem ? 'gemfile.tar.gz' : 'package.tar.gz'
+        say "-> #{archive}", :green
+        export(repos, treeish, archive, packages)
       end
 
       say "-> repos.tar.gz", :green

data/lib/dockit/container.rb

@@ -7,13 +7,20 @@ module Dockit
         Docker::Container.all(all: all, filters: JSON.dump(filters))
       end
 
-      def clean(force: false)
+      def clean(force: false, except: [])
         puts "Containers..."
+        except = (except||[]).map { |e| "/#{e}"}
+
         list(
           all: force,
           filters: force ? nil : {status: [:exited]}
         ).each do |container|
+          names = container.info['Names']
           puts "  #{container.id}"
+          if (names & except).count > 0
+            puts "  ... skipping #{names}"
+            next
+          end
           container.delete(force: true, v: force)
         end
       end

data/lib/dockit/image.rb

@@ -14,16 +14,16 @@ module Dockit
         end
         repos = config['t']
         puts  "Building #{repos}"
-        image = Docker::Image.build_from_dir('.', config) do |chunk|
-          begin
-            chunk = JSON.parse(chunk)
-            progress = chunk['progress']
-            id = progress ? '' : chunk['id']
-            print chunk['stream'] ? chunk['stream'] :
-                    [chunk['status'], id, progress, progress ? "\r" : "\n"].join(' ')
-          rescue
-            puts chunk
+        begin
+          image = Docker::Image.build_from_dir('.', config) do |chunk|
+            Dockit::Log.print_chunk(chunk)
           end
+        rescue Docker::Error::TimeoutError => e
+          $stderr.puts '* Read timeout, try again with a larger "--timeout"'
+          exit 1
+        rescue Docker::Error::UnexpectedResponseError => e
+          $stderr.puts 'Build error, exiting.'
+          exit 1
         end
 
         image
@@ -33,13 +33,20 @@ module Dockit
         Docker::Image.get(name)
       end
 
-      def clean(force: false)
+      def clean(force: false, except: [])
+        except ||= []
         puts "Images..."
         list(
           all: force,
           filters: force ? nil : {dangling: ['true']}
         ).each do |image|
+          names = image.info["RepoTags"]
           puts "  #{image.id}"
+          if (names & except).count > 0
+            puts "  ... skipping #{names}"
+            next
+          end
+
           image.remove(force: true)
         end
       end

data/lib/dockit/service.rb

@@ -61,14 +61,10 @@ module Dockit
       end
 
       name = "#{registry}/#{repo}"
-      image = Docker::Image.create(
-        fromImage: name) do |chunk|
-        chunk = JSON.parse(chunk)
-        progress = chunk['progress']
-        id = progress ? '' : chunk['id']
-        print chunk['stream'] ? chunk['stream'] :
-                [chunk['status'], id, progress, progress ? "\r" : "\n"].join(' ')
+      image = Docker::Image.create(fromImage: name) do |chunk|
+        Dockit::Log::print_chunk(chunk)
       end
+
       puts "Tagging #{name} as #{repo}:#{tag||'latest'}"
       image.tag(repo: repo, tag: tag, force: force)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler