file-dependencies 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQzMzBmNzkxOTg4MDdiYzkxNTRlMWZkNjUxZDVlYjNkMDBkZTg1Nw==
+    OGM4NTY0ZjEwMzliMWM1MTBiOGU3NzIyOTJhMGIyNDJhZTFiMmUzMg==
   data.tar.gz: !binary |-
-    ZTUyZTRmMjIyZGM4ZjM4ZjdjODcyODc4NjQ0NTBjZmFkZDBjNmIyYg==
+    YTdmYTQwODE1Y2ZiZTcxZWNiZWYwMmI2OGVkNjY0MjgwMTU1ZTRlYQ==
 SHA512:
   metadata.gz: !binary |-
-    MDBjYjlkNDQ3NzI5OGFlOGY1ZjI1NDc0MmNmMDAxNjE0NDU0ZmM5NjQ3ODY1
-    M2Q3ZTE1ZjMwYmY5Y2IzZDhkMzNmNmNlZDYzYTViM2RlNTIwMGRiYTlhOTQ5
-    MzBkN2E0YjlmMTU3YjJkZThmMmM2MzFkZjhhMTZmMTQ3NzYxZjE=
+    Y2YzMGY5ZDY1ODZiOTA5M2NhMTY5ZGMyNmI4ZWY4ODFkNzllYTA1M2FjNWY5
+    ZTRjYTRhYzUyNWNhNmVkMWM2YmNlMWNkMzhkMjRhYWM3ODcwOGM1ZWJkNzll
+    MDQwNjVjZDRiMjQ4NDI2MGJkMTcxMjg4NDMxYjA3ZTQzYjU5YzU=
   data.tar.gz: !binary |-
-    NThmZmM1YjA4MmI2ZGZhNDgxNzZlMTFlYTJlMWQ5ZDM1M2FhNzU5ZDNjYTNl
-    YWI5YzY0N2VhNWUxOWU1YjU4ZjU3N2QzZTljNjU1YjY0YjFhMGQzOWJkMjE5
-    ZGY3YjRhYjY3MTNiNDIxZDhhY2FjMzYyOTkyZTI1ZmM0OTRjNWE=
+    MGRmOWI2YjNjOGFjY2M1NGE1OWU5MGJkNTg0NjY0ZDhhZDlkMTlhZDc3ZmNh
+    ZTVlZjI2NjQyYzdmYmRjNDllYjJhZmNiYTYxNzBkYWNlNjI1YWY5YmI3MzQ4
+    ZmZkYjllMjI3MzFjM2RlNmFiOGY2ZjZjODI2ZTdmMTJkZDA2MjU=

data/file-dependencies.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'stud'
   s.add_development_dependency 'webmock'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'codeclimate-test-reporter'
 end
 
 # vim: syntax=Ruby

data/lib/file-dependencies.rb

@@ -20,13 +20,17 @@ module FileDependencies
   def download(files, target, tmpdir)
     FileUtils.mkdir_p(target) unless ::File.directory?(target)
     files.each do |file|
-      target = ::File.join(target, file['target']) if !file['target'].nil?
+      target = ::File.join(target, file['target']) unless file['target'].nil?
       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|
-          next unless (out = FileDependencies::Archive.eval_file(entry, file['extract'], prefix))
-          ::File.join(target, out)
+          if file['extract'].nil?
+            ::File.join(target, entry.full_name.gsub(prefix, ''))
+          else
+            next unless FileDependencies::Archive.eval_file(entry.full_name, file['extract'], prefix)
+            ::File.join(target, entry.full_name.split("/").last)
+          end
         end
       elsif download =~ /.gz/
         FileDependencies::Archive.ungzip(download, target)

data/lib/file-dependencies/archive.rb

@@ -22,7 +22,6 @@ module FileDependencies
 
     def untar(tarball, &block)
       tgz = Zlib::GzipReader.new(::File.open(tarball))
-      # Pull out typesdb
       tar = ::Archive::Tar::Minitar::Input.open(tgz)
       tar.each do |entry|
         path = block.call(entry)
@@ -66,19 +65,19 @@ module FileDependencies
     module_function :untar
 
     def eval_file(entry, files, prefix)
-      # Avoid tarball headers
-      return false if entry.full_name =~ /PaxHeaders/
-      return entry.full_name.gsub(prefix, '') if files.nil?
-
+      return false if tar_header?(entry)
       if files.is_a?(Array)
-        # Extract specific files given
-        return false unless files.include?(entry.full_name.gsub(prefix, ''))
-        entry.full_name.split("/").last
+        return true if files.include?(entry.gsub(prefix, ''))
       elsif files.is_a?(String)
-        return false unless entry.full_name =~ Regexp.new(files)
-        entry.full_name.split("/").last
+        return true if entry =~ Regexp.new(files)
       end
+      false
     end
     module_function :eval_file
+
+    def tar_header?(entry)
+      entry =~ /PaxHeaders/
+    end
+    module_function :tar_header?
   end
 end

data/lib/file-dependencies/file.rb

@@ -10,11 +10,11 @@ module FileDependencies
     SHA1_REGEXP = /(\b[0-9a-f]{40}\b)/
 
     def fetch_sha1(remote_sha1)
-      unless URI(remote_sha1.to_s).scheme.nil?
+      if URI(remote_sha1.to_s).scheme.nil?
+        sha1 = remote_sha1
+      else
         file = download(remote_sha1, Dir.tmpdir)
         sha1 = IO.read(file).gsub("\n", '')
-      else
-        sha1 = remote_sha1
       end
       raise("invalid SHA1 signature. Got '#{sha1}'") unless sha1.match(SHA1_REGEXP)
       sha1

data/lib/file-dependencies/version.rb

@@ -1,3 +1,3 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
-APP_VERSION = '0.1.0'
+APP_VERSION = '0.1.1'

data/spec/archive_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'tmpdir'
 require 'file-dependencies/archive'
 
 describe FileDependencies::Archive do
@@ -12,7 +11,7 @@ describe FileDependencies::Archive do
       FileUtils.remove_entry_secure(tmpdir)
     end
     let(:gzipfile) { Assist.generate_gzip('some_content') }
-    let(:expected_file) { gzipfile.gsub('.gz','') }
+    let(:expected_file) { gzipfile.gsub('.gz', '') }
     let(:tmpdir) { Stud::Temporary.directory }
 
     it 'decompresses a gzip file'do
@@ -34,11 +33,11 @@ describe FileDependencies::Archive do
     end
 
     let(:file) { Assist.generate_file('some_content') }
-    let(:tarball) { Assist.generate_tarball({'some/file' => 'content1', 'some/other/file' => 'content2', 'other' => 'content3'}) }
+    let(:tarball) { Assist.generate_tarball('some/file' => 'content1', 'some/other/file' => 'content2', 'other' => 'content3') }
     let(:tmpdir) { Stud::Temporary.directory }
 
     it 'extracts a full tarball' do
-      entries = ['some/file', 'some/other/file', 'other' ]
+      entries = ['some/file', 'some/other/file', 'other']
 
       FileDependencies::Archive.untar(tarball) do |entry|
         ::File.join(tmpdir, entry.full_name)
@@ -57,7 +56,7 @@ describe FileDependencies::Archive do
         end
       end
       found_files = Dir.glob(File.join(tmpdir, '**', '*')).reject { |entry| File.directory?(entry) }.sort
-      expected_files = entries.map { |k| "#{tmpdir}/#{k}" }.sort
+      expected_files = entries.map { |k| ::File.join(tmpdir, k) }.sort
       expect(expected_files).to(eq(found_files))
     end
 
@@ -72,36 +71,22 @@ describe FileDependencies::Archive do
 
   describe ".eval_file" do
 
-    # Hack to implement the full_name part
-    class ::String
-      def full_name
-        return self
-      end
-    end
-
-    let(:entries) { [ 'sometar/PaxHeaders', 'sometar/some/dir/PaxHeaders', 'sometar/some/dir/somefile', 'sometar/somefile', 'sometar/some/other/file', 'sometar/some/jars/file1.jar', 'sometar/some/jars/file2.jar', 'sometar/other/jars/file3.jar' ]}
+    let(:entries) { ['sometar/PaxHeaders', 'sometar/some/dir/PaxHeaders', 'sometar/some/dir/somefile', 'sometar/somefile', 'sometar/some/other/file', 'sometar/some/jars/file1.jar', 'sometar/some/jars/file2.jar', 'sometar/other/jars/file3.jar'] }
     let(:prefix) { 'sometar' }
 
-    let(:extract1) { '.jars' } #wildcard
-    let(:expect1) { [ 'file1.jar', 'file2.jar', 'file3.jar'] }
-    let(:extract2) { ['/some/other/file', '/somefile', '/other/jars/file3.jar' ]}
-    let(:expect2) { ['file', 'somefile', 'file3.jar' ]}
-    let(:extract3) { }
-    let(:expect3) { [ '/some/dir/somefile', '/somefile', '/some/other/file', '/some/jars/file1.jar', '/some/jars/file2.jar', '/other/jars/file3.jar' ] }
+    let(:extract1) { '.jars' }
+    let(:expect1)  { ['file1.jar', 'file2.jar', 'file3.jar'] }
+    let(:extract2) { ['/some/other/file', '/somefile', '/other/jars/file3.jar'] }
+    let(:expect2)  { ['file', 'somefile', 'file3.jar'] }
 
     it 'returns all files based on a wildcard' do
-      filelist = entries.map { |entry| FileDependencies::Archive.eval_file(entry, extract1, prefix) }
-      expect(filelist.reject{ |v| v == false}.sort).to(eq(expect1.sort))
+      filelist = entries.reject { |entry| FileDependencies::Archive.eval_file(entry, extract1, prefix) == false }.map { |entry| entry.gsub(prefix, '').split("/").last }
+      expect(filelist.sort).to(eq(expect1.sort))
     end
 
     it 'returns all files based on an array' do
-      filelist = entries.map { |entry| FileDependencies::Archive.eval_file(entry, extract2, prefix) }
-      expect(filelist.reject{ |v| v == false}.sort).to(eq(expect2.sort))
-    end
-
-    it 'returns all files when no extracted files are given' do
-      filelist = entries.map { |entry| FileDependencies::Archive.eval_file(entry, extract3, prefix) }
-      expect(filelist.reject{ |v| v == false}.sort).to(eq(expect3.sort))
+      filelist = entries.reject { |entry| FileDependencies::Archive.eval_file(entry, extract2, prefix) == false }.map { |entry| entry.gsub(prefix, '').split("/").last }
+      expect(filelist.sort).to(eq(expect2.sort))
     end
 
   end

data/spec/file-dependencies_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'tmpdir'
 require 'json'
 require 'file-dependencies'
 
@@ -16,10 +15,10 @@ 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('some/file' => 'content1', 'some/other/file' => 'content2', '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'}) }
+    let(:file4) { Assist.generate_tarball('jars/some.jar' => 'content10', 'jars/someother.jar' => 'content11') }
 
     let(:sha1) { FileDependencies::File.calc_sha1(file1) }
     let(:sha2) { FileDependencies::File.calc_sha1(file2) }
@@ -33,7 +32,7 @@ describe FileDependencies do
 
     let(:entries) { ['somefile2.txt', 'somefile3', 'some/file', 'some/other/file', 'other', 'jars/some.jar', 'jars/someother.jar'] }
 
-    let(:files) { [ { 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => '.jar', 'target' => 'jars' } ] }
+    let(:files) { [{ 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => '.jar', 'target' => 'jars' }] }
 
     it 'processes file list' do
       stub_request(:get, url1).to_return(:body => File.new(file1), :status => 200)
@@ -42,7 +41,7 @@ describe FileDependencies do
       stub_request(:get, url4).to_return(:body => File.new(file4), :status => 200)
      
       # we should not have any errors
-      expect{ FileDependencies.download(files, target, tmpdir) }.to_not(raise_error)
+      expect { FileDependencies.download(files, target, tmpdir) }.to_not(raise_error)
 
       # check if we got all the expected files
       found_files = Dir.glob(File.join(target, '**', '*')).reject { |entry| File.directory?(entry) }.sort
@@ -62,10 +61,10 @@ 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('some/file' => 'content1', 'some/other/file' => 'content2', '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'}) }
+    let(:file4) { Assist.generate_tarball('jars/some.jar' => 'content10', 'jars/someother.jar' => 'content11') }
 
     let(:sha1) { FileDependencies::File.calc_sha1(file1) }
     let(:sha2) { FileDependencies::File.calc_sha1(file2) }
@@ -77,7 +76,7 @@ describe FileDependencies do
     let(:url3) { 'http://www.example.com/somefile3.gz' }
     let(:url4) { 'http://www.example.com/somefile4.tar.gz' }
 
-    let(:files) { [ { 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => '.jar', 'target' => 'jars' } ].to_json }
+    let(:files) { [{ 'url' => url1, 'sha1' => sha1 }, { 'url' => url2, 'sha1' => sha2 }, { 'url' => url3, 'sha1' => sha3 }, { 'url' => url4, 'sha1' => sha4, 'extract' => '.jar', 'target' => 'jars' }].to_json }
     let(:vendorfile) { File.write(File.join(target, 'vendor.json'), files) }
     let(:entries) { ['somefile2.txt', 'somefile3', 'some/file', 'some/other/file', 'other', 'jars/some.jar', 'jars/someother.jar'] }
 
@@ -89,7 +88,7 @@ describe FileDependencies do
       File.write(File.join(target, 'vendor.json'), files)
      
       # we should not have any errors
-      expect{ FileDependencies.process_vendor(target, 'vendor', tmpdir) }.to_not(raise_error)
+      expect { FileDependencies.process_vendor(target, 'vendor', tmpdir) }.to_not(raise_error)
 
       # check if we got all the expected files
       found_files = Dir.glob(File.join(target, 'vendor', '**', '*')).reject { |entry| File.directory?(entry) }.sort

data/spec/file_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
-require 'tmpdir'
 require 'file-dependencies/file'
 include WebMock::API
 describe FileDependencies::File do
 
-
   describe ".calc_sha1" do
 
     after do 
@@ -17,7 +15,7 @@ describe FileDependencies::File do
     end
 
     it 'raises an error when the file doesnt exist' do
-      expect { FileDependencies::File.calc_sha1('dont_exist')}.to(raise_error(Errno::ENOENT))
+      expect { FileDependencies::File.calc_sha1('dont_exist') }.to(raise_error(Errno::ENOENT))
     end
   end
 
@@ -80,7 +78,7 @@ describe FileDependencies::File do
   describe ".fetch_sha1" do
  
     describe "With a sha1 string" do
-      let (:remote_sha1) { '778164c23fae5935176254d2550619cba8abc262' }
+      let(:remote_sha1) { '778164c23fae5935176254d2550619cba8abc262' }
       it 'returns sha1 string when valid' do
         expect(FileDependencies::File.fetch_sha1(remote_sha1)).to(eq(remote_sha1))
       end

data/spec/spec_assist.rb

@@ -1,7 +1,7 @@
 require 'stud/temporary'
 
+# :nodoc:
 module Assist
-
   def self.generate_tarball(files)
     tarpath = "#{Stud::Temporary.pathname}.tar.gz"
     tarfile = File.new(tarpath, "wb")
@@ -22,7 +22,6 @@ module Assist
   end
 
   def self.generate_gzip(content)
-
     file = "#{Stud::Temporary.pathname}.gz"
     Zlib::GzipWriter.open(file) do |gz|
       gz.write(content)

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 require 'spec_assist'
 require 'webmock/rspec'
+require 'coveralls'
+require 'codeclimate-test-reporter'
+
+CodeClimate::TestReporter.start
+Coveralls.wear!
 
 RSpec.configure do |config|
   config.extend Assist

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Richard Pijnenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -80,6 +80,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: manage file dependencies for gems
 email:
 - richard.pijnenburg@elasticsearch.com
@@ -126,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: manage file dependencies for gems