docker-api 1.30.1 → 1.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 210dd4b08216025bc2584e22ae74642679ca3f3c
-  data.tar.gz: c6860ab766b1ca34d19bba5a70966ce695c471af
+  metadata.gz: 5e2975a50b698d9d6a2a5fdaecd477f160677427
+  data.tar.gz: e652feb4204f7e52d5877a388820dfd5a31c13e2
 SHA512:
-  metadata.gz: ccc27921a9ae57766505c7893e06bbefed7757c685b3c597c24ab8a833a076195c3f04dc3a8f065b64dd1d2d5b05e27acaa6d3f17185faf41b236969c7346922
-  data.tar.gz: 11a113c975cfea7953615ec8a26454b8e8d3d2fe31e881115816356848842a8972c6dc0f615d9a9dec67040edb0ec47be21f85bbc80388f013e2ec985901889b
+  metadata.gz: ab26e9e3ba3f505ad0ac1ebb8b594913128473f7d7900c35886d867f041ba2dad1259162cdda3ce4bd51634107a44736667c82f3205f5d804f2ca35f0808ea63
+  data.tar.gz: 4e5d8807fa2a6942662dea8a7e29e0fcc93deb4aa15fa097f29a9f265f765b961920df6276efc60c1e021d4d88fc9df81c35ab7c3aa90e7e61188e0381c644a6

data/lib/docker/util.rb

@@ -119,8 +119,12 @@ module Docker::Util
   def create_tar(hash = {})
     output = StringIO.new
     Gem::Package::TarWriter.new(output) do |tar|
-      hash.each do |file_name, input|
-        tar.add_file(file_name, 0640) { |tar_file| tar_file.write(input) }
+      hash.each do |file_name, file_details|
+        permissions = file_details.is_a?(Hash) ? file_details[:permissions] : 0640
+        tar.add_file(file_name, permissions) do |tar_file|
+          content = file_details.is_a?(Hash) ? file_details[:content] : file_details
+          tar_file.write(content)
+        end
       end
     end
     output.tap(&:rewind).string
@@ -203,15 +207,26 @@ module Docker::Util
       basename = File.basename(local_path)
       if File.directory?(local_path)
         tar = create_dir_tar(local_path)
-        file_hash[basename] = tar.read
+        file_hash[basename] = {
+          content: tar.read,
+          permissions: filesystem_permissions(local_path)
+        }
         tar.close
         FileUtils.rm(tar.path)
       else
-        file_hash[basename] = File.read(local_path, mode: 'rb')
+        file_hash[basename] = {
+          content: File.read(local_path, mode: 'rb'),
+          permissions: filesystem_permissions(local_path)
+        }
       end
     end
   end
 
+  def filesystem_permissions(path)
+    mode = sprintf("%o", File.stat(path).mode)
+    mode[(mode.length - 3)...mode.length].to_i(8)
+  end
+
   def build_auth_header(credentials)
     credentials = credentials.to_json if credentials.is_a?(Hash)
     encoded_creds = Base64.encode64(credentials).gsub(/\n/, '')

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.30.1'
+  VERSION = '1.30.2'
 
   # The version of the compatible Docker remote API.
   API_VERSION = '1.16'

data/spec/docker/util_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe Docker::Util do
   subject { described_class }
@@ -151,4 +152,19 @@ describe Docker::Util do
       end
     end
   end
+
+  describe '.filesystem_permissions' do
+    it 'returns the permissions on a file' do
+      file = Tempfile.new('test_file')
+      file.close
+      expected_permissions = 0600
+      File.chmod(expected_permissions, file.path)
+
+      actual_permissions = subject.filesystem_permissions(file.path)
+
+      file.unlink
+      expect(actual_permissions).to eql(expected_permissions)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.30.1
+  version: 1.30.2
 platform: ruby
 authors:
 - Swipely, Inc.