poise-ruby-build 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aacd8d4d8f8bd19f06b25689b0d3463a6b8815f7
-  data.tar.gz: b816f963ea55a4a0436e89ea31c4d4371c61ca82
+  metadata.gz: 4a07eca70f6f3304b38de491b2126559cce39fdc
+  data.tar.gz: 33230f856c92200db06613fe73a23fa07290c168
 SHA512:
-  metadata.gz: 36c9b89b94c998c3dd90a72c7989476dc6a40458852691a3432579d201ddf37bf05179984bab9aa0551044c5876cfbed98fb1d9f122b02fcaf565370877d2dee
-  data.tar.gz: 95074f0539f382b5e7569936787646e0230829b4b89bd46e111d71505835d845f7daebea8f1f5b5c2edf6e793d3419b874c5f9525c105dcf55aea4e6622f750a
+  metadata.gz: c9737a634499b2f4235d298f5366e64dd3dacc0a6c20b12ac1b8dc3ba8c8b425e58a375e5fe3dc00f84ef9c00108a8cb4dbebba09e411eb68fff96f58fde2320
+  data.tar.gz: 369afe47117c8ea584f192fbc237d91e09d00416504d4dfcbb5dcb64a10c426fa2f48a99f23c4dc72eb075d2d54877930cb90aae40e809e3f59cf5038bd8b2f1

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Poise-Ruby-Build Changelog
+
+## v1.0.1
+
+* Install bundler in the same way as other `ruby_runtime` providers.
+* New integration test harness.
+
+## v1.0.0
+
+* Initial release!
+

data/lib/poise_ruby/ruby_build/provider.rb

@@ -43,47 +43,6 @@ module PoiseRuby
         })
       end
 
-      # `install` action for the `ruby_runtime` resource. Installs ruby-build
-      # and then uses that to install Ruby.
-      #
-      # @return [void]
-      def action_install
-        # We assume that if the version_file exists, ruby-build is already
-        # installed. Calling #ruby_definition will shell out to ruby-build.
-        if ::File.exists?(version_file) && IO.read(version_file) == ruby_definition
-          # All set, bail out.
-          return
-        end
-
-        converge_by("Installing Ruby #{options['version'].empty? ? new_resource.name : options['version']} via ruby-build") do
-          notifying_block do
-            create_prefix_directory
-            create_install_directory
-            create_builds_directory
-            install_ruby_build
-            install_dependencies
-            # Possible failed install or a version change. Wipe the existing build.
-            remove_ruby if ::File.exists?(::File.join(options['prefix'], 'builds', new_resource.name))
-          end
-          # Second converge has ruby-build installed so using #ruby_definition
-          # is safe.
-          notifying_block do
-            install_ruby
-            create_version_file
-          end
-        end
-      end
-
-      # `uninstall` action for the `ruby_runtime` resource. Remove Ruby, but
-      # leave ruby-build installed as it may be shared by other resources.
-      #
-      # @return [void]
-      def action_uninstall
-        notifying_block do
-          remove_ruby
-        end
-      end
-
       # Path to the compiled Ruby binary.
       #
       # @return [String]
@@ -118,6 +77,36 @@ module PoiseRuby
         ::File.join(options['prefix'], 'builds', new_resource.name, 'VERSION')
       end
 
+      # Installs ruby-build and then uses that to install Ruby.
+      #
+      # @return [void]
+      def install_ruby
+        # We assume that if the version_file exists, ruby-build is already
+        # installed. Calling #ruby_definition will shell out to ruby-build.
+        if ::File.exists?(version_file) && IO.read(version_file) == ruby_definition
+          # All set, bail out.
+          return
+        end
+
+        converge_by("Installing Ruby #{options['version'].empty? ? new_resource.name : options['version']} via ruby-build") do
+          notifying_block do
+            create_prefix_directory
+            create_install_directory
+            create_builds_directory
+            install_ruby_build
+            install_dependencies
+            # Possible failed install or a version change. Wipe the existing build.
+            remove_ruby if ::File.exists?(::File.join(options['prefix'], 'builds', new_resource.name))
+          end
+          # Second converge has ruby-build installed so using #ruby_definition
+          # is safe.
+          notifying_block do
+            build_ruby
+            create_version_file
+          end
+        end
+      end
+
       # Create the base prefix directory.
       #
       # @return [Chef::Resource::Directory]
@@ -185,7 +174,7 @@ module PoiseRuby
       # Compile Ruby using ruby-build.
       #
       # @return [Chef::Resource::Execute]
-      def install_ruby
+      def build_ruby
         # Figure out the argument to disable docs
         disable_docs = if options['install_doc']
           nil
@@ -216,10 +205,11 @@ module PoiseRuby
         end
       end
 
-      # Delete the compiled Ruby.
+      # Delete the compiled Ruby, but leave ruby-build installed as it may be
+      # shared by other resources.
       #
       # @return [Chef::Resource::Directory]
-      def remove_ruby
+      def uninstall_ruby
         directory ::File.join(options['prefix'], 'builds', new_resource.name) do
           action :delete
         end

data/lib/poise_ruby/ruby_build/version.rb

@@ -17,6 +17,6 @@
 
 module PoiseRuby
   module RubyBuild
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/poise-ruby-build.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-ruby', '~> 2.0.pre'
+  spec.add_dependency 'poise-ruby', '~> 2.1'
 
   spec.add_development_dependency 'poise-boiler', '~> 1.0'
 

data/test/cookbooks/poise-ruby-build_test/recipes/default.rb

@@ -14,17 +14,9 @@
 # limitations under the License.
 #
 
-ruby_runtime '2.2.2' do
-  provider :ruby_build
-end
+require 'poise_ruby/resources/ruby_runtime_test'
 
-file '/root/poise_ruby_test.rb' do
-  user 'root'
-  group 'root'
-  mode '644'
-  content <<-EOH
-IO.write(ARGV[0], RUBY_VERSION)
-EOH
+ruby_runtime_test 'ruby_build' do
+  version '2.2.2'
+  runtime_provider :ruby_build
 end
-
-ruby_execute '/root/poise_ruby_test.rb /root/one'

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,10 +14,8 @@
 # limitations under the License.
 #
 
-require 'serverspec'
-set :backend, :exec
+require 'poise_ruby/spec_helper'
 
-describe file('/root/one') do
-  it { is_expected.to be_a_file }
-  its(:content) { are_expected.to eq '2.2.2' }
+describe 'ruby_build provider' do
+  it_should_behave_like 'a ruby_runtime_test', 'ruby_build', '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-ruby-build
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.pre
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.pre
+        version: '2.1'
 - !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
@@ -95,6 +96,7 @@ files:
 - test/docker/docker.pem
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
+- test/integration/default/serverspec/Gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/provider_spec.rb
 - test/spec/spec_helper.rb
@@ -130,6 +132,7 @@ test_files:
 - test/docker/docker.pem
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
+- test/integration/default/serverspec/Gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/provider_spec.rb
 - test/spec/spec_helper.rb