From bba61b0c4d829da5faeeeaffc4c08cf82b5a9a11 Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Tue, 2 Feb 2016 17:53:53 -0900 Subject: [PATCH 1/7] update to 0.6.0 --- attributes/default.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/attributes/default.rb b/attributes/default.rb index 6a1e162..afb34f2 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -21,6 +21,9 @@ # default['ruby_install']['version'] = '0.5.0' +# what command at what target file do we target when updating the checksum +# i'd have include this in pull request if it was obvious. +# this is a good line to provide that hint. default['ruby_install']['checksum'] = 'aa4448c2c356510cc7c2505961961a17bd3f3435842831e04c8516eb703afd19' # Install rubies into /opt/rubies as expected by Chruby. From ae2b49b0792d307c261f2f3396243cafd18569ed Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Tue, 2 Feb 2016 17:54:35 -0900 Subject: [PATCH 2/7] Update default.rb --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index afb34f2..a62672f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -20,7 +20,7 @@ # limitations under the License. # -default['ruby_install']['version'] = '0.5.0' +default['ruby_install']['version'] = '0.6.0' # what command at what target file do we target when updating the checksum # i'd have include this in pull request if it was obvious. # this is a good line to provide that hint. From 53240350432d1e7741c7ed87d225547791ec96f7 Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Sun, 19 Feb 2017 12:00:07 -0900 Subject: [PATCH 3/7] update to 0.6.1 cleaning out comments. --- attributes/default.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index a62672f..ab0a458 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -20,11 +20,8 @@ # limitations under the License. # -default['ruby_install']['version'] = '0.6.0' -# what command at what target file do we target when updating the checksum -# i'd have include this in pull request if it was obvious. -# this is a good line to provide that hint. -default['ruby_install']['checksum'] = 'aa4448c2c356510cc7c2505961961a17bd3f3435842831e04c8516eb703afd19' +default['ruby_install']['version'] = '0.6.1' +default['ruby_install']['checksum'] = 'b3adf199f8cd8f8d4a6176ab605db9ddd8521df8dbb2212f58f7b8273ed85e73' # Install rubies into /opt/rubies as expected by Chruby. default['ruby_install']['default_ruby_base_path'] = '/opt/rubies' From 0cd115791c251c399009bded3090412d3a2ae6fd Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Sun, 19 Feb 2017 12:00:34 -0900 Subject: [PATCH 4/7] update test kitchen platforms --- .kitchen.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 92b06e8..6207da5 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -6,10 +6,10 @@ provisioner: name: chef_zero platforms: - - name: ubuntu-14.10 - - name: debian-7.8 - - name: centos-7.1 - - name: fedora-21 + - name: ubuntu-16.04 + - name: debian-8.6 + - name: centos-7.3 + - name: fedora-25 suites: - name: alltherubies From 23f9ca6b72b9938111e786fd38e972bf59f8acb9 Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Sun, 19 Feb 2017 12:01:54 -0900 Subject: [PATCH 5/7] update tests and specs for install & partial these converge and verify successfully. --- test/cookbooks/partial_ruby_version/metadata.rb | 4 ++-- test/cookbooks/partial_ruby_version/recipes/default.rb | 2 +- test/integration/installation/serverspec/installation_spec.rb | 2 +- .../serverspec/partial_ruby_version_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cookbooks/partial_ruby_version/metadata.rb b/test/cookbooks/partial_ruby_version/metadata.rb index a9864af..06a8427 100644 --- a/test/cookbooks/partial_ruby_version/metadata.rb +++ b/test/cookbooks/partial_ruby_version/metadata.rb @@ -3,6 +3,6 @@ maintainer 'Ross Timson' maintainer_email 'ross@rosstimson.com' license 'Apache 2.0' -description 'Installs latest stable Ruby 1.9 via ruby_install cookbook' -long_description 'Installs latest stable Ruby 1.9 using a partial version' +description 'Installs latest stable Ruby 2.3 via ruby_install cookbook' +long_description 'Installs latest stable Ruby 2.3 using a partial version' version '0.1.0' diff --git a/test/cookbooks/partial_ruby_version/recipes/default.rb b/test/cookbooks/partial_ruby_version/recipes/default.rb index 62c473b..ba1f583 100644 --- a/test/cookbooks/partial_ruby_version/recipes/default.rb +++ b/test/cookbooks/partial_ruby_version/recipes/default.rb @@ -5,4 +5,4 @@ # version string that it still gets installed into a directory named after the # full version/patchlevel. -ruby_install_ruby 'ruby 1.9' +ruby_install_ruby 'ruby 2.3' diff --git a/test/integration/installation/serverspec/installation_spec.rb b/test/integration/installation/serverspec/installation_spec.rb index 9006360..47f7ab5 100644 --- a/test/integration/installation/serverspec/installation_spec.rb +++ b/test/integration/installation/serverspec/installation_spec.rb @@ -12,6 +12,6 @@ describe command('/usr/local/bin/ruby-install --version') do its(:exit_status) { should eq 0 } - its(:stdout) { should match /ruby-install: 0.5.0/ } + its(:stdout) { should match /ruby-install: 0.6.1/ } end end diff --git a/test/integration/partial_ruby_version/serverspec/partial_ruby_version_spec.rb b/test/integration/partial_ruby_version/serverspec/partial_ruby_version_spec.rb index 77b4a85..695517f 100644 --- a/test/integration/partial_ruby_version/serverspec/partial_ruby_version_spec.rb +++ b/test/integration/partial_ruby_version/serverspec/partial_ruby_version_spec.rb @@ -13,6 +13,6 @@ describe 'Rubies installed via partial version have correctly named dirs' do describe command('ls /opt/rubies') do its(:exit_status) { should eq 0 } - its(:stdout) { should match /ruby-1\.9\.3-p\d{3}/ } + its(:stdout) { should match /ruby-2\.3\.3/ } end end From 1de04a263e56892d4ec44fa8c2e6cbb91f5c1592 Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Sun, 19 Feb 2017 12:37:02 -0900 Subject: [PATCH 6/7] proposed: rev version and updated CHANGELOG --- CHANGELOG.md | 8 +++++++- metadata.rb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a1d818..f4acd9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ ruby-install Cookbook ===================== +v1.1.0 (2017-02-19) +------------------- + +* Bump to ruby-install 0.6.1 (@dayne) +* Updated kitchen test environments to current OS images (@dayne). + v1.0.5 (2015-05-30) ------------------- @@ -28,7 +34,7 @@ v1.0.0 (2014-02-15) * Upgrade to ruby-install 0.4.0 * Use new --rubies-dir option to specify location of installed rubies, - this gives more expected behaviour and works well with partial version + this gives more expected behavior and works well with partial version strings. Fixes GH #3. v0.1.2 diff --git a/metadata.rb b/metadata.rb index 65403b6..5eb49c2 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ license 'Apache v2.0' description 'Installs/Configures ruby-install' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '1.0.5' +version '1.1.0' depends 'ark' depends 'apt' From 19e9757a7ab4645dceab60d192311af6cb9378b7 Mon Sep 17 00:00:00 2001 From: Dayne Broderson Date: Sun, 19 Feb 2017 12:42:55 -0900 Subject: [PATCH 7/7] update alltherubies suite to modern version note: jruby and rbx do not really work on modern platforms. ruby-install would need to be updated it appears. --- test/cookbooks/alltherubies/recipes/default.rb | 11 ++++++++--- .../alltherubies/serverspec/alltherubies_spec.rb | 16 ++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/test/cookbooks/alltherubies/recipes/default.rb b/test/cookbooks/alltherubies/recipes/default.rb index 94fa407..9e99a41 100644 --- a/test/cookbooks/alltherubies/recipes/default.rb +++ b/test/cookbooks/alltherubies/recipes/default.rb @@ -4,7 +4,12 @@ # Not testing Maglev as ./configure complains if run as root and fails, also # compiling Maglev consistantly locks up my machine (old hardware). -ruby_install_ruby 'ruby 2.0.0-p645' -ruby_install_ruby 'ruby 2.1.6' -ruby_install_ruby 'jruby 1.7.20' +ruby_install_ruby 'ruby 2.0.0-p648' +ruby_install_ruby 'ruby 2.3.3' + +# >> Disabling jruby install because ruby_install is out of date for +# >> building of modern jruby requirements (openjdk-7 too old) +# >> If a new version of ruby-install comes out after 0.6.1 re-enable +ruby_install_ruby 'jruby 1.7.26' + ruby_install_ruby 'rbx 2.5.5' diff --git a/test/integration/alltherubies/serverspec/alltherubies_spec.rb b/test/integration/alltherubies/serverspec/alltherubies_spec.rb index 12dbc9c..eafa400 100644 --- a/test/integration/alltherubies/serverspec/alltherubies_spec.rb +++ b/test/integration/alltherubies/serverspec/alltherubies_spec.rb @@ -2,17 +2,17 @@ require_relative 'spec_helper' -describe 'compiles and installs Ruby 2.0.0-p645 into /opt/rubies' do - describe command('/opt/rubies/ruby-2.0.0-p645/bin/ruby -v') do +describe 'compiles and installs Ruby 2.0.0-p648 into /opt/rubies' do + describe command('/opt/rubies/ruby-2.0.0-p648/bin/ruby -v') do its(:exit_status) { should eq 0 } its(:stdout) { should match /ruby 2.0.0.*/ } end end -describe 'compiles and installs Ruby 2.1.6 into /opt/rubies' do - describe command('/opt/rubies/ruby-2.1.6/bin/ruby -v') do +describe 'compiles and installs Ruby 2.3.3 into /opt/rubies' do + describe command('/opt/rubies/ruby-2.3.3/bin/ruby -v') do its(:exit_status) { should eq 0 } - its(:stdout) { should match /ruby 2.1.6.*/ } + its(:stdout) { should match /ruby 2.3.3.*/ } end end @@ -23,9 +23,9 @@ end end -describe 'compiles and installs jRuby 1.7.20 into /opt/rubies' do - describe command('/opt/rubies/jruby-1.7.20/bin/ruby -v') do +describe 'compiles and installs jRuby 1.7.26 into /opt/rubies' do + describe command('/opt/rubies/jruby-1.7.26/bin/ruby -v') do its(:exit_status) { should eq 0 } - its(:stdout) { should match /jruby 1.7.20.*/ } + its(:stdout) { should match /jruby 1.7.26.*/ } end end