pkgr 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc2c3b54c7392441fcb7245dd55d92f50c079d7
-  data.tar.gz: 651f0aace529cd1fb2b4094cee35664544febb82
+  metadata.gz: 4295eff26d27f2e59538234d2dd56bbd3cd1f414
+  data.tar.gz: 4cbbec7b378bc664c72f8cf7ab2d146e9311607e
 SHA512:
-  metadata.gz: f3056964307ef13fb6d2180451bde13ef3dbdcb1b8e7aaf78aad32de65d075eff37237bcc78559ed20b3ac0626f4840a525f7fa59c828de0c1fadf6ca88fa929
-  data.tar.gz: adfc0cc6caa99afa30339503b98a65f8efa5fc9665d2aa67939f209a5f46f538df8e0ce2cc07a95bfdb4b34de53454b0661537dff4de178c1315df650546d38e
+  metadata.gz: 482bb1d56b8d58727326f8e39dfa31b44a6702b04d3d74e871d47b644ed3615233304881b31c8b9fbdfb0dc2f152f689e2ad4129c55c51f386e2ac5b7d431df1
+  data.tar.gz: ba7d6a6bc42b625d0912edcae450f76717820c8ca80bafff7a3a17af3b536eb794c491256fc78bad55f1ab31dfbb0ffd7efd556ebdd9e7a49eb62d5501a81b3c

data/lib/pkgr/buildpack.rb

@@ -7,8 +7,14 @@ module Pkgr
       attr_writer :buildpacks_cache_dir
 
       def buildpacks_cache_dir
-        @buildpacks_cache_dir ||= File.expand_path("~/.pkgr/buildpacks").tap do |dir|
-          FileUtils.mkdir_p(dir)
+        default_buildpacks_cache_dir = File.expand_path("~/.pkgr/buildpacks")
+        @buildpacks_cache_dir ||= begin
+          default_buildpacks_cache_dir.tap do |dir|
+            FileUtils.mkdir_p(dir)
+          end
+        rescue
+          Pkgr.warn "Unable to create directory at #{default_buildpacks_cache_dir.inspect}. Using temporary directory."
+          Dir.mktmpdir
         end
       end
     end
@@ -36,7 +42,10 @@ module Pkgr
     end
 
     def compile(path, compile_cache_dir, compile_env_dir)
-      cmd = %{env -i #{compound_environment(path)} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
+      compile_home_dir = Dir.mktmpdir
+      # Required to work around bundler forcing a writable home dir
+      local_env = Env.new(["HOME=#{compile_home_dir}"])
+      cmd = %{env -i #{compound_environment(path, local_env)} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
       Pkgr.debug "Running #{cmd.inspect}"
 
       Dir.chdir(path) do
@@ -48,7 +57,8 @@ module Pkgr
         end
         raise "compile failed" unless $?.exitstatus.zero?
       end
-
+    ensure
+      FileUtils.remove_entry_secure compile_home_dir
       true
     end
 
@@ -107,8 +117,8 @@ module Pkgr
 
   private
 
-    def compound_environment(path)
-      Env.new(['PATH=$PATH']).merge(env).merge(exported_environment(File.join(path, "export")))
+    def compound_environment(path, local_env = Env.new)
+      Env.new(['PATH=$PATH']).merge(local_env).merge(env).merge(exported_environment(File.join(path, "export")))
     end
 
     def exported_environment(path)

data/lib/pkgr/dispatcher.rb

@@ -42,7 +42,7 @@ module Pkgr
         v = (Git.new(path).latest_tag || "").gsub(/^[^\d]+(\d.*)/, '\1')
         # If it's not a Git archive, try to figure out svn revision number
         begin
-          v = `cd #{path.to_s}&&svn info|grep Revision`.to_s.gsub!(/\D/, "") if (v !~ /^\d/)
+          v = `cd #{path.to_s} && svn info 2>/dev/null | grep Revision`.to_s.gsub!(/\D/, "") if (v !~ /^\d/)
         rescue
         end
         v = "0.0.0" if v !~ /^\d/

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Cyril Rohr