Skip to content

Commit

Permalink
Added fog_gem cookbook dependency. This should solve issues getting a…
Browse files Browse the repository at this point in the history
…ll gems and underlying libs installed.
  • Loading branch information
ghellings committed Nov 24, 2014
1 parent cbaf2bd commit 35c78c8
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
4 changes: 4 additions & 0 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ source "https://api.berkshelf.com"
metadata

cookbook 'build-essential', '~> 2.0.6'
cookbook 'fog_gem', '~> 0.1.1'
cookbook 'nokogiri', '~> 0.1.1'
cookbook 'libxml2', '~> 0.1.1'

group :integration do
cookbook 'fake', path: 'test/fixtures/cookbooks/fake'
cookbook 'python'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This cookbook provides libraries, resource and providers to config and mangage A
Requirements
============
## Cookbooks
* build-essential
* fog_gem

## Gems
* fog
Expand Down
1 change: 0 additions & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
default['build-essential']['compile_time'] = true
default['aws_security']['encrypted_data_bag'] = nil
default['aws_security']['aws_access_key_id'] = nil
default['aws_security']['aws_secret_access_key'] = nil
5 changes: 2 additions & 3 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
license 'Apache V2'
description 'Installs/Configures aws_security_group'
long_description 'Installs/Configures aws_security_group'
version '0.1.2'
version '0.1.3'

depends 'build-essential'
depends 'aws'
depends 'fog_gem'

6 changes: 2 additions & 4 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
# limitations under the License.
#

include_recipe "build-essential"
chef_gem "fog" do
version '~> 1.24'
end
include_recipe "fog_gem::chefgem"


if node['aws_security']['encrypted_data_bag']
databag_item = Chef::EncryptedDataBagItem.load(
Expand Down
5 changes: 2 additions & 3 deletions spec/recipes/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
before do
end
subject {
runner = ChefSpec::Runner.new
runner = ChefSpec::SoloRunner.new
runner.node.set['memory']['total'] = '1696516kb'
runner.node.set['lsb']['codename'] = 'rhel'
runner.node.set['name'] = "rspec"
runner.converge(described_recipe)
}
it { should include_recipe "build-essential" }
it { should install_chef_gem "fog"}
it { should include_recipe "fog_gem::chefgem" }
end

0 comments on commit 35c78c8

Please sign in to comment.