poise-ruby-build 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a07eca70f6f3304b38de491b2126559cce39fdc
-  data.tar.gz: 33230f856c92200db06613fe73a23fa07290c168
+  metadata.gz: a1f54d7cef4dc8ff0ef87e1b6438d1daaab3a5a2
+  data.tar.gz: 2f17a794cb20c0e0459c2081eb7c06557c6d457d
 SHA512:
-  metadata.gz: c9737a634499b2f4235d298f5366e64dd3dacc0a6c20b12ac1b8dc3ba8c8b425e58a375e5fe3dc00f84ef9c00108a8cb4dbebba09e411eb68fff96f58fde2320
-  data.tar.gz: 369afe47117c8ea584f192fbc237d91e09d00416504d4dfcbb5dcb64a10c426fa2f48a99f23c4dc72eb075d2d54877930cb90aae40e809e3f59cf5038bd8b2f1
+  metadata.gz: 4cab153c49cf867e85f1b414a500783ee98198b0b3e7c62d7247d1a5956ada74ef62668b827e71df1c6f126191bfe21a4f58f6d81bbea6411a395306bd1ede33
+  data.tar.gz: 1e192871d2bed258b1d53b96f9558bcbf48d1cd87c0ec467c9320f91ef6c914901db8bce390750de105435ad2377e2cb4110841e0beddec27a1baa6ddf3df6db

data/.kitchen.yml

@@ -1,8 +1,3 @@
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen(platforms: 'linux') %>
-
-suites:
-- name: default
-  run_list:
-  - recipe[poise-ruby-build_test]
+<%= PoiseBoiler.kitchen %>

data/.travis.yml

@@ -11,11 +11,17 @@ addons:
 env:
   global:
   - USE_SYSTEM_GECODE=true
-  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml
   - secure: lqst12Un4L5SLj0I8VlU7aRwXDoEPemuRcQrP1+wQA8f1YGnxe5fWMnjnWNHi3dsxshYDBZmjyXzKxnju2v7OJdtLNSGcJlFAz/0PwJOwAuM/rFqK/PXMgYZDS2BgvYdsDOEYoVdC8dL7N5Q/Ri3nst4uCThDcv2XX9F7gAAWLc=
+before_install: "gem install bundler"
 bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
 script:
 - "./bin/rake travis"
 gemfile:
 - test/gemfiles/chef-12.gemfile
+- test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.2.gemfile
+- test/gemfiles/chef-12.3.gemfile
+- test/gemfiles/chef-12.4.gemfile
+- test/gemfiles/chef-12.5.gemfile
+- test/gemfiles/chef-12.6.gemfile
 - test/gemfiles/master.gemfile

data/Berksfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,8 +22,3 @@ cookbook 'poise', gem: 'poise'
 cookbook 'poise-languages', gem: 'poise-languages'
 cookbook 'poise-ruby', gem: 'poise-ruby'
 cookbook 'poise-ruby-build', gem: 'poise-ruby-build'
-
-group :test do
-  cookbook 'poise-ruby-build_test', path: 'test/cookbooks/poise-ruby-build_test'
-  cookbook 'apt'
-end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Poise-Ruby-Build Changelog
 
+## v1.0.2
+
+* Fix a typo that prevented uninstalling `ruby_build` runtimes.
+* Ensure bzip2 is installed as some minimal Linux images do not include it.
+
 ## v1.0.1
 
 * Install bundler in the same way as other `ruby_runtime` providers.

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,3 +32,4 @@ dev_gem 'poise'
 dev_gem 'poise-boiler'
 dev_gem 'poise-ruby'
 dev_gem 'poise-languages'
+dev_gem 'poise-profiler'

data/README.md

@@ -38,7 +38,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa
 
 ## License
 
-Copyright 2015, Noah Kantrowitz
+Copyright 2015-2016, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/attributes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_ruby/ruby_build.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_ruby/ruby_build/cheftie.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_ruby/ruby_build/provider.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -96,7 +96,8 @@ module PoiseRuby
             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))
+            # If we weren't going to rebuild, we would have bailed out already.
+            uninstall_ruby
           end
           # Second converge has ruby-build installed so using #ruby_definition
           # is safe.
@@ -163,7 +164,7 @@ module PoiseRuby
         unless options['version'].start_with?('jruby')
           pkgs = node.value_for_platform_family(
             debian: %w{libreadline6-dev zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev libxml2-dev libxslt1-dev},
-            rhel: %w{tar readline-devel zlib-devel libffi-devel openssl-devel libxml2-devel libxslt-devel},
+            rhel: %w{tar bzip2 readline-devel zlib-devel libffi-devel openssl-devel libxml2-devel libxslt-devel},
             suse: %w{zlib-devel libffi-devel sqlite3-devel libxml2-devel libxslt-devel},
           )
           package pkgs if pkgs

data/lib/poise_ruby/ruby_build/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +17,6 @@
 
 module PoiseRuby
   module RubyBuild
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/poise-ruby-build.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'poise', '~> 2.0'
   spec.add_dependency 'poise-ruby', '~> 2.1'
 
-  spec.add_development_dependency 'poise-boiler', '~> 1.0'
+  spec.add_development_dependency 'berkshelf', '~> 4.0'
+  spec.add_development_dependency 'poise-boiler', '~> 1.6'
 
   spec.metadata['halite_dependencies'] = 'git ~> 4.2, build-essential ~> 2.2'
 end

data/test/{cookbooks/poise-ruby-build_test → cookbook}/metadata.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/{cookbooks/poise-ruby-build_test → cookbook}/recipes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/gemfiles/chef-12.1.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.1.2'

data/test/gemfiles/chef-12.2.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.2.1'

data/test/gemfiles/chef-12.3.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.3.0'

data/test/gemfiles/chef-12.4.gemfile

@@ -0,0 +1,21 @@
+#
+# Copyright 2015-2016, 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.4.3'
+# Pending https://github.com/berkshelf/ridley/pull/335
+gem 'ridley', '4.4.1'

data/test/gemfiles/chef-12.5.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.5.1'

data/test/gemfiles/chef-12.6.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.6.0'

data/test/gemfiles/chef-12.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.0'
+gem 'chef', '~> 12.6'

data/test/gemfiles/master.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,3 +22,4 @@ gem 'poise', github: 'poise/poise'
 gem 'poise-boiler', github: 'poise/poise-boiler'
 gem 'poise-ruby', github: 'poise/poise-ruby'
 gem 'poise-languages', github: 'poise/poise-languages'
+gem 'poise-profiler', github: 'poise/poise-profiler'

data/test/integration/default/serverspec/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/provider_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-ruby-build
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 description: A Chef cookbook for managing Ruby installations using ruby-build.
 email:
 - noah@coderanger.net
@@ -74,7 +88,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".kitchen.travis.yml"
 - ".kitchen.yml"
 - ".travis.yml"
 - ".yardopts"
@@ -90,10 +103,16 @@ files:
 - lib/poise_ruby/ruby_build/provider.rb
 - lib/poise_ruby/ruby_build/version.rb
 - poise-ruby-build.gemspec
-- test/cookbooks/poise-ruby-build_test/metadata.rb
-- test/cookbooks/poise-ruby-build_test/recipes/default.rb
+- test/cookbook/metadata.rb
+- test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
+- test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.2.gemfile
+- test/gemfiles/chef-12.3.gemfile
+- test/gemfiles/chef-12.4.gemfile
+- test/gemfiles/chef-12.5.gemfile
+- test/gemfiles/chef-12.6.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/Gemfile
@@ -121,15 +140,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook for managing Ruby installations using ruby-build.
 test_files:
-- test/cookbooks/poise-ruby-build_test/metadata.rb
-- test/cookbooks/poise-ruby-build_test/recipes/default.rb
+- test/cookbook/metadata.rb
+- test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
+- test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.2.gemfile
+- test/gemfiles/chef-12.3.gemfile
+- test/gemfiles/chef-12.4.gemfile
+- test/gemfiles/chef-12.5.gemfile
+- test/gemfiles/chef-12.6.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/Gemfile

data/.kitchen.travis.yml

@@ -1,9 +0,0 @@
----
-driver:
-  name: docker
-  binary: "./docker"
-  socket: tcp://docker.poise.io:443
-  tls_verify: true
-  tls_cacert: test/docker/docker.ca
-  tls_cert: test/docker/docker.pem
-  tls_key: test/docker/docker.key