conjur-debify 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bba7f110cbbeb17cad3b1a7aaa9723bbbfaa508
-  data.tar.gz: 29cb740a691ceefa03960e68208b01c37439448d
+  metadata.gz: 24d8fe10e0486db7bb2507eb4437011c7b604553
+  data.tar.gz: 74d13c5b2998e96664c704b1f3e25e4d913c776d
 SHA512:
-  metadata.gz: a96de1aad2fe69616b94854ef6ae8f870a8065a706ef582bd02427b44ea49f84f3d34bdbb8565f1a7c1b620160e530ccec8e61933b1e43976ffdf27786bc4db8
-  data.tar.gz: 0509aeec7d1fef0005a3ca69e44ba4ce7f5f7f210c6e761cf56481a0ddb96ae9d61e1298a100c91d58a28e8fd6ccf08754f0edabfa6036d8901392cd15bded28
+  metadata.gz: 8cc53a5458f5dc85665a6a58b5fe15b0b373834645504fe2e9bc1a80caafddbbd8987f0939e45e111e14565bd00d9839307e7716d9f53c5cb3db30a4ce0d363b
+  data.tar.gz: 4d651e1ba3026f937ce23474e4710df624415416860cc814d4e272447fd3e33b063abf8cc998995e4c1cf22623d7cca3fbe6c5eeb898e991e08c563836dc0fcb

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/conjur/debify.rb

@@ -122,19 +122,9 @@ command "package" do |c|
 
       DebugMixin.debug_write "Built fpm image '#{image.id}' for project #{project_name}\n"
 
-      # Make it under HOME so that Docker can map the volume on MacOS
-      tempdir = File.expand_path((0...50).map { ('a'..'z').to_a[rand(26)] }.join, ENV['HOME'])
-      FileUtils.mkdir tempdir
-      at_exit do
-        FileUtils.rm_rf tempdir
-      end
-      
       options = {
         'Cmd'   => [ project_name, version ] + fpm_args,
-        'Image' => image.id,
-        'Binds' => [
-          [ tempdir, '/dist' ].join(':')
-        ]
+        'Image' => image.id
       }
       
       container = Docker::Container.create options
@@ -144,15 +134,16 @@ command "package" do |c|
         status = container.wait
         raise "Failed to package #{project_name}" unless status['StatusCode'] == 0
         
-        deb_file = nil
-        Dir.chdir(tempdir) do
-          deb_file = Dir["*.deb"]
-          raise "Expected one deb file, got #{deb_file.join(', ')}" unless deb_file.length == 1
-          deb_file = deb_file[0]
-          FileUtils.cp deb_file, dir
+        require 'rubygems/package'
+        deb = StringIO.new
+        container.copy("/src/#{package_name}") { |chunk| deb.write(chunk) }
+        deb.rewind
+        tar = Gem::Package::TarReader.new deb
+        tar.first.tap do |entry|
+          open(entry.full_name, 'wb') {|f| f.write(entry.read)}
+          FileUtils.ln_sf entry.full_name, entry.full_name.gsub(version, "latest")
+          puts entry.full_name
         end
-        FileUtils.ln_sf deb_file, deb_file.gsub(version, "latest")
-        puts File.basename(deb_file)
       ensure
         container.delete(force: true)
       end

data/lib/conjur/fpm/package.sh

@@ -46,5 +46,3 @@ fpm -s dir -t deb -n conjur-$project_name -v $version -C . \
 	"$@"
 
 ls -al *.deb
-
-cp *.deb /dist/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kevin Gilpin