Merge pull request #165 from aried3r/ar/fix_161

Fix for issue #161 on Chef 13
sous-chefs · Jun 23, 2017 · 40f03cb · 40f03cb
2 parents 9fa58e9 + 8bb53f4
commit 40f03cb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
@@ -89,7 +89,11 @@ suites:
       - name: 2.1.6
         environment:
           CONFIGURE_OPTS: --disable-install-rdoc
-      - name: 2.2.2
+      - name: 2.4.1
         environment:
           CONFIGURE_OPTS: --disable-install-rdoc
-      global: 2.1.6
+      global: 2.1.6
+      gems:
+        '2.4.1':
+          - name: bundler
+            action: upgrade
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -37,7 +37,11 @@ suites:
       - name: 2.1.6
         environment:
           CONFIGURE_OPTS: --disable-install-rdoc
-      - name: 2.2.2
+      - name: 2.4.1
         environment:
           CONFIGURE_OPTS: --disable-install-rdoc
       global: 2.1.6
+      gems:
+        '2.4.1':
+          - name: bundler
+            action: upgrade
diff --git a/libraries/chef_provider_package_rbenvrubygems.rb b/libraries/chef_provider_package_rbenvrubygems.rb
@@ -82,7 +82,7 @@ def normalize_version
         end
 
         def rehash
-          e = ::Chef::Resource::RubyRbenvRehash.new(new_resource.name, @run_context)
+          e = ::Chef::Resource.resource_for_node(:rbenv_rehash, node).new(new_resource.name, @run_context)
           e.root_path rbenv_root
           e.user rbenv_user if rbenv_user
           e.action :nothing

diff --git a/resources/gem.rb b/resources/gem.rb
@@ -24,17 +24,18 @@
 
 provides :rbenv_gem
 
-attribute :package_name,  kind_of: String, name_attribute: true
-attribute :rbenv_version, kind_of: String, default: 'global'
-attribute :version,       kind_of: String
-attribute :response_file, kind_of: String
-attribute :source,        kind_of: String
-attribute :options,       kind_of: [String, Hash]
-attribute :gem_binary,    kind_of: String
-attribute :user,          kind_of: String
-attribute :root_path,     kind_of: String
-attribute :clear_sources, kind_of: [TrueClass, FalseClass]
-attribute :timeout,       kind_of: Integer, default: 300
+attribute :package_name,           kind_of: String, name_attribute: true
+attribute :rbenv_version,          kind_of: String, default: 'global'
+attribute :version,                kind_of: String
+attribute :response_file,          kind_of: String
+attribute :source,                 kind_of: String
+attribute :options,                kind_of: [String, Hash]
+attribute :gem_binary,             kind_of: String
+attribute :user,                   kind_of: String
+attribute :root_path,              kind_of: String
+attribute :clear_sources,          kind_of: [TrueClass, FalseClass]
+attribute :timeout,                kind_of: Integer, default: 300
+attribute :include_default_source, kind_of: [TrueClass, FalseClass]
 
 include Chef::Rbenv::Mixin::ResourceString
 

diff --git a/resources/rehash.rb b/resources/rehash.rb
@@ -22,7 +22,7 @@
 actions :run
 default_action :run
 
-provides :rbenv_rehash
+resource_name :rbenv_rehash
 
 attribute :name,      kind_of: String, name_attribute: true
 attribute :user,      kind_of: String