file-dependencies 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVkNDBkYmY4NWM4N2UxOTRiODhiM2QwN2QwZGM2ZjEwM2Q4YzFiZQ==
+    NzI1MDZhM2QzZjQwMWE2M2I4OGYwMGU0ZmYwOGNlYjk0ZTRkMDdjNg==
   data.tar.gz: !binary |-
-    YmZjNmFlMWU3YWFiOGYwNWU4NjM0ZWI0Yjc5Y2U1YjBlM2JkNjlkYw==
+    MTg1NGY3ZWMzOTEyNjcwNTJjMjhkYzEwOWFjNWUyMTIwMDZkZTA4Zg==
 SHA512:
   metadata.gz: !binary |-
-    YWJlMmU3NmI5OTdiNTUxNjQ3Y2E2NWZjMzE0YWYwNjQxMTNlZGJkM2E1YjIw
-    MzdiN2IyN2Q2Y2YxNTVhNDAzODU4MWY0ZTNjZDVkZDcxNDY2NTFiZmEzMjEx
-    ZjAxMjY4YWQ4YzU2ZTBkZDRjZWU3MjUxMDY0YmNjMmM1ZTAyNDg=
+    NzFlNWNiZGM0MDJiYWM0YjdlNDdlMGFlOWZkM2E4NjdhZjExNTQzMDcwY2Nj
+    MmEwNGEyODZmZjYzOWE1YTUxMDZmOTBlOWM1ZGNkMjBlYTRhNzk1MDYwMTUx
+    ZGJjMDRlZTMzY2YxZDVkNWQ2MGI4MDgyMTc3NTg4MTZmMDQwMTE=
   data.tar.gz: !binary |-
-    NGMxMDlmMzg0MTgzNjVlYjQxM2Q0MjI1YjE4OWUzNjU4ZWQ0MGI1YjkwYTA5
-    NGVmMzg1MjYxYTZmNDBjYjk1YjMwZmI0MTZiMzEzMDA0MGFiNmVlY2UxMGIw
-    OWVlMjZlMzg5NmU0NWNmNTUwNGM5OTcwNzE0NGNlZWJiYmQ3Mzk=
+    ZDBlOTZmNDdhOGJlN2Y0NjkwMTFmMWRjMGUwNTVhNTQ5ODA0YWQ0OTNiZjcw
+    MWE4MWJjN2Y0ODNhMDFiMTIwZjkyZDdkMTg3NDRmNWVmM2FhZWY3ZmMzNzRk
+    N2MwMWY1NTk2YTc2MWRjYWNiZDAwZjg3YmU2ZDEyODcxYzQ1Yzg=

data/.gitignore

@@ -7,3 +7,5 @@ target
 build.log
 *.swp
 coverage/
+.bundle
+.vendor

data/lib/file-dependencies.rb

@@ -12,7 +12,7 @@ module FileDependencies
       file_list = JSON.load(vendor_file_content)
       FileDependencies.process_downloads(file_list, ::File.join(dir, target), tmpdir)
     else
-      puts "vendor.json not found, looked for the file at #{vendor_file}"
+      puts "vendor.json not found, looked for the file at #{vendor_file}" if $DEBUG
     end
   end # def process_vendor
   module_function :process_vendor
@@ -23,11 +23,11 @@ module FileDependencies
       full_target = file['target'] ? ::File.join(target, file['target']) : target
       download = FileDependencies::File.fetch_file(file['url'], file['sha1'], tmpdir)
       if (res = download.match(/(\S+?)(\.tar\.gz|\.tgz)$/))
-        prefix = res.captures.first.gsub("#{tmpdir}/", '')
         FileDependencies::Archive.untar(download) do |entry|
+          prefix = file['include_tar_prefix'] ? '' : ::File.join(entry.full_name.split(::File::SEPARATOR).first, '')
           next unless FileDependencies::Archive.extract_file?(entry.full_name, file['extract'], file['exclude'], prefix)
           if file['flatten'] == true
-            ::File.join(full_target, entry.full_name.split("/").last)
+            ::File.join(full_target, ::File.basename(entry.full_name))
           else
             ::File.join(full_target, entry.full_name.gsub(prefix, ''))
           end
@@ -35,7 +35,7 @@ module FileDependencies
       elsif download =~ /.gz$/
         FileDependencies::Archive.ungzip(download, full_target)
       else
-        FileUtils.mv(download, ::File.join(full_target, download.split("/").last))
+        FileUtils.mv(download, ::File.join(full_target, ::File.basename(download)))
       end
     end
   end # def download

data/lib/file-dependencies/archive.rb

@@ -5,7 +5,7 @@ module FileDependencies
   # :nodoc:
   module Archive
     def ungzip(file, outdir)
-      output = ::File.join(outdir, file.gsub('.gz', '').split("/").last)
+      output = ::File.join(outdir, file.gsub('.gz', '').split(::File::SEPARATOR).last)
       tgz = Zlib::GzipReader.new(::File.open(file))
       begin
         ::File.open(output, "w") do |out|

data/lib/file-dependencies/version.rb

@@ -1,5 +1,5 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 module FileDependencies
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/file-dependencies_spec.rb

@@ -15,11 +15,11 @@ describe FileDependencies do
     let(:tmpdir) { Stud::Temporary.directory }
     let(:target) { Stud::Temporary.directory }
 
-    let(:file1) { Assist.generate_tarball('some/file' => 'content1', 'some/other/file' => 'content2', 'other' => 'content3') }
+    let(:file1) { Assist.generate_tarball('somefile1/some/file' => 'content1', 'somefile1/some/other/file' => 'content2', 'somefile1/other' => 'content3') }
     let(:file2) { Assist.generate_file('some_content') }
     let(:file3) { Assist.generate_gzip('some_content_for_gzip') }
     let(:file4) { Assist.generate_tarball('jars/some.jar' => 'content10', 'jars/someother.jar' => 'content11', 'somefile.txt' => 'bla') }
-    let(:file5) { Assist.generate_tarball('src/types.db' => 'typesdb') }
+    let(:file5) { Assist.generate_tarball('mytarball/src/types.db' => 'typesdb') }
 
     let(:sha1) { FileDependencies::File.calculate_sha1(file1) }
     let(:sha2) { FileDependencies::File.calculate_sha1(file2) }
@@ -35,7 +35,7 @@ describe FileDependencies do
 
     let(:entries) { ['somefile2.txt', 'somefile3', 'some/file', 'some/other/file', 'other', 'jarfiles/jars/some.jar', 'jarfiles/jars/someother.jar', 'jarfiles/somefile.txt', 'types.db'] }
 
-    let(:files) { [{ 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => [/\.jar/, /\.txt/], 'target' => 'jarfiles' }, { 'url' => url5, 'sha1' => sha5, 'flatten' => true }] }
+    let(:files) { [{ 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => [/\.jar/, /\.txt/], 'target' => 'jarfiles', 'include_tar_prefix' => true }, { 'url' => url5, 'sha1' => sha5, 'flatten' => true }] }
 
     it 'processes file list' do
       stub_request(:get, url1).to_return(:body => File.new(file1), :status => 200)
@@ -65,11 +65,11 @@ describe FileDependencies do
     let(:tmpdir) { Stud::Temporary.directory }
     let(:target) { Stud::Temporary.directory }
 
-    let(:file1) { Assist.generate_tarball('some/file' => 'content1', 'some/other/file' => 'content2', 'other' => 'content3') }
+    let(:file1) { Assist.generate_tarball('somefile1/some/file' => 'content1', 'somefile1/some/other/file' => 'content2', 'somefile1/other' => 'content3') }
     let(:file2) { Assist.generate_file('some_content') }
     let(:file3) { Assist.generate_gzip('some_content_for_gzip') }
     let(:file4) { Assist.generate_tarball('jars/some.jar' => 'content10', 'jars/someother.jar' => 'content11', 'somefile.txt' => 'bla') }
-    let(:file5) { Assist.generate_tarball('src/types.db' => 'typesdb') }
+    let(:file5) { Assist.generate_tarball('mytarball/src/types.db' => 'typesdb') }
 
     let(:sha1) { FileDependencies::File.calculate_sha1(file1) }
     let(:sha2) { FileDependencies::File.calculate_sha1(file2) }
@@ -83,7 +83,7 @@ describe FileDependencies do
     let(:url4) { 'http://www.example.com/somefile4.tar.gz' }
     let(:url5) { 'http://www.example.com/somefile5.tar.gz' }
 
-    let(:files) { [{ 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => [/\.jar/, /\.txt/], 'target' => 'jarfiles' }, { 'url' => url5, 'sha1' => sha5, 'flatten' => true }].to_json }
+    let(:files) { [{ 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => [/\.jar/, /\.txt/], 'target' => 'jarfiles', 'include_tar_prefix' => true }, { 'url' => url5, 'sha1' => sha5, 'flatten' => true }].to_json }
 
     let(:vendorfile) { File.write(File.join(target, 'vendor.json'), files) }
     let(:entries) { ['somefile2.txt', 'somefile3', 'some/file', 'some/other/file', 'other', 'jarfiles/jars/some.jar', 'jarfiles/jars/someother.jar', 'jarfiles/somefile.txt', 'types.db'] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Richard Pijnenburg