Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.

Commit

Permalink
move ruby setup to rubygems-ruby
Browse files Browse the repository at this point in the history
dwradcliffe committed Jun 29, 2014
1 parent 3c4f92f commit aa42bbd
Showing 11 changed files with 25 additions and 11 deletions.
3 changes: 2 additions & 1 deletion Berksfile
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ cookbook 'rubygems-balancer', path: 'cookbooks/rubygems-balancer'
cookbook 'rubygems-bastion', path: 'cookbooks/rubygems-bastion'
cookbook 'rubygems-cache', path: 'cookbooks/rubygems-cache'
cookbook 'rubygems-chef', path: 'cookbooks/rubygems-chef'
cookbook 'rubygems-cloud-init', path: 'cookbooks/rubygems-cloud-init'
cookbook 'rubygems-ci', path: 'cookbooks/rubygems-ci'
cookbook 'rubygems-cloud-init', path: 'cookbooks/rubygems-cloud-init'
cookbook 'rubygems-database', path: 'cookbooks/rubygems-database'
cookbook 'rubygems-hostname', path: 'cookbooks/rubygems-hostname'
cookbook 'rubygems-hosts', path: 'cookbooks/rubygems-hosts'
@@ -27,6 +27,7 @@ cookbook 'rubygems-ntp', path: 'cookbooks/rubygems-ntp'
cookbook 'rubygems-people', path: 'cookbooks/rubygems-people'
cookbook 'rubygems-redis', path: 'cookbooks/rubygems-redis'
cookbook 'rubygems-repo', path: 'cookbooks/rubygems-repo'
cookbook 'rubygems-ruby', path: 'cookbooks/rubygems-ruby'
cookbook 'rubygems-sensu', path: 'cookbooks/rubygems-sensu'
cookbook 'rubygems-ssh', path: 'cookbooks/rubygems-ssh'
cookbook 'rubygems-utility', path: 'cookbooks/rubygems-utility'
9 changes: 7 additions & 2 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -63,6 +63,8 @@ DEPENDENCIES
path: cookbooks/rubygems-redis
rubygems-repo
path: cookbooks/rubygems-repo
rubygems-ruby
path: cookbooks/rubygems-ruby
rubygems-sensu
path: cookbooks/rubygems-sensu
rubygems-ssh
@@ -186,13 +188,14 @@ GRAPH
rubygems-sensu (>= 0.0.0)
rubygems-ssh (>= 0.0.0)
rubygems-utility (>= 0.0.0)
rubygems-app (0.0.21)
rubygems-app (0.0.22)
apt (>= 0.0.0)
chef-vault (>= 0.0.0)
git (>= 0.0.0)
nginx (>= 0.0.0)
nodejs (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
runit (>= 0.0.0)
unicorn (>= 0.0.0)
user (>= 0.0.0)
@@ -204,10 +207,11 @@ GRAPH
chef-vault (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-bastion (0.0.5)
rubygems-bastion (0.0.6)
chef-vault (>= 0.0.0)
duo-security (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
rubygems-cache (0.0.1)
memcached (>= 0.0.0)
rubygems (>= 0.0.0)
@@ -258,6 +262,7 @@ GRAPH
rubygems-repo (0.0.8)
aptly (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-ruby (0.0.1)
rubygems-sensu (0.0.50)
chef-vault (>= 0.0.0)
sensu (>= 0.0.0)
3 changes: 2 additions & 1 deletion cookbooks/rubygems-app/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name 'rubygems-app'

version '0.0.21'
version '0.0.22'

depends 'apt'
depends 'chef-vault'
depends 'git'
depends 'nginx'
depends 'nodejs'
depends 'rubygems'
depends 'rubygems-ruby'
depends 'runit'
depends 'unicorn'
depends 'user'
4 changes: 2 additions & 2 deletions cookbooks/rubygems-app/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@
include_recipe 'git'
include_recipe 'nodejs'
include_recipe 'runit'
include_recipe 'rubygems-app::ruby'
include_recipe 'rubygems-app::rubygems'
include_recipe 'rubygems-ruby'
include_recipe 'rubygems-ruby::rubygems'

package 'libpq-dev'

3 changes: 2 additions & 1 deletion cookbooks/rubygems-bastion/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name 'rubygems-bastion'
maintainer 'RubyGems.org ops team'

version '0.0.5'
version '0.0.6'

depends 'chef-vault'
depends 'duo-security'
depends 'rubygems'
depends 'rubygems-ruby'

supports 'ubuntu'
1 change: 1 addition & 0 deletions cookbooks/rubygems-bastion/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@

include_recipe 'chef-vault'
include_recipe 'rubygems'
include_recipe 'rubygems-ruby'

duo = chef_vault_item('duo', 'credentials')

5 changes: 5 additions & 0 deletions cookbooks/rubygems-ruby/metadata.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name 'rubygems-ruby'

version '0.0.1'

supports 'ubuntu', '= 14.04'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Cookbook Name:: rubygems-app
# Recipe:: ruby
# Cookbook Name:: rubygems-ruby
# Recipe:: default
#

%w( ruby2.0 ruby2.0-dev ).each do |pkg|
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Cookbook Name:: rubygems-app
# Cookbook Name:: rubygems-ruby
# Recipe:: rubygems
#

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'rubygems-app::rubygems' do
describe 'rubygems-ruby::rubygems' do

describe command('gem -v') do
it { should return_stdout(/2\.2\.2/) }

0 comments on commit aa42bbd

Please sign in to comment.