dockit 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb9ef80e217d354aa287ad542609c0087e524e1
-  data.tar.gz: 774710fc1021b62bd9407bbe0a6b2bfa08ce2d7d
+  metadata.gz: 335814d19b9f36964209e3a50959e0098d372597
+  data.tar.gz: 4aa02282be6cf26cd9c0b03569fa6b78e4a08797
 SHA512:
-  metadata.gz: 5f180dd8963035ae2c04a69cbd250858e033ec3f4a08686e2c183e0d00e822e401e644402b57b1ee4cd5fdb40041c1ff5fd9ade8bcb8368921491c96e16a7a00
-  data.tar.gz: 3427bdcdcc63635f24fd11c3aba574d612472918117d1fc3e8a22dcd8426dc163bb220bbcfda9469db23558f74984195c84cebde27ff1bcff261c1829617b941
+  metadata.gz: 50af3aad18d21bae6efd55d7ad25ef9b206187e6b7b94d81f4b7452cc9b992986ce62f5a10c15c559b3966208d8c644cdc6686fffe9c6a0661063167714c6c73
+  data.tar.gz: 0dcede75936d5ea4511ac2ad2a297c1ea0c67c9f1425e49c2f1794505c40dec21c4b1ca432ad1270a5b6bd47fcec6fc3e51fed6203e6ce3a5589ee9ac5686ce9

data/.gitignore

@@ -7,3 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.rbenv-gemsets
+/.rspec
+/.travis.yml
+/*.gem

data/Dockerfile

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

data/Rakefile

@@ -24,5 +24,5 @@ task doc: :rdoc
 
 desc "Build docker image"
 task :docker do
-  system 'docker build -t dockit .'
+  system 'docker build -t cybercode/dockit .'
 end

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.4.0

data/lib/dockit/cli.rb

@@ -172,17 +172,22 @@ class Default < Thor
         say "'repos' not defined in config file. Exiting",:red
         exit 1
       end
-
+      path    = s.config.get(:repos_path)
+      treeish = unless path.nil? || path.empty?
+                  "#{options.branch}:#{path}"
+                else
+                  options.branch
+                end
       say "Exporting in #{Dir.pwd}", :green
-      say "<- #{repos} #{options.branch}", :green
+      say "<- #{repos} #{treeish}", :green
       if options.gem
         # grab the Gemfiles separately for the bundler Dockerfile hack
         say "-> Gemfiles", :green
-        export(repos, 'gemfile.tar.gz', 'Gemfile*')
+        export(repos, treeish, 'gemfile.tar.gz', 'Gemfile*')
       end
 
       say "-> repos.tar.gz", :green
-      export(repos, 'repos.tar.gz')
+      export(repos, treeish, 'repos.tar.gz')
 
       s.build
     end
@@ -190,8 +195,8 @@ class Default < Thor
 
   private
   GIT_CMD   = 'git archive -o %s --format tar.gz --remote %s %s %s'.freeze
-  def export(repos, archive, args='')
-    cmd = GIT_CMD % [archive, repos, options.branch, args]
+  def export(repos, branch, archive, args='')
+    cmd = GIT_CMD % [archive, repos, branch, args]
     say "#{cmd}\n", :blue if options.debug
 
     unless system(cmd)

data/lib/dockit/digitalocean.rb

@@ -68,22 +68,26 @@ class DO < Thor
     args.each do |k|
       s = service(k)
       unless s.image
-        say ". No image for #{k}!", :red
+        say ". #{k}: No image!", :red
         next
       end
       name    = s.config.get(:build, :t)
+      unless name.present?
+        say ". #{k}: not a local build", :red
+        next
+      end
       id      = s.image.id
-      msg     =  "#{k}: #{id[0..11]}(#{name})"
+      msg     =  "#{k}(#{id[0..11]}[#{name}]):"
       if ssh(options.remote, options.user,
              "docker images --no-trunc | grep #{id} > /dev/null")
-        say ". Exists #{msg}"
+        say ". #{msg} exists"
       else
         if options.backup
           tag = "#{k}:#{options.tag}"
-          say "Tagging #{name} as #{tag}"
+          say "#{msg} tagging as #{tag}"
           ssh(options.remote, options.user, "docker tag #{name} #{tag}")
         end
-        say ". Pushing #{msg}"
+        say "#{msg} pushing"
         ssh(options.remote, options.user, 'docker load', "docker save #{name}")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-12-30 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.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A configuration manager and builder for docker projects.