pdk 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa8d8a0b82102681c9b61fe39ba2222cd252a3a
-  data.tar.gz: 586bc04ec9a42581020f88a03d5ed58f01b52d62
+  metadata.gz: 9ea5f48c79dcfed30096538854272bcc6bca4ec3
+  data.tar.gz: a696b79de41f728412f956e8e85278b5e7049001
 SHA512:
-  metadata.gz: 33b02d12161649fd01c1b5e9c259646cfff45e0b0ffd4625ac28caea26aa995ce0346866eb81042c29f900d8dd99a5cb1f71d5347416da332a0376cf9f6ed166
-  data.tar.gz: 9f17d85f76f08d2feb31a9b6e5c2f8c7c39240be48f6a9c51f06cf3f441dddaf239b6da10d45ae075ce38b15d356c3a9572b9305691f3d069e4af5d83fb2576a
+  metadata.gz: 49cb66d1d8000fb2df7b8eeba4ff75d096fbb0880b63c8f81160696182dc3580e914ebc916e443a15d544031ced1365a0fa72c3ffa228921d3c589517a10c0dc
+  data.tar.gz: a4e7975893a393179ebfb0ec77504e37ce981521466d3639a165a0783d80837042511ba54afd2ff7c4d6f23a85e29938ab413a72f3a826616e00a2bab5dc8038

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 
 
+## [v0.4.1](https://github.com/puppetlabs/pdk/tree/v0.4.1) (2017-07-14)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.4.0...v0.4.1)
+
+**Fixed bugs:**
+
+- \(FIXUP\) Resolve conflation of cachedir concepts [\#153](https://github.com/puppetlabs/pdk/pull/153) ([scotje](https://github.com/scotje))
+
 ## [v0.4.0](https://github.com/puppetlabs/pdk/tree/v0.4.0) (2017-07-14)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v0.3.0...v0.4.0)
 

data/lib/pdk/cli/exec.rb

@@ -104,10 +104,13 @@ module PDK
           end
 
           if context == :module
-            # Subprocesses use their own set of gems which are managed by pdk or installed with the package.
-            @process.environment['GEM_HOME'] = File.join(PDK::Util.cachedir, 'ruby', RbConfig::CONFIG['ruby_version'])
+            if PDK::Util.package_install?
+              # Subprocesses use their own set of gems which are managed by pdk or installed with the package.
+              @process.environment['GEM_HOME'] = File.join(PDK::Util.package_cachedir, 'ruby', RbConfig::CONFIG['ruby_version'])
+            else
+              # Subprocesses use their own set of gems which are managed by pdk or installed with the package.
+              @process.environment['GEM_HOME'] = File.join(PDK::Util.cachedir, 'ruby', RbConfig::CONFIG['ruby_version'])
 
-            if PDK::Util.gem_install?
               # This allows the subprocess to find the 'bundler' gem, which isn't in the cachedir above for gem installs.
               # bundler_gem_path = File.absolute_path(File.join(Gem.loaded_specs['bundler'].gem_dir, '..', '..', '..', '..', '..'))
               bundler_gem_path = File.absolute_path(File.join(`bundle show bundler`, '..', '..'))

data/lib/pdk/util.rb

@@ -70,13 +70,16 @@ module PDK
     end
     module_function :pdk_package_basedir
 
+    def package_cachedir
+      File.join(pdk_package_basedir, 'share', 'cache')
+    end
+    module_function :package_cachedir
+
     # Returns the fully qualified path to a per-user PDK cachedir.
     #
     # @return [String] Fully qualified path to per-user PDK cachedir.
     def cachedir
-      if package_install?
-        File.join(pdk_package_basedir, 'share', 'cache')
-      elsif Gem.win_platform?
+      if Gem.win_platform?
         File.join(ENV['LOCALAPPDATA'], 'PDK', 'cache')
       else
         File.join(Dir.home, '.pdk', 'cache')

data/lib/pdk/util/bundler.rb

@@ -146,7 +146,7 @@ module PDK
         end
 
         def bundle_cachedir
-          @bundle_cachedir ||= File.join(PDK::Util.cachedir)
+          @bundle_cachedir ||= PDK::Util.package_install? ? PDK::Util.package_cachedir : File.join(PDK::Util.cachedir)
         end
       end
     end

data/lib/pdk/version.rb

@@ -1,3 +1,3 @@
 module PDK
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules