dply 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 980e8598ba0b980d03dc89def37df554f890d201
-  data.tar.gz: c098dab6fa8887ca688a00af615adb76b02e2a36
+  metadata.gz: a4d1e103de385380812dbb80962948bdada9d958
+  data.tar.gz: 06a06f6e1bd0b850633493580109c1477108dfc5
 SHA512:
-  metadata.gz: bad6a7d76cfd0e00cb0e72c6a803194b11ba187e96e0468a2e72354c669a3e01099c123a7650e83dc21300a7b2c38ffa79d30df1b0766617014ae94706f1017c
-  data.tar.gz: 4c0121676d58fa36a703948e1f45275006c24d9367183c08b614c77eccd8380d5f78b86d911bd80a70824052ddba0b18807d4ad2202d8efe4eb4bdb0529c163d
+  metadata.gz: 4e01402487708e257bd4c94c739f059798b1d4597e4ff06986be7c44a005a055349d9c32d6faed36c103c7a778ab6d079c63e32f2e1d8552467e8a9aca319c22
+  data.tar.gz: 04971dda86f69b50af9f26ee4c9303416b69ddd1b20fbba88af279417960955b0433a795016fcad109f449b9d1580e7d88509315e6441191ad485d09bebd2c01

data/lib/dply/archive.rb

@@ -34,7 +34,7 @@ module Dply
     def cleanup
       logger.trace "cleaning tmp/archive"
       files = [ path, checksum_path ]
-      files.each { |f| FileUtils.rm f if File.exists? f }
+      files.each { |f| FileUtils.rm f if File.exist? f }
     end
 
     def download_file

data/lib/dply/deplist.rb

@@ -78,14 +78,23 @@ module Dply
     end
 
     def dynamic_libs(file)
+      path = Pathname.new(file)
       Elf::File.open(file) do |ef|
         return [] if not ef.has_section? ".dynamic"
-        ef[".dynamic"].needed_libraries.keys
+        dynamic = ef[".dynamic"].needed_libraries.keys
+        rpath = ef[".dynamic"].rpath.map { |i| i.sub("$ORIGIN", "#{path.dirname}") }
+        external = dynamic.reject { |l| lib_in_rpath? l, rpath }
+        logger.debug { "[#{file}]: dynamic:#{dynamic.size} rpath:#{dynamic.size - external.size} ext:#{external.size}" } if logger.debug?
+        external
       end
     rescue Exception
       return []
     end
 
+    def lib_in_rpath?(lib, rpath)
+      rpath.any? { |i| File.exist? "#{i}/#{lib}" }
+    end
+
     def rpm
       @rpm ||= Rpm.new
     end

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.2.17"
+  VERSION = "0.2.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf