dockly 3.0.3 → 3.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmNhMzRkODVhZjJjNTY2YmEyZmNlMmFkZTI0OTk0ZDcwZDIyYjVhOQ==
+    ODhhMjA1MzAwZGY2ZmVkYzJiYjUxZjk3ZmM1MDM0OTI2MWY5NGJlMA==
   data.tar.gz: !binary |-
-    MTNhMWM1ZjUzOGI0NTNhYTM0NWEwODYzZjVmOGJjYzQwMjU0ODg5YQ==
+    YjU3NzRlOTE4ZmY3ZDAyOGI0YjI0ZDM4OWY3YTJlZjI2ZGY3ZWFmNg==
 SHA512:
   metadata.gz: !binary |-
-    ZGQ2ZjVlM2M3OGQ4NzU1ZTIwNzM4MDQ4YmM5MjUxZDBhYzJiZmQwYjczN2E1
-    M2FmMDQ4NDZlYjk4ODJkN2Q5NjJkOWNlZWZmYzc2MmZmNzliZjE1NzM2ZGEx
-    Y2ZkNjAzNzllYTc1NmYxNWMyYTEwNjUwZDE4OTU4YmNkY2Y0NmI=
+    ZTBjY2M0ODFlNzU5NDlmNTU0M2UwZjgzZmRiODcyMGVjNzJhNGZhZWM2NjA3
+    MDkwNTNiNGVmZTJhMWIwOGJlNTQwZjJiYzkxM2Y5ZTQxYzM2NjBiNmFhMDc5
+    MTIyNjU5NDZlZmVhMmU0NzQ3NGJiYTg5Y2ExZTI4M2Q2ZTc4ZGM=
   data.tar.gz: !binary |-
-    MjEyOTM0OWE2NjY1NmFhYmY0M2Y2MmFiZDgxZTFlOTJhZTY2ODYzYzYyNDcz
-    YTdiNzQ3OGI1ODNjMmZmNDVkYzQ4OWZkZjE5YTEzMmIxZGYzNGYyYzM5MmNj
-    ZDhmZDViMGQ2MWNlNmMyZDk4NTA4Y2I4NmUyNzliMjJlNjBjNjI=
+    NTgxN2ZjYWYzMjg4YTI1MmE4OGRlODZmZTQ2MTFlZTdhNmVjNWM0MzYyYzE2
+    MDcxMzU3N2U5ZGFhZDUxNjI5NDQ2OTI3YTQxNmE0YmIzZGU1NTNhZmQyYTU2
+    N2I3YTdjZjQyOGRiNTJhZDI2ZGM1MDQ1ZWQxZWNmMmYzOGUyY2Q=

data/lib/dockly.rb

@@ -5,6 +5,7 @@ require 'foreman/cli_fix'
 require 'foreman/export/base_fix'
 require 'rugged'
 require 'aws-sdk'
+require 'open3'
 
 module Dockly
   LOAD_FILE = 'dockly.rb'

data/lib/dockly/util/git.rb

@@ -25,14 +25,18 @@ module Dockly::Util::Git
   end
 
   def archive(oid, prefix, output)
-    Gem::Package::TarWriter.new(output) do |tar|
-      ls_files(oid).each do |blob|
-        name, mode = blob.values_at(:name, :filemode)
-        prefixed = File.join(prefix, name)
-        tar.add_file(prefixed, mode) do |tar_out|
-          tar_out.write(File.read(name))
-        end
-      end
+    prefix = prefix.dup
+    unless prefix[-1] == '/'; prefix << '/'; end
+
+    cmd = ['git','archive',"--prefix=#{prefix}",'--output=/dev/stdout',oid]
+    Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thr|
+      stdin.close
+
+      output.write(stdout.read)
+      process_status = wait_thr.value
+      exit_status = process_status.exitstatus
+
+      raise "#{cmd.join(' ')} exitted non-zero: #{exit_status}" unless exit_status.zero?
     end
   end
 end

data/lib/dockly/version.rb

@@ -1,7 +1,7 @@
 module Dockly
   MAJOR = 3
   MINOR = 0
-  PATCH = 3
+  PATCH = 4
   RELEASE = nil
 
   VERSION = [MAJOR, MINOR, PATCH, RELEASE].compact.join('.')

data/spec/dockly/util/git_spec.rb

@@ -28,10 +28,22 @@ describe Dockly::Util::Git do
     it 'archives the current directory into the given IO' do
       subject.archive(subject.sha, prefix, io)
       reader.each do |entry|
-        expect(entry.full_name).to start_with(prefix)
-        orig = entry.full_name.gsub(/\A#{prefix}\//, '')
-        expect(File.exist?(orig)).to be_true
-        expect(entry.read).to eq(File.read(orig)) if orig.end_with?('.rb')
+        if entry.full_name == 'pax_global_header'
+          expect(entry.header.typeflag).to eq('g')
+        else
+          expect(entry.full_name).to start_with(prefix)
+          orig = entry.full_name.gsub(/\A#{prefix}/, '.')
+          expect(File.exist?(orig)).to be_true
+          expect(entry.read).to eq(File.read(orig)) if orig.end_with?('.rb')
+        end
+      end
+    end
+
+    context 'with a really long prefix' do
+      let(:prefix) { '/' + ('a' * 255) }
+      it 'exhibits the tar extended headers' do
+        subject.archive(subject.sha, prefix, io)
+        expect(io.string.include?("path=#{prefix}")).to be true
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp