poise-ruby 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e1310672624564e0b724222292352c9595760b
-  data.tar.gz: 2deab93c85a22b20ba59ef408ed32c5eb4c2725b
+  metadata.gz: b31dcb91d57100ee4c5c5b64a67f1900cd81e9f4
+  data.tar.gz: f4ad01094229e47d3872578819f5399a046c6ebc
 SHA512:
-  metadata.gz: cb314e2c7e86dd72e4644a44c072863b18502e4097dd1b35d17204a0b3127883aa07a9bfb69813ecb89fcad775d6f7e9a8ce48b12620c3a7234221fd4fbbcf2a
-  data.tar.gz: 6452dc8e984096abe9bddad62070b7efda680a170b53c6140ca73572a78080cf673ab7fc78ee619c86f88c8c00d2d81e989f2d1fe4970df6a6e14072a2aafc9c
+  metadata.gz: e363c5bd743beef1a55230feeffc9779c25e4a59dc647fdbc78fc620d38b6cd751f54d0e8f171a13d23e38589a726c23918b222fe84626921362da19235c37e7
+  data.tar.gz: bcea796ae857b24dac0683b7381be1e44bb458f27618a7f4370336a58a896bf88a82ca1080a1ad0cd526d1472fb102a1b0860c07769482b5c7ce5d255d5ce277

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## v2.1.0
+
+* Fix version field for default Ruby runtime.
+* Add a `:dummy` provider for `ruby_runtime` for unit testing or complex overrides.
+* Improved handling for `bundle exec` in `ruby_execute`.
+* New integration test harness.
+
+## v2.0.0
+
+* Initial release (again)!
+
+## v1.0.0
+
+* Pre-history, we do not speak of these times.

data/chef/recipes/default.rb

@@ -16,4 +16,4 @@
 
 # Default runtimes, last one will be the default.
 ruby_runtime('chef') { provider :chef } if node['poise-ruby']['install_chef_ruby']
-ruby_runtime 'ruby' if node['poise-ruby']['install_ruby']
+ruby_runtime('ruby') { version '' } if node['poise-ruby']['install_ruby']

data/lib/poise_ruby.rb

@@ -16,6 +16,7 @@
 
 
 module PoiseRuby
+  autoload :BundlerMixin, 'poise_ruby/bundler_mixin'
   autoload :Error, 'poise_ruby/error'
   autoload :Resources, 'poise_ruby/resources'
   autoload :RubyCommandMixin, 'poise_ruby/ruby_command_mixin'

data/lib/poise_ruby/bundler_mixin.rb

@@ -0,0 +1,84 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_ruby/error'
+
+
+module PoiseRuby
+  # Mixin for creating bundle exec commands.
+  #
+  # @since 2.1.0
+  module BundlerMixin
+    # Transform a command to run under `bundle exec` with the same semantics as
+    # Ruby execution elsewhere in this system. That means you should end up with
+    # something like `/bin/ruby /bin/bundle exec /bin/ruby /bin/cmd args`.
+    #
+    # @param cmd [String, Array<String>] Command to transform.
+    # @param path [String] Optional input path for command resolution.
+    # @return [String, Array<String>]
+    def bundle_exec_command(cmd, path: nil)
+      bundle = new_resource.parent_bundle
+      return cmd unless bundle
+      is_array = cmd.is_a?(Array)
+      cmd = Shellwords.split(cmd) unless is_array
+      root_path = ::File.expand_path('..', bundle.gemfile_path)
+      # Grab this once in case I need it for the extra path.
+      bundler_binary = bundle.bundler_binary
+      # This doesn't account for the potential of a .bundle/config created with
+      # settings that Chef doesn't know about. (╯°□°）╯︵ ┻━┻
+      extra_path = if bundle.binstubs
+        bundle.binstubs == true ? 'bin' : bundle.binstubs
+      elsif bundle.vendor || bundle.deployment
+        # Find the relative path to start searching from.
+        vendor_base_path = if bundle.vendor && bundle.vendor != true
+          bundle.vendor
+        else
+          'vendor/bundle'
+        end
+        # Add the ruby/.
+        vendor_base_path = ::File.join(File.expand_path(vendor_base_path, root_path), 'ruby')
+        # Find the version number folder inside that.
+        candidates = Dir.entries(vendor_base_path)
+        ruby_abi_folder = candidates.find {|name| name =~ /^\d\./ }
+        vendor_sub_path = if ruby_abi_folder
+          ::File.join(ruby_abi_folder, 'bin')
+        elsif candidates.include?('bin')
+          'bin'
+        else
+          raise PoiseRuby::Error.new("Unable to find the vendor bin folder for #{vendor_base_path}: #{candidates.join(', ')}")
+        end
+        # Make the final path.
+        ::File.join(vendor_base_path, vendor_sub_path)
+      else
+        # The folder the bundler binary is in was the global gem executable dir.
+        ::File.dirname(bundler_binary)
+      end
+      # Resolve relative paths against Bundler.root.
+      extra_path = ::File.expand_path(extra_path, root_path)
+      # Create the full $PATH.
+      path ||= ENV['PATH']
+      bundle_exec_path = extra_path + ::File::PATH_SEPARATOR + path
+      # Resolve the command
+      abs_cmd = PoiseLanguages::Utils.absolute_command(cmd, path: bundle_exec_path)
+      bundle_exec = [new_resource.ruby, bundler_binary, 'exec', new_resource.ruby] + abs_cmd
+      if is_array
+        bundle_exec
+      else
+        PoiseLanguages::Utils.shelljoin(bundle_exec)
+      end
+    end
+  end
+end

data/lib/poise_ruby/resources/ruby_execute.rb

@@ -14,13 +14,12 @@
 # limitations under the License.
 #
 
-require 'shellwords'
-
 require 'chef/mash'
 require 'chef/provider/execute'
 require 'chef/resource/execute'
 require 'poise'
 
+require 'poise_ruby/bundler_mixin'
 require 'poise_ruby/ruby_command_mixin'
 
 
@@ -54,6 +53,7 @@ module PoiseRuby
       # @see Resource
       # @provides ruby_execute
       class Provider < Chef::Provider::Execute
+        include PoiseRuby::BundlerMixin
         provides(:ruby_execute)
 
         private
@@ -62,15 +62,14 @@ module PoiseRuby
         #
         # @return [String, Array<String>]
         def command
-          prefix = [new_resource.ruby]
           if new_resource.parent_bundle
-            prefix << new_resource.parent_bundle.bundler_binary
-            prefix << 'exec'
-          end
-          if new_resource.command.is_a?(Array)
-            prefix + new_resource.command
+            bundle_exec_command(new_resource.command, path: environment['PATH'])
           else
-            "#{Shellwords.join(prefix)} #{new_resource.command}"
+            if new_resource.command.is_a?(Array)
+              [new_resource.ruby] + new_resource.command
+            else
+              "#{new_resource.ruby} #{new_resource.command}"
+            end
           end
         end
 

data/lib/poise_ruby/resources/ruby_gem.rb

@@ -96,6 +96,12 @@ module PoiseRuby
           end
 
           begin
+            if ENV['GEM_HOME'] && !ENV['GEM_HOME'].empty?
+              Chef::Log.warn("[#{new_resource}] $GEM_HOME is set in Chef's environment, this will likely interfere with gem installation")
+            end
+            if ENV['GEM_PATH'] && !ENV['GEM_PATH'].empty?
+              Chef::Log.warn("[#{new_resource}] $GEM_PATH is set in Chef's environment, this will likely interfere with gem installation")
+            end
             old_vars = environment_to_add.inject({}) do |memo, (key, value)|
               memo[key] = ENV[key]
               ENV[key] = value

data/lib/poise_ruby/resources/ruby_runtime_test.rb

@@ -0,0 +1,213 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/mixin/convert_to_class_name'
+require 'chef/provider'
+require 'chef/resource'
+require 'poise'
+
+
+module PoiseRuby
+  module Resources
+    # (see RubyRuntimeTest::Resource)
+    # @since 2.1.0
+    # @api private
+    module RubyRuntimeTest
+      # A `ruby_runtime_test` resource for integration testing of this
+      # cookbook. This is an internal API and can change at any time.
+      #
+      # @provides ruby_runtime_test
+      # @action run
+      class Resource < Chef::Resource
+        include Poise
+        provides(:ruby_runtime_test)
+        actions(:run)
+
+        attribute(:version, kind_of: String, name_attribute: true)
+        attribute(:runtime_provider, kind_of: Symbol)
+        attribute(:path, kind_of: String, default: lazy { default_path })
+
+        def default_path
+          ::File.join('', 'root', "ruby_test_#{name}")
+        end
+      end
+
+      # The default provider for `ruby_runtime_test`.
+      #
+      # @see Resource
+      # @provides ruby_runtime_test
+      class Provider < Chef::Provider
+        include Poise
+        provides(:ruby_runtime_test)
+
+        # The `run` action for the `ruby_runtime_test` resource.
+        #
+        # @return [void]
+        def action_run
+          notifying_block do
+            # Top level directory for this test.
+            directory new_resource.path
+
+            # Install and log the version.
+            ruby_runtime new_resource.name do
+              provider new_resource.runtime_provider if new_resource.runtime_provider
+              version new_resource.version
+            end
+            test_version
+
+            # Test ruby_gem.
+            ruby_gem 'thor remove before' do
+              action :remove
+              package_name 'thor'
+              ruby new_resource.name
+            end
+            test_require('thor', 'thor_before')
+            ruby_gem 'thor' do
+              ruby new_resource.name
+              notifies :create, sentinel_file('thor'), :immediately
+            end
+            test_require('thor', 'thor_mid')
+            ruby_gem 'thor again' do
+              package_name 'thor'
+              ruby new_resource.name
+              notifies :create, sentinel_file('thor2'), :immediately
+            end
+            ruby_gem 'thor remove after' do
+              action :remove
+              package_name 'thor'
+              ruby new_resource.name
+            end
+            test_require('thor', 'thor_after')
+
+            # Use bundler to test something that should always be installed.
+            ruby_gem 'bundler' do
+              ruby new_resource.name
+              notifies :create, sentinel_file('bundler'), :immediately
+            end
+
+            # Create and install a Gemfile.
+            bundle1_path = ::File.join(new_resource.path, 'bundle1')
+            directory bundle1_path
+            file ::File.join(bundle1_path, 'Gemfile') do
+              content <<-EOH
+source 'https://rubygems.org/'
+gem 'hashie'
+gem 'tomlrb', '1.1.0'
+EOH
+            end
+            bundle1 = bundle_install bundle1_path do
+              ruby new_resource.name
+            end
+            test_require('hashie', bundle: bundle1)
+            test_require('tomlrb', bundle: bundle1)
+            test_require('thor', 'thor_bundle', bundle: bundle1)
+
+            # Test for bundle exec shebang issues.
+            bundle2_path = ::File.join(new_resource.path, 'bundle2')
+            directory bundle2_path
+            file ::File.join(bundle2_path, 'Gemfile') do
+              content <<-EOH
+source 'https://rubygems.org/'
+gem 'unicorn'
+EOH
+            end
+            file ::File.join(bundle2_path, 'Gemfile.lock') do
+              content <<-EOH
+GEM
+  remote: https://rubygems.org/
+  specs:
+    kgio (2.10.0)
+    rack (1.6.4)
+    raindrops (0.15.0)
+    unicorn (4.9.0)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  unicorn
+
+BUNDLED WITH
+   1.10.6
+EOH
+            end
+            bundle2 = bundle_install bundle2_path do
+              ruby new_resource.name
+              deployment true
+            end
+            # test_require('unicorn', bundle: bundle2)
+            ruby_execute "unicorn --version > #{::File.join(new_resource.path, "unicorn_version")}" do
+              ruby new_resource.name
+              parent_bundle bundle2
+            end
+          end
+        end
+
+        def sentinel_file(name)
+          file ::File.join(new_resource.path, "sentinel_#{name}") do
+            action :nothing
+          end
+        end
+
+        private
+
+        def test_version(ruby: new_resource.name)
+          # Only queue up this resource once, the ivar is just for tracking.
+          @ruby_version_test ||= file ::File.join(new_resource.path, 'ruby_version.rb') do
+            user 'root'
+            group 'root'
+            mode '644'
+            content <<-EOH
+File.new(ARGV[0], 'w').write(RUBY_VERSION)
+EOH
+          end
+
+          ruby_execute "#{@ruby_version_test.path} #{::File.join(new_resource.path, 'version')}" do
+            ruby ruby if ruby
+          end
+        end
+
+        def test_require(name, path=name, ruby: new_resource.name, bundle: nil, class_name: nil)
+          # Only queue up this resource once, the ivar is just for tracking.
+          @ruby_require_test ||= file ::File.join(new_resource.path, 'require_version.rb') do
+            user 'root'
+            group 'root'
+            mode '644'
+            content <<-EOH
+require 'rubygems'
+begin
+  require "\#{ARGV[0]}/version"
+  klass = ARGV[1].split('::').inject(Object) {|memo, name| memo.const_get(name) }
+  File.new(ARGV[2], 'w').write(klass::VERSION)
+rescue LoadError
+end
+EOH
+          end
+
+          class_name ||= Chef::Mixin::ConvertToClassName.convert_to_class_name(name)
+          ruby_execute "#{@ruby_require_test.path} #{name} #{class_name} #{::File.join(new_resource.path, "require_#{path}")}" do
+            ruby ruby if ruby
+            parent_bundle bundle if bundle
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/poise_ruby/ruby_command_mixin.rb

@@ -21,7 +21,7 @@ require 'poise_languages'
 module PoiseRuby
   # Mixin for resources and providers which run Ruby commands.
   #
-  # @since 1.0.0
+  # @since 2.0.0
   module RubyCommandMixin
     include Poise::Utils::ResourceProviderMixin
 

data/lib/poise_ruby/ruby_providers.rb

@@ -14,7 +14,10 @@
 # limitations under the License.
 #
 
+require 'chef/platform/provider_priority_map'
+
 require 'poise_ruby/ruby_providers/chef'
+require 'poise_ruby/ruby_providers/dummy'
 require 'poise_ruby/ruby_providers/scl'
 require 'poise_ruby/ruby_providers/system'
 

data/lib/poise_ruby/ruby_providers/base.rb

@@ -17,6 +17,7 @@
 require 'chef/provider'
 require 'poise'
 
+require 'poise_ruby/resources/ruby_gem'
 require 'poise_ruby/resources/ruby_runtime'
 
 

data/lib/poise_ruby/ruby_providers/chef.rb

@@ -20,7 +20,7 @@ require 'poise_ruby/ruby_providers/base'
 
 module PoiseRuby
   module RubyProviders
-    # Inversion provider for the `ruby` resource to use whatever Ruby is
+    # Inversion provider for the `ruby_runtime` resource to use whatever Ruby is
     # currently running, generally Chef's omnibus-d Ruby.
     #
     # @since 2.0.0

data/lib/poise_ruby/ruby_providers/dummy.rb

@@ -0,0 +1,77 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'poise_ruby/ruby_providers/base'
+
+
+module PoiseRuby
+  module RubyProviders
+    # Inversion provider for the `ruby_runtime` resource to use a fake Ruby,
+    # for use in unit tests.
+    #
+    # @since 2.1.0
+    # @provides dummy
+    class Dummy < Base
+      provides(:dummy)
+
+      def self.default_inversion_options(node, resource)
+        super.merge({
+          # Manual overrides for dummy data.
+          ruby_binary: ::File.join('', 'ruby'),
+          ruby_environment: nil,
+          gem_binary: nil,
+        })
+      end
+
+      # The `install` action for the `ruby_runtime` resource.
+      #
+      # @return [void]
+      def action_install
+        # This space left intentionally blank.
+      end
+
+      # The `uninstall` action for the `ruby_runtime` resource.
+      #
+      # @return [void]
+      def action_uninstall
+        # This space left intentionally blank.
+      end
+
+      # Path to the non-existent ruby.
+      #
+      # @return [String]
+      def ruby_binary
+        options['ruby_binary']
+      end
+
+      # Environment for the non-existent Ruby.
+      #
+      # @return [String]
+      def ruby_environment
+        options['ruby_environment'] || super
+      end
+
+      # Path to the non-existent gem.
+      #
+      # @return [String]
+      def gem_binary
+        options['gem_binary'] || super
+      end
+
+    end
+  end
+end
+

data/lib/poise_ruby/ruby_providers/scl.rb

@@ -25,13 +25,13 @@ module PoiseRuby
     class Scl < Base
       include PoiseLanguages::Scl::Mixin
       provides(:scl)
-      scl_package('2.2.2', 'rh-ruby22', {
+      scl_package('2.2.2', 'rh-ruby22', 'rh-ruby22-ruby-devel', {
         ['redhat', 'centos'] => {
           '~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/rh-ruby22/epel-7-x86_64/download/rhscl-rh-ruby22-epel-7-x86_64.noarch.rpm',
           '~> 6.0' => 'https://www.softwarecollections.org/en/scls/rhscl/rh-ruby22/epel-6-x86_64/download/rhscl-rh-ruby22-epel-6-x86_64.noarch.rpm',
         },
       })
-      scl_package('2.0.0', 'ruby200', {
+      scl_package('2.0.0', 'ruby200', 'ruby200-ruby-devel', {
         ['redhat', 'centos'] => {
           # On CentOS 7, the system package is Ruby 2.0.0 and is newer than the SCL build.
           #'~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/ruby200/epel-7-x86_64/download/rhscl-ruby200-epel-7-x86_64.noarch.rpm',
@@ -42,7 +42,7 @@ module PoiseRuby
           '~> 20.0' => 'https://www.softwarecollections.org/en/scls/rhscl/ruby200/fedora-20-x86_64/download/rhscl-ruby200-fedora-20-x86_64.noarch.rpm',
         },
       })
-      scl_package('1.9.3', 'ruby193', {
+      scl_package('1.9.3', 'ruby193', 'ruby193-ruby-devel', {
         ['redhat', 'centos'] => {
           '~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/ruby193/epel-7-x86_64/download/rhscl-ruby193-epel-7-x86_64.noarch.rpm',
           '~> 6.0' => 'https://www.softwarecollections.org/en/scls/rhscl/ruby193/epel-6-x86_64/download/rhscl-ruby193-epel-6-x86_64.noarch.rpm',

data/lib/poise_ruby/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseRuby
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/poise-ruby.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'halite', '~> 1.0'
   spec.add_dependency 'poise', '~> 2.0'
-  spec.add_dependency 'poise-languages', '~> 1.0.pre'
+  spec.add_dependency 'poise-languages', '~> 1.2'
 
   spec.add_development_dependency 'poise-boiler', '~> 1.0'
 end

data/test/cookbooks/poise-ruby_test/metadata.rb

@@ -16,3 +16,4 @@
 
 name 'poise-ruby_test'
 depends 'poise-ruby'
+depends 'build-essential'

data/test/cookbooks/poise-ruby_test/recipes/default.rb

@@ -14,72 +14,27 @@
 # limitations under the License.
 #
 
+require 'poise_ruby/resources/ruby_runtime_test'
+
+include_recipe 'build-essential'
+
 # Install lsb-release because Debian 6 doesn't by default and serverspec requires it
 package 'lsb-release' if platform?('debian') && node['platform_version'].start_with?('6')
 
-ruby_runtime 'chef' do
-  provider :chef
+ruby_runtime_test 'chef' do
+  runtime_provider :chef
 end
 
-ruby_runtime 'any' do
+ruby_runtime_test 'system' do
   version ''
-  provider :system
-end
-
-file '/root/poise_ruby_test.rb' do
-  user 'root'
-  group 'root'
-  mode '644'
-  content <<-EOH
-File.open(ARGV[0], 'w') do |f|
-  f.write(RUBY_VERSION)
-end
-EOH
+  runtime_provider :system
 end
 
-ruby_execute '/root/poise_ruby_test.rb /root/one'
-
-ruby_execute '/root/poise_ruby_test.rb /root/two' do
-  ruby 'chef'
-end
-
-ruby_gem 'rack' do
-  version '1.6.0'
-end
-
-file '/root/poise_ruby_test2.rb' do
-  user 'root'
-  group 'root'
-  mode '644'
-  content <<-EOH
-require 'rubygems'
-require 'rack'
-File.open(ARGV[0], 'w') do |f|
-  f.write(Rack.release)
-end
-EOH
-end
-
-ruby_execute '/root/poise_ruby_test2.rb /root/three'
-
 if platform_family?('rhel')
-  file '/root/scl'
-
-  ruby_runtime 'scl' do
-    version '2'
-    provider :scl
-  end
-
-  ruby_execute '/root/poise_ruby_test.rb /root/four' do
-    ruby 'scl'
-  end
-
-  ruby_gem 'rack' do
-    version '1.6.0'
-    ruby 'scl'
-  end
-
-  ruby_execute '/root/poise_ruby_test2.rb /root/five' do
-    ruby 'scl'
+  ruby_runtime_test 'scl' do
+    version ''
+    runtime_provider :scl
   end
+else
+  file '/no_scl'
 end

data/test/integration/default/serverspec/Gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source 'https://rubygems.org/'
+
+gem 'poise-ruby-spechelper'

data/test/integration/default/serverspec/default_spec.rb

@@ -14,33 +14,16 @@
 # limitations under the License.
 #
 
-require 'serverspec'
-set :backend, :exec
+require 'poise_ruby/spec_helper'
 
-describe 'ruby_runtime' do
-  describe file('/root/one') do
-    it { is_expected.to be_a_file }
-  end
-
-  describe file('/root/two') do
-    it { is_expected.to be_a_file }
-    its(:content) { are_expected.to start_with '2.1' }
-  end
-
-  describe file('/root/three') do
-    it { is_expected.to be_a_file }
-    its(:content) { are_expected.to eq '1.5' }
-  end
+describe 'chef provider' do
+  it_should_behave_like 'a ruby_runtime_test', 'chef'
+end
 
-  describe 'scl provider', if: File.exist?('/root/scl') do
-    describe file('/root/four') do
-      it { is_expected.to be_a_file }
-      its(:content) { are_expected.to eq '2.2.2' }
-    end
+describe 'system provider', unless: File.exist?('/no_system') do
+  it_should_behave_like 'a ruby_runtime_test', 'system'
+end
 
-    describe file('/root/five') do
-      it { is_expected.to be_a_file }
-      its(:content) { are_expected.to eq '1.5' }
-    end
-  end
+describe 'scl provider', unless: File.exist?('/no_scl') do
+  it_should_behave_like 'a ruby_runtime_test', 'scl'
 end

data/test/spec/resources/bundle_install_spec.rb

@@ -22,7 +22,7 @@ describe PoiseRuby::Resources::BundleInstall do
       bundle_install '/test/Gemfile'
     end
     before do
-      allow_any_instance_of(described_class).to receive(:which).with('ruby').and_return('/test/bin/ruby')
+      allow(PoiseLanguages::Utils).to receive(:which).with('ruby').and_return('/test/bin/ruby')
     end
 
     it { is_expected.to install_bundle_install('/test/Gemfile').with(gem_binary: '/test/bin/gem') }

data/test/spec/resources/ruby_execute_spec.rb

@@ -23,7 +23,7 @@ describe PoiseRuby::Resources::RubyExecute do
     end
 
     it { is_expected.to run_ruby_execute('myapp.rb') }
-  end
+  end # /describe PoiseRuby::Resources::RubyExecute::Resource
 
   describe PoiseRuby::Resources::RubyExecute::Provider do
     let(:command) { nil }
@@ -56,15 +56,15 @@ describe PoiseRuby::Resources::RubyExecute do
 
     context 'with a bundle parent' do
       let(:command) { 'myapp.rb' }
-      let(:parent_bundle) { double('parent_bundle', bundler_binary: '/bundle', gemfile_path: '/srv/Gemfile') }
-      its(:command) { is_expected.to eq '/ruby /bundle exec myapp.rb' }
+      let(:parent_bundle) { double('parent_bundle', bundler_binary: '/bundle', gemfile_path: '/srv/Gemfile', binstubs: false, vendor: false, deployment: false) }
+      its(:command) { is_expected.to eq '/ruby /bundle exec /ruby myapp.rb' }
       its(:environment) { is_expected.to eq({'BUNDLE_GEMFILE' => '/srv/Gemfile'}) }
     end # /context with a bundle parent
 
     context 'with a bundle parent and an array command' do
       let(:command) { %w{myapp.rb} }
-      let(:parent_bundle) { double('parent_bundle', bundler_binary: '/bundle', gemfile_path: '/srv/Gemfile') }
-      its(:command) { is_expected.to eq %w{/ruby /bundle exec myapp.rb} }
+      let(:parent_bundle) { double('parent_bundle', bundler_binary: '/bundle', gemfile_path: '/srv/Gemfile', binstubs: false, vendor: false, deployment: false) }
+      its(:command) { is_expected.to eq %w{/ruby /bundle exec /ruby myapp.rb} }
       its(:environment) { is_expected.to eq({'BUNDLE_GEMFILE' => '/srv/Gemfile'}) }
     end # /context with a bundle parent and an array command
 
@@ -74,5 +74,5 @@ describe PoiseRuby::Resources::RubyExecute do
       its(:command) { is_expected.to eq '/ruby myapp.rb' }
       its(:environment) { is_expected.to eq({'PATH' => '/bin'}) }
     end # /context with a ruby parent
-  end
+  end # /describe PoiseRuby::Resources::RubyExecute::Provider
 end

data/test/spec/ruby_providers/dummy_spec.rb

@@ -0,0 +1,62 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe PoiseRuby::RubyProviders::Dummy do
+  let(:ruby_runtime) { chef_run.ruby_runtime('test') }
+  step_into(:ruby_runtime)
+  recipe do
+    ruby_runtime 'test' do
+      provider :dummy
+    end
+  end
+
+  describe '#ruby_binary' do
+    subject { ruby_runtime.ruby_binary }
+
+    it { is_expected.to eq '/ruby' }
+  end # /describe #ruby_binary
+
+  describe '#ruby_environment' do
+    subject { ruby_runtime.ruby_environment }
+
+    it { is_expected.to eq({}) }
+  end # /describe #ruby_environment
+
+  describe '#gem_binary' do
+    subject { ruby_runtime.gem_binary }
+
+    it { is_expected.to eq '/gem' }
+  end # /describe #gem_binary
+
+  describe 'action :install' do
+    # Just make sure it doesn't error.
+    it { run_chef }
+  end # /describe action :install
+
+  describe 'action :uninstall' do
+    recipe do
+      ruby_runtime 'test' do
+        action :uninstall
+        provider :dummy
+      end
+    end
+
+    # Just make sure it doesn't error.
+    it { run_chef }
+  end # /describe action :uninstall
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.pre
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.pre
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Berksfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -86,6 +87,7 @@ files:
 - chef/attributes/default.rb
 - chef/recipes/default.rb
 - lib/poise_ruby.rb
+- lib/poise_ruby/bundler_mixin.rb
 - lib/poise_ruby/cheftie.rb
 - lib/poise_ruby/error.rb
 - lib/poise_ruby/resources.rb
@@ -93,10 +95,12 @@ files:
 - lib/poise_ruby/resources/ruby_execute.rb
 - lib/poise_ruby/resources/ruby_gem.rb
 - lib/poise_ruby/resources/ruby_runtime.rb
+- lib/poise_ruby/resources/ruby_runtime_test.rb
 - lib/poise_ruby/ruby_command_mixin.rb
 - lib/poise_ruby/ruby_providers.rb
 - lib/poise_ruby/ruby_providers/base.rb
 - lib/poise_ruby/ruby_providers/chef.rb
+- lib/poise_ruby/ruby_providers/dummy.rb
 - lib/poise_ruby/ruby_providers/scl.rb
 - lib/poise_ruby/ruby_providers/system.rb
 - lib/poise_ruby/version.rb
@@ -108,11 +112,13 @@ files:
 - test/docker/docker.pem
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
+- test/integration/default/serverspec/Gemfile
 - test/integration/default/serverspec/bundle_install_spec.rb
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/resources/bundle_install_spec.rb
 - test/spec/resources/ruby_execute_spec.rb
 - test/spec/ruby_command_mixin_spec.rb
+- test/spec/ruby_providers/dummy_spec.rb
 - test/spec/spec_helper.rb
 homepage: https://github.com/poise/poise-ruby
 licenses:
@@ -146,10 +152,12 @@ test_files:
 - test/docker/docker.pem
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
+- test/integration/default/serverspec/Gemfile
 - test/integration/default/serverspec/bundle_install_spec.rb
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/resources/bundle_install_spec.rb
 - test/spec/resources/ruby_execute_spec.rb
 - test/spec/ruby_command_mixin_spec.rb
+- test/spec/ruby_providers/dummy_spec.rb
 - test/spec/spec_helper.rb
 has_rdoc: