docker-shaball 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbb7a3444628460b40193c085ff5fd5e8fc39bd
-  data.tar.gz: d116594e8a79c88892f45c4eb4faec62774c5733
+  metadata.gz: e31baf5f571efcbebcbbefc31e88501a6a36cfed
+  data.tar.gz: 18c303957629f12c899d24af82321d76461099ce
 SHA512:
-  metadata.gz: 2df782b032af84e7db43269371cd37d79d2fd6d495c94acc911dbed82d00a73c2eef0c8e269e56d14c56c6f834487b00bb24ef27e70d934c3c13ba601e5a75e0
-  data.tar.gz: 167623a824fc1071f5c7bfbee8ac90d2e543b39cdd2d5d6d10b631cd88146a05f2e59fbf8600540cb0ae8371d12570f649466fc1f0713b77a50c7a10f66bd783
+  metadata.gz: 5fccd067d031187b13e15bb3b78d251a531463387e657969546d2e57a2df271832bfc1c8510cf06e51683ee278c5c0274fc2d3668e902aa4cd93e026c10124f9
+  data.tar.gz: 3094e029576b11e54c360ad078c300096ddbd63b3ae11a6d089e2ca836925b4e43c9688201eb7d9644cbe0cc4008f4e6f6090dd4c4481f3432802c3a3bd52ebb

data/.rubocop.yml

@@ -0,0 +1,50 @@
+Eval:
+  Exclude:
+    - "Rakefile"
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 30
+
+Style/AsciiIdentifiers
+  Enabled: false
+  
+Style/ClassAndModuleChildren:
+  EnforcedStyle: nested
+  Exclude:
+    - "spec/**/*"
+
+Style/Documentation:
+  Exclude:
+    - "spec/**/*"
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Style/Encoding:
+  EnforcedStyle: when_needed
+  Enabled: true
+
+Style/FileName:
+  Exclude:
+    - "bin/*"
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/WordArray:
+  Enabled: false

data/bin/docker-shaball

@@ -2,12 +2,14 @@
 
 require "clamp"
 require "digest/sha1"
+require "fileutils"
 
 Clamp do
 
   self.description = "Bundle docker images into a tar-ball, with a unique name based on content"
 
   option "--pull", :flag, "pull the named images first"
+  option "--force", :flag, "force re-generation of output file"
 
   option "--manifest", :flag, "just print the image manifest"
 
@@ -16,7 +18,7 @@ Clamp do
   def execute
     if pull?
       image_names.each do |name|
-        system("docker pull #{name}")
+        system("docker pull #{name} > /dev/null")
         signal_error("docker pull failed") unless $?.success?
       end
     end
@@ -26,23 +28,27 @@ Clamp do
     end
     manifest_checksum = Digest::SHA1.hexdigest(image_manifest)
     output_file_name = "#{manifest_checksum}.tar.gz"
-
-    save_images(image_names, output_file_name)
+    unless !force? && File.exist?(output_file_name)
+      save_images(image_names, output_file_name)
+    end
     puts output_file_name
   end
 
   private
 
   def save_images(image_names, output_file_name)
-    r,w = IO.pipe
-    save = spawn("docker save #{image_names.join(' ')}", out: w)
-    gzip = spawn("gzip", in: r, out: [output_file_name, 'w'])
+    FileUtils.safe_unlink(output_file_name)
+    tmp_file_name = "#{output_file_name}.tmp"
+    r, w = IO.pipe
+    save = spawn("docker save #{image_names.join(' ')}", :out => w)
+    gzip = spawn("gzip", :in => r, :out => [tmp_file_name, "w"])
     r.close
     w.close
     Process.wait save
     signal_error("docker save failed") unless $?.success?
     Process.wait gzip
     signal_error("gzip failed") unless $?.success?
+    File.rename(tmp_file_name, output_file_name)
   end
 
   def image_names
@@ -53,7 +59,7 @@ Clamp do
   end
 
   def image_manifest
-    inspect_output = `docker inspect -f '{{ .Config.Image }}' #{image_names.join(' ')}`
+    inspect_output = `docker inspect -f '{{ .Config.Image }}' #{image_names.join(" ")}`
     signal_error("docker inspect returned error") unless $?.success?
     image_ids = inspect_output.lines.map(&:strip)
     image_names.zip(image_ids).map do |image_name_and_id|

data/docker-shaball.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
 
   spec.name          = "docker-shaball"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["Mike Williams", "Luke Carter-Key"]
   spec.email         = ["mdub@dogbiscuit.org", "luke.carterkey@gmail.com"]
   spec.summary       = %q{Create a tar-ball containing some Docker images}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-shaball
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -63,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create a tar-ball containing some Docker images