pkgforge 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea966e23e70cae51a041f8a34d2803511802a84
-  data.tar.gz: b1c94296885888e2f68b8cb812094565e8f8707b
+  metadata.gz: 264ddfb22fbba6afa5197ff26f426c1b332e6bab
+  data.tar.gz: d04e8005705d2dc35d0bcc07f39bc412f338422e
 SHA512:
-  metadata.gz: 9b015f47fe82daf6b97875ac85c0c6abfad7a5617961f6d268b46c7f6eb4fb8875bd9dd3282eb8b8f906059b51716d09e03e77ca444fa68ea8cd1045ee5f345e
-  data.tar.gz: e1be6d3a3d5469e63703c73622e0b6fe4e2a437a46ded4951ca39d106172374451b3e5d98c8d570145befd335d2759ee407a773f6170367d788f5667bd94424d
+  metadata.gz: f2703469eee712f3b1ae7efb22e48328fd11298c381e711e8c335d599c5d63530a9a602d48da8fa522d5a3a892d78bb67db4d29c4c1a04b5083a907798f16025
+  data.tar.gz: 73b61050f817f3f258dd63588add88d53ea949edee0c78df9d8fb5b55a4ef7063c9cfed774b448aabf74078b5932e8e27f8fa36da59bb5c9cac328ac79a511a1

data/lib/pkgforge/components/run.rb

@@ -10,13 +10,6 @@ module PkgForge
       nil
     end
 
-    Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
-    def test_run(cmd, env = {})
-      Dir.chdir(tmpdir(:release)) do
-        run_local(cmd, env)
-      end
-    end
-
     private
 
     Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil

data/lib/pkgforge/components/test.rb

@@ -16,6 +16,37 @@ module PkgForge
       tester = PkgForge::DSL::Test.new(self)
       tester.instance_eval(&test_block)
     end
+
+    Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
+    def test_run(cmd, env = {})
+      cmd.unshift('/usr/bin/env') if cmd.is_a? Array
+      cmd.prepend('/usr/bin/env ') if cmd.is_a? String
+      env['PATH'] ||= './usr/bin'
+      lib_override do
+        Dir.chdir(tmpdir(:release)) do
+          run_local(cmd, env)
+        end
+      end
+    end
+
+    private
+
+    Contract Func[None => nil] => nil
+    def lib_override
+      lib_path_file = '/etc/ld-musl-x86_64.path'
+      old_lib_paths = File.read(lib_path_file)
+      puts "Setting library path: #{ld_library_path}"
+      File.open(lib_path_file, 'w') { |fh| fh << ld_library_path }
+      yield
+    ensure
+      File.open(lib_path_file, 'w') { |fh| fh << old_lib_paths }
+      nil
+    end
+
+    Contract None => String
+    def ld_library_path
+      deps.keys.map { |x| "#{dep(x)}/usr/lib" }.join(':')
+    end
   end
 
   module DSL
@@ -34,19 +65,8 @@ module PkgForge
     class Test
       Contract Or[String, Array], Or[HashOf[String => String], {}, nil] => nil
       def run(cmd, env = {})
-        cmd.unshift('/usr/bin/env') if cmd.is_a? Array
-        cmd << ';' if cmd.is_a? String
-        env['PATH'] ||= './usr/bin'
-        env['LD_LIBRARY_PATH'] ||= ld_library_path
         @forge.test_run(cmd, env)
       end
-
-      private
-
-      Contract None => String
-      def ld_library_path
-        @forge.deps.keys.map { |x| "#{@forge.dep(x)}/usr/lib" }.join(':')
-      end
     end
   end
 end

data/lib/pkgforge/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare version number
 module PkgForge
-  VERSION = '0.4.10'.freeze
+  VERSION = '0.4.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Les Aker