Skip to content

Patch 2 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dayne merged 7 commits into from
Oct 4, 2017
Merged

Patch 2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bba61b0
update to 0.6.0
dayne Feb 3, 2016
ae2b49b
Update default.rb
dayne Feb 3, 2016
5324035
update to 0.6.1
dayne Feb 19, 2017
0cd1157
update test kitchen platforms
dayne Feb 19, 2017
23f9ca6
update tests and specs for install & partial
dayne Feb 19, 2017
1de04a2
proposed: rev version and updated CHANGELOG
dayne Feb 19, 2017
19e9757
update alltherubies suite to modern version
dayne Feb 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
-------------------

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
# limitations under the License.
#

default['ruby_install']['version'] = '0.5.0'
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'
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
11 changes: 8 additions & 3 deletions test/cookbooks/alltherubies/recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
4 changes: 2 additions & 2 deletions test/cookbooks/partial_ruby_version/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion test/cookbooks/partial_ruby_version/recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
16 changes: 8 additions & 8 deletions test/integration/alltherubies/serverspec/alltherubies_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion test/integration/installation/serverspec/installation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/integration/partial_ruby_version/serverspec/partial_ruby_version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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