Skip to content
This repository has been archived by the owner on Apr 10, 2024. It is now read-only.

Commit

Permalink
replace Ruby 2.0.0 with Ruby 2.3.0
Browse files Browse the repository at this point in the history
involves a few code changes and also updating some gem versions
  • Loading branch information
Steve Huff committed Mar 8, 2017
1 parent b5584d7 commit 5c054ce
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-p648
2.3.0
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: ruby

rvm:
- 2.0.0-p648
- 2.3.0

script:
- "bundle exec rake spec SPEC_OPTS='--format documentation'"
Expand All @@ -14,3 +15,10 @@ env:
notifications:
slack:
secure: ATfny+QAaqNqimNQz+XlEzPsKSRNgwi6jBmpyT9zV8A/er1OPiv52tSwCcHqQUjKxMHlJagIlUKi0GIkY3j5aSjGudd1rlPzgE+vWBADn8oyDoon1Z03bN82LXAxqDBanWn1QCDmNRy0N08vjHHnfQcnh8FfrDDzzQgquPgfxGQ+2gfv72WeLuParpI7PeSVkyZpeEKUn+tde1SgghRBmrvEk9FKcf9C9cx34j24bgK9OhrxF9OFEVE9nh9Jben2VlR50KKWRmUham1PHrTmoavp+ifp/t6eIRX87eODlkKMGS/uekJGsSM1CI0BDVVP8oOM+gxI/MwFNc+gjBCtiKnCgPECAXeA8L+WL/oHABzVoKu18XukAF+d5iNKbMNyI87CAYvHLXPdcWEM1Q0lbG2uQ2OhkjfBLcTYA1QVAq7fV/52CkTll4maoEgl58jUPD8Ga1heAbwJlM9ujLZ8uoPksRq5d/x2IMi27Cgje4PaokNnBaN4adugPWL0m4jS9FOE/cu63eQ6AYT+K/QJ/A0TiIh1vB+hiOvLnB5TacyMzjwWiFnkkLrokH52nllH6EHd3V4hhcw7Tc/9155O611feskgG8BABa06CbVkURnygwkciItcTAs3NhU8Xbm1RP9tczzlOaO5OMrgmaF3C3hWXtPWyngFRsSwwcAbVX8=

addons:
apt:
packages:
- libaugeas-dev
- libxml2-dev
- pkg-config
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ end

gem 'puppetlabs_spec_helper', '>= 0.8.2'
gem 'puppet-lint', '>= 1.0.0'
gem 'ruby-augeas', '>= 0.5'
gem 'facter', '>= 1.7.0'
gem 'librarian-puppet', '~> 2.2'
gem 'deep_merge', '~> 1'

group :development, :test do
gem 'dotenv', '~> 2.0'
gem 'rake', '~> 10.4'
end
66 changes: 33 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,45 +1,35 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.8)
activemodel (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
builder (3.2.2)
deep_merge (1.0.1)
diff-lcs (1.2.5)
dotenv (2.0.2)
facter (2.4.4)
CFPropertyList (~> 2.2.6)
facter (2.4.6)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
her (0.6.8)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
faraday (~> 0.8)
multi_json (~> 1.7)
hiera (3.0.5)
json_pure
i18n (0.7.0)
json (1.8.3)
json_pure (1.8.3)
librarian-puppet (2.2.1)
faraday_middleware (0.10.1)
faraday (>= 0.7.4, < 1.0)
fast_gettext (1.1.0)
gettext (3.2.2)
locale (>= 2.0.5)
text (>= 1.3.0)
gettext-setup (0.14)
fast_gettext (~> 1.1.0)
gettext (>= 3.0.2)
locale
hiera (3.3.0)
json_pure (2.0.3)
librarian-puppet (2.2.3)
librarianp (>= 0.6.3)
puppet_forge (~> 1.0)
puppet_forge (~> 2.1)
rsync
librarianp (0.6.3)
thor (~> 0.15)
locale (2.1.2)
metaclass (0.0.4)
minitest (5.8.3)
minitar (0.6.1)
mocha (1.1.0)
metaclass (~> 0.0.1)
multi_json (1.11.2)
multipart-post (2.0.0)
puppet (4.2.3)
facter (> 2.0, < 4)
Expand All @@ -48,8 +38,12 @@ GEM
puppet-lint (1.1.0)
puppet-syntax (2.0.0)
rake
puppet_forge (1.0.5)
her (~> 0.6.8)
puppet_forge (2.2.3)
faraday (~> 0.9.0)
faraday_middleware (>= 0.9.0, < 0.11.0)
gettext-setup (~> 0.11)
minitar
semantic_puppet (~> 0.1.0)
puppetlabs_spec_helper (1.0.1)
mocha
puppet-lint
Expand All @@ -73,10 +67,11 @@ GEM
rspec
rspec-support (3.4.1)
rsync (1.0.9)
thor (0.19.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
ruby-augeas (0.5.0)
semantic_puppet (0.1.4)
gettext-setup (>= 0.3)
text (1.3.1)
thor (0.19.4)

PLATFORMS
ruby
Expand All @@ -89,3 +84,8 @@ DEPENDENCIES
puppet (>= 4.2, < 4.3)
puppet-lint (>= 1.0.0)
puppetlabs_spec_helper (>= 0.8.2)
rake (~> 10.4)
ruby-augeas (>= 0.5)

BUNDLED WITH
1.14.6
13 changes: 7 additions & 6 deletions files/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,24 @@ fi
cd rk_tomcat

$LOGGER "Configuring RubyGems..."
yum -y install ruby-devel glibc-devel gcc
yum -y install ruby23-devel glibc-devel gcc
yum -y remove ruby20 ruby20-libs
cat > /root/.gemrc << 'GEMRC'
---
install: --nodocument --bindir /usr/local/bin
GEMRC

$LOGGER "Installing Bundler..."
gem install io-console bundler
gem install bundler

$LOGGER "Installing Puppet dependencies..."
export PUPPET_MODULE_DIR='/etc/puppetlabs/code/modules'
yum -y install augeas augeas-devel libxml2-devel

$LOGGER "Installing other gem dependencies..."
BUNDLE=$(which bundle 2>/dev/null || echo '/usr/local/bin/bundle')
$BUNDLE install

$LOGGER "Installing Puppet dependencies..."
export PUPPET_MODULE_DIR='/etc/puppetlabs/code/modules'
yum -y install ruby20-augeas

LIBRARIAN_PUPPET=$(which librarian-puppet 2>/dev/null || echo '/usr/local/bin/librarian-puppet')
$LIBRARIAN_PUPPET config path "$PUPPET_MODULE_DIR" --global
$LIBRARIAN_PUPPET install
Expand Down
13 changes: 7 additions & 6 deletions templates/provision/gold_master.erb
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,24 @@ fi
cd rk_tomcat

$LOGGER "Configuring RubyGems..."
yum -y install ruby-devel glibc-devel gcc
yum -y install ruby23-devel glibc-devel gcc
yum -y remove ruby20 ruby20-libs
cat > /root/.gemrc << 'GEMRC'
---
install: --nodocument --bindir /usr/local/bin
GEMRC

$LOGGER "Installing Bundler..."
gem install io-console bundler
gem install bundler

$LOGGER "Installing Puppet dependencies..."
export PUPPET_MODULE_DIR='/etc/puppetlabs/code/modules'
yum -y install augeas-devel augeas libxml2-devel

$LOGGER "Installing other gem dependencies..."
BUNDLE=$(which bundle 2>/dev/null || echo '/usr/local/bin/bundle')
$BUNDLE install

$LOGGER "Installing Puppet dependencies..."
export PUPPET_MODULE_DIR='/etc/puppetlabs/code/modules'
yum -y install ruby20-augeas

LIBRARIAN_PUPPET=$(which librarian-puppet 2>/dev/null || echo '/usr/local/bin/librarian-puppet')
$LIBRARIAN_PUPPET config path "$PUPPET_MODULE_DIR" --global
$LIBRARIAN_PUPPET install
Expand Down

0 comments on commit 5c054ce

Please sign in to comment.