Skip to content

Commit 97c40ae

Browse files
authored
Patch 2 (#1)
* update to 0.6.1 * update test kitchen platforms * update tests and specs for install & partial * 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.
1 parent d54a625 commit 97c40ae

10 files changed

Lines changed: 35 additions & 24 deletions

File tree

.kitchen.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ provisioner:
66
name: chef_zero
77

88
platforms:
9-
- name: ubuntu-14.10
10-
- name: debian-7.8
11-
- name: centos-7.1
12-
- name: fedora-21
9+
- name: ubuntu-16.04
10+
- name: debian-8.6
11+
- name: centos-7.3
12+
- name: fedora-25
1313

1414
suites:
1515
- name: alltherubies

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
ruby-install Cookbook
22
=====================
33

4+
v1.1.0 (2017-02-19)
5+
-------------------
6+
7+
* Bump to ruby-install 0.6.1 (@dayne)
8+
* Updated kitchen test environments to current OS images (@dayne).
9+
410
v1.0.5 (2015-05-30)
511
-------------------
612

@@ -28,7 +34,7 @@ v1.0.0 (2014-02-15)
2834

2935
* Upgrade to ruby-install 0.4.0
3036
* Use new --rubies-dir option to specify location of installed rubies,
31-
this gives more expected behaviour and works well with partial version
37+
this gives more expected behavior and works well with partial version
3238
strings. Fixes GH #3.
3339

3440
v0.1.2

attributes/default.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
# limitations under the License.
2121
#
2222

23-
default['ruby_install']['version'] = '0.5.0'
24-
default['ruby_install']['checksum'] = 'aa4448c2c356510cc7c2505961961a17bd3f3435842831e04c8516eb703afd19'
23+
default['ruby_install']['version'] = '0.6.1'
24+
default['ruby_install']['checksum'] = 'b3adf199f8cd8f8d4a6176ab605db9ddd8521df8dbb2212f58f7b8273ed85e73'
2525

2626
# Install rubies into /opt/rubies as expected by Chruby.
2727
default['ruby_install']['default_ruby_base_path'] = '/opt/rubies'

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
license 'Apache v2.0'
66
description 'Installs/Configures ruby-install'
77
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8-
version '1.0.5'
8+
version '1.1.0'
99

1010
depends 'ark'
1111
depends 'apt'

test/cookbooks/alltherubies/recipes/default.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
# Not testing Maglev as ./configure complains if run as root and fails, also
55
# compiling Maglev consistantly locks up my machine (old hardware).
66

7-
ruby_install_ruby 'ruby 2.0.0-p645'
8-
ruby_install_ruby 'ruby 2.1.6'
9-
ruby_install_ruby 'jruby 1.7.20'
7+
ruby_install_ruby 'ruby 2.0.0-p648'
8+
ruby_install_ruby 'ruby 2.3.3'
9+
10+
# >> Disabling jruby install because ruby_install is out of date for
11+
# >> building of modern jruby requirements (openjdk-7 too old)
12+
# >> If a new version of ruby-install comes out after 0.6.1 re-enable
13+
ruby_install_ruby 'jruby 1.7.26'
14+
1015
ruby_install_ruby 'rbx 2.5.5'

test/cookbooks/partial_ruby_version/metadata.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
maintainer 'Ross Timson'
44
maintainer_email 'ross@rosstimson.com'
55
license 'Apache 2.0'
6-
description 'Installs latest stable Ruby 1.9 via ruby_install cookbook'
7-
long_description 'Installs latest stable Ruby 1.9 using a partial version'
6+
description 'Installs latest stable Ruby 2.3 via ruby_install cookbook'
7+
long_description 'Installs latest stable Ruby 2.3 using a partial version'
88
version '0.1.0'

test/cookbooks/partial_ruby_version/recipes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# version string that it still gets installed into a directory named after the
66
# full version/patchlevel.
77

8-
ruby_install_ruby 'ruby 1.9'
8+
ruby_install_ruby 'ruby 2.3'

test/integration/alltherubies/serverspec/alltherubies_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
require_relative 'spec_helper'
44

5-
describe 'compiles and installs Ruby 2.0.0-p645 into /opt/rubies' do
6-
describe command('/opt/rubies/ruby-2.0.0-p645/bin/ruby -v') do
5+
describe 'compiles and installs Ruby 2.0.0-p648 into /opt/rubies' do
6+
describe command('/opt/rubies/ruby-2.0.0-p648/bin/ruby -v') do
77
its(:exit_status) { should eq 0 }
88
its(:stdout) { should match /ruby 2.0.0.*/ }
99
end
1010
end
1111

12-
describe 'compiles and installs Ruby 2.1.6 into /opt/rubies' do
13-
describe command('/opt/rubies/ruby-2.1.6/bin/ruby -v') do
12+
describe 'compiles and installs Ruby 2.3.3 into /opt/rubies' do
13+
describe command('/opt/rubies/ruby-2.3.3/bin/ruby -v') do
1414
its(:exit_status) { should eq 0 }
15-
its(:stdout) { should match /ruby 2.1.6.*/ }
15+
its(:stdout) { should match /ruby 2.3.3.*/ }
1616
end
1717
end
1818

@@ -23,9 +23,9 @@
2323
end
2424
end
2525

26-
describe 'compiles and installs jRuby 1.7.20 into /opt/rubies' do
27-
describe command('/opt/rubies/jruby-1.7.20/bin/ruby -v') do
26+
describe 'compiles and installs jRuby 1.7.26 into /opt/rubies' do
27+
describe command('/opt/rubies/jruby-1.7.26/bin/ruby -v') do
2828
its(:exit_status) { should eq 0 }
29-
its(:stdout) { should match /jruby 1.7.20.*/ }
29+
its(:stdout) { should match /jruby 1.7.26.*/ }
3030
end
3131
end

test/integration/installation/serverspec/installation_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212

1313
describe command('/usr/local/bin/ruby-install --version') do
1414
its(:exit_status) { should eq 0 }
15-
its(:stdout) { should match /ruby-install: 0.5.0/ }
15+
its(:stdout) { should match /ruby-install: 0.6.1/ }
1616
end
1717
end

test/integration/partial_ruby_version/serverspec/partial_ruby_version_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
describe 'Rubies installed via partial version have correctly named dirs' do
1414
describe command('ls /opt/rubies') do
1515
its(:exit_status) { should eq 0 }
16-
its(:stdout) { should match /ruby-1\.9\.3-p\d{3}/ }
16+
its(:stdout) { should match /ruby-2\.3\.3/ }
1717
end
1818
end

0 commit comments

Comments
 (0)