Skip to content

Commit

Permalink
merge locomote-cookbooks-redhat_package
Browse files Browse the repository at this point in the history
  • Loading branch information
mdxp committed Aug 13, 2013
2 parents a517db3 + 4408ed5 commit c7e51a3
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'foodcritic'
gem 'thor-foodcritic'

group :integration do
gem 'berkshelf', '~> 1.3.1'
gem 'test-kitchen', '~> 1.0.0.alpha.1'
gem 'kitchen-vagrant', '~> 0.7.2'
gem 'berkshelf'
gem 'test-kitchen', '~> 1.0.0.alpha'
gem 'kitchen-vagrant', '~> 0.10.0'
end
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ recipes resources templates}
end

begin
require 'jamie/rake_tasks'
Jamie::RakeTasks.new
require 'kitchen/rake_tasks'
Kitchen::RakeTasks.new
rescue LoadError
puts ">>>>> Jamie gem not loaded, omitting tasks" unless ENV['CI']
puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
end
3 changes: 3 additions & 0 deletions recipes/install_from_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
key "C7917B12"
action :add
end
when 'rhel'
include_recipe 'yum::epel'
packages = %w{ nodejs nodejs-devel npm }
when 'smartos'
packages = %w{ nodejs }
else
Expand Down
4 changes: 4 additions & 0 deletions test/integration/package/bats/package.bats
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
@test "node should be in the path" {
[ "$(command -v node)" ]
}

@test "npm should be in the path" {
[ "$(command -v npm)" ]
}
4 changes: 4 additions & 0 deletions test/integration/source/bats/source.bats
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
@test "node should be in the path" {
[ "$(command -v node)" ]
}

@test "npm should be in the path" {
[ "$(command -v npm)" ]
}

0 comments on commit c7e51a3

Please sign in to comment.