dockit 1.8.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef7365a09071c0358f23ed17ed670b15bd9f3f91
-  data.tar.gz: 062246eb13c406ba75125f815d95b45b0bc17268
+  metadata.gz: c028879bc5c35215d74edc86f94c914e6995ae74
+  data.tar.gz: a3ff836fa1b0459a361e201fee8e0c9a3be75029
 SHA512:
-  metadata.gz: d71b2c9f2af87dd739037fe54dee9de742b4de441f47f5f83c7e21381a6ce14b60a39f046e855794a825445dc64ddb2e84d134e28eb84a836c84c71ef513578e
-  data.tar.gz: 71fdb7a5879d9ec895bfe9f60315d7720d020b11ba76e27d761e9b94738be8624e621152303c0ba52d8adb164f2632ef5abac8a02a28cb752f3eb716b0e2c746
+  metadata.gz: e2b680e81a2939e67248af511bf995e76b52c81bb3dcc6021e1e0ead4861f12d0ed2809c23e76b6c6621e4712ff3986d04da829cac76725349070bdb49db8022
+  data.tar.gz: f4cfdfa504680b59061780d8610d6fa5779ebb1e34a938f0162e3e9244ca528561d03a2a724c010a023548bb03d2f705a3306bd96399a2826d5efb41d43bb0f3

data/Dockerfile

@@ -1,5 +1,5 @@
-FROM cybercode/alpine-ruby:2.2
-ENV DOCKER_VERSION=1.9.1 BIN=/usr/local/bin/docker
+FROM cybercode/alpine-ruby:2.3
+ENV DOCKER_VERSION=1.11.1 BIN=/usr/local/bin/docker
 
 RUN apk --update add curl ruby-json && curl -sSL -o $BIN \
     https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION \

data/VERSION

@@ -1 +1 @@
-1.8.0
+2.0.1

data/lib/dockit.rb

@@ -16,28 +16,37 @@ 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
+    class << self
+      # new docker app (xhyve) returns multi-line (multiple JSON hash) chunks.
+      # So, split them up before trying to parse them.
+      def print_chunk(chunk)
+        chunk.each_line { |c| print_one_chunk(c) }
       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(' ')
+      private
+      def print_one_chunk(chunk)
+        begin
+          chunk = JSON.parse(chunk)
+        rescue Docker::Error::UnexpectedResponseError => e
+          $stderr.puts "Unexpected response:", e.message, chunk
+        rescue JSON::ParserError
+          $stderr.puts "Parse Error: #{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
   end
-
   # This class encapsulates the environment used in the Dockit cli.
   # The class has three main attributes:
   #

data/lib/dockit/cli.rb

@@ -1,7 +1,10 @@
+# coding: utf-8
 require 'io/console'
 require 'thor'
 require 'dockit'
 
+GIT_BRANCH=`git symbolic-ref --short HEAD 2>/dev/null`.chomp
+
 class SubCommand < Thor
   no_commands do
     # invoke command against the Dockit.yaml for the given service.
@@ -124,17 +127,21 @@ class Default < Thor
   option :images    , type: :boolean, default: true , desc: "remove danging images"
   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]
-
+  option 'force-containers', type: :boolean, default: false,
+         desc: 'stop and remove all containers', aliases: %[f]
+  option 'except-containers', type: :array,
+         desc: "container names to leave if 'force-containers' true", aliases: %[C]
+  option 'force-images', type: :boolean, default: false, desc: 'remove ALL volumes'
+  option 'except-images', type: :array,
+         desc: "image tags (name:version) to leave if 'force-images' true", aliases: %[I]
   def cleanup
-    force = options[:force]
     Dockit::Container.clean(
-      force: force, except: options['except-containers']) if options[:containers]
+      force: options['force-containers'], except: options['except-containers']
+    ) if options[:containers]
 
     Dockit::Image.clean(
-      force: force, except: options['except-images']) if options[:images]
+      force: options['force-images'], except: options['except-images']
+    ) if options[:images]
 
     if options[:volumes] && Docker.version['ApiVersion'].to_f >= 1.21
       Dockit::Volume.clean
@@ -149,6 +156,7 @@ class Default < Thor
       say s.config.instance_variable_get('@config').to_yaml
     end
   end
+
   desc 'push REGISTRY [SERVICE]', 'push image for SERVICE to REGSITRY'
   option :force, type: :boolean, desc: 'overwrite current lastest version'
   option :tag,  desc: 'repos tag (defaults to "latest")', aliases: ['t']
@@ -175,32 +183,29 @@ class Default < Thor
   end
 
   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 :branch, desc: '<tree-ish> git reference', default: GIT_BRANCH
   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*')
+     \x5 package: optional
 
     `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.
+     The '--package' option will export the files in the :package key 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'.
+     *Breaking change (2.0)* ~branch~ now defaults to the *current* local
+      branch, not ~master~.
   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)
@@ -212,8 +217,12 @@ class Default < Thor
       say "Exporting in #{Dir.pwd}", :green
       say "<- #{repos} #{treeish}", :green
 
-      if options.gem || options.package
-        packages = s.config.get(:package) || 'Gemfile*'
+      if options.package
+        unless packages = s.config.get(:package)
+          say "'packages' not defined in config file. Exiting…", :red
+          exit 1
+        end
+
         archive  = options.gem ? 'gemfile.tar.gz' : 'package.tar.gz'
         say "-> #{archive}", :green
         export(repos, treeish, archive, packages)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A configuration manager and builder for docker projects.
@@ -207,3 +207,4 @@ test_files:
 - spec/dockit/simple.yaml
 - spec/dockit_spec.rb
 - spec/spec_helper.rb
+has_rdoc: