file-dependencies 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 16ff079c67078c08116d4845c5553480d46e8c18
+  data.tar.gz: ddd56e8f570a0d1b3db3ca8468525bfe189fa90a
+SHA512:
+  metadata.gz: 4c7a49ef3fbf5b46f68026ff09d1e5a53209b6b5f7f983baf5a13047b4fdb078edbede115dc7935b3643077c776bfc34f0c8a8edd61d74c63778000a1b4803f8
+  data.tar.gz: 625e720434aba86b7706f515c887b596d917e15660e5766eee689fc77ab9428dfe29c07a885fa658216bb8876ec172b9a592cc1dce774019c498ae4a3482744a

data/lib/file-dependencies/archive.rb

@@ -6,60 +6,74 @@ module FileDependencies
   module Archive
     def ungzip(file, outdir)
       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|
-          IO.copy_stream(tgz, out)
+
+      ::File.open(file) do |gzip_file|
+        tgz = Zlib::GzipReader.new(gzip_file)
+
+        begin
+          ::File.open(output, "w") do |out|
+            IO.copy_stream(tgz, out)
+          end
+        rescue
+          ::File.unlink(output) if ::File.exist?(output)
+          raise
+        ensure
+          tgz.close
         end
-        ::File.unlink(file)
-      rescue
-        ::File.unlink(output) if ::File.file?(output)
-        raise
       end
-      tgz.close
+    ensure
+      ::File.unlink(file) if ::File.file?(file)
     end
     module_function :ungzip
 
     def untar(tarball, &block)
-      tgz = Zlib::GzipReader.new(::File.open(tarball))
-      tar = ::Archive::Tar::Minitar::Input.open(tgz)
-      tar.each do |entry|
-        path = block.call(entry)
-        next if path.nil?
-        parent = ::File.dirname(path)
+      ::File.open(tarball) do |tgzfile|
+        tgz = Zlib::GzipReader.new(tgzfile)
+        tar = ::Archive::Tar::Minitar::Input.open(tgz)
 
-        FileUtils.mkdir_p(parent) unless ::File.directory?(parent)
+        begin
+          tar.each do |entry|
+            path = block.call(entry)
+            next if path.nil?
+            parent = ::File.dirname(path)
 
-        # Skip this file if the output file is the same size
-        if entry.directory?
-          FileUtils.mkdir_p(path) unless ::File.directory?(path)
-        else
-          entry_mode = entry.instance_eval { @mode } & 0777
-          if ::File.exist?(path)
-            stat = ::File.stat(path)
-            # TODO(sissel): Submit a patch to archive-tar-minitar upstream to
-            # expose headers in the entry.
-            entry_size = entry.instance_eval { @size }
-            # If file sizes are same, skip writing.
-            next if stat.size == entry_size && (stat.mode & 0777) == entry_mode
-          end
-          puts "Extracting #{entry.full_name} from #{tarball} #{entry_mode.to_s(8)}" if $DEBUG
-          ::File.open(path, "w") do |fd|
-            # eof? check lets us skip empty files. Necessary because the API provided by
-            # Archive::Tar::Minitar::Reader::EntryStream only mostly acts like an
-            # IO object. Something about empty files in this EntryStream causes
-            # IO.copy_stream to throw "can't convert nil into String" on JRuby
-            # TODO(sissel): File a bug about this.
-            until entry.eof?
-              chunk = entry.read(16_384)
-              fd.write(chunk)
+            FileUtils.mkdir_p(parent) unless ::File.directory?(parent)
+
+            # Skip this file if the output file is the same size
+            if entry.directory?
+              FileUtils.mkdir_p(path) unless ::File.directory?(path)
+            else
+              entry_mode = entry.instance_eval { @mode } & 0777
+              if ::File.exist?(path)
+                stat = ::File.stat(path)
+                # TODO(sissel): Submit a patch to archive-tar-minitar upstream to
+                # expose headers in the entry.
+                entry_size = entry.instance_eval { @size }
+                # If file sizes are same, skip writing.
+                next if stat.size == entry_size && (stat.mode & 0777) == entry_mode
+              end
+              puts "Extracting #{entry.full_name} from #{tarball} #{entry_mode.to_s(8)}" if $DEBUG
+              ::File.open(path, "w") do |fd|
+                # eof? check lets us skip empty files. Necessary because the API provided by
+                # Archive::Tar::Minitar::Reader::EntryStream only mostly acts like an
+                # IO object. Something about empty files in this EntryStream causes
+                # IO.copy_stream to throw "can't convert nil into String" on JRuby
+                # TODO(sissel): File a bug about this.
+                until entry.eof?
+                  chunk = entry.read(16_384)
+                  fd.write(chunk)
+                end
+                # IO.copy_stream(entry, fd)
+              end
+              ::File.chmod(entry_mode, path)
             end
-            # IO.copy_stream(entry, fd)
           end
-          ::File.chmod(entry_mode, path)
+        ensure
+          tar.close
+          tgz.close
         end
       end
-      tar.close
+    ensure
       ::File.unlink(tarball) if ::File.file?(tarball)
     end # def untar
     module_function :untar

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.5'
+  VERSION = '0.1.6'
 end

data/lib/rubygems_plugin.rb

@@ -1,3 +1,3 @@
 require 'file-dependencies/gem'
 
-FileDependencies::Gem.hook
+#FileDependencies::Gem.hook

data/spec/file-dependencies/archive_spec.rb

@@ -7,7 +7,7 @@ describe FileDependencies::Archive do
 
     after do
       FileUtils.remove_entry_secure(gzipfile) if ::File.exist?(gzipfile)
-      FileUtils.remove_entry_secure(expected_file)
+      FileUtils.remove_entry_secure(expected_file) if ::File.exist?(expected_file)
       FileUtils.remove_entry_secure(tmpdir)
     end
     let(:gzipfile) { Assist.generate_gzip('some_content') }
@@ -29,7 +29,7 @@ describe FileDependencies::Archive do
 
     after do
       FileUtils.remove_entry_secure(tmpdir)
-      FileUtils.remove_entry_secure(file)
+      FileUtils.remove_entry_secure(file) if ::File.file?(file)
     end
 
     let(:file) { Assist.generate_file('some_content') }

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: file-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Richard Pijnenburg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: minitar
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: stud
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: stud
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: webmock
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: coveralls
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: codeclimate-test-reporter
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: manage file dependencies for gems
@@ -152,26 +137,25 @@ files:
 homepage: https://github.com/electrical/file-dependencies
 licenses:
 - APACHE 2.0
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23.2
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
+specification_version: 4
 summary: manage file dependencies for gems
 test_files: []