Skip to content
This repository has been archived by the owner on Dec 31, 2022. It is now read-only.

Commit

Permalink
refactor: Removed application_ruby cookbook dependency
Browse files Browse the repository at this point in the history 
The `application_ruby` cookbook was basically used only for `bundle_install` action. By removing it
in favor of `execute 'bundle install ...'` we can remove this large, and unnecessary dependence.

Closes #25
  • Loading branch information
@ajgon
ajgon committed Aug 8, 2016
1 parent af8111b commit 6709568
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 56 deletions.
106 changes: 55 additions & 51 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
artifactory (2.3.2)
artifactory (2.3.3)
ast (2.3.0)
backports (3.6.8)
berkshelf (4.3.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
buff-config (~> 1.0)
Expand All @@ -17,6 +17,7 @@ GEM
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
mixlib-archive (~> 0.1)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 4.5)
Expand All @@ -26,7 +27,7 @@ GEM
faraday (~> 0.9.1)
httpclient (~> 2.7.0)
ridley (~> 4.5)
brakeman (3.3.1)
brakeman (3.3.3)
buff-config (1.0.1)
buff-extensions (~> 1.0)
varia_model (~> 0.4)
Expand All @@ -44,14 +45,15 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (12.10.24)
chef (12.12.15)
bundler (>= 1.10)
chef-config (= 12.10.24)
chef-config (= 12.12.15)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.4)
mixlib-log (~> 1.3)
Expand All @@ -70,15 +72,15 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef-config (12.10.24)
chef-config (12.12.15)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-zero (4.6.2)
chef-zero (4.8.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack
rack (< 2)
uuidtools (~> 2.1)
chefspec (4.7.0)
chef (>= 11.14)
Expand All @@ -87,14 +89,14 @@ GEM
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
cleanroom (1.0.0)
coveralls (0.8.13)
json (~> 1.8)
simplecov (~> 0.11.0)
coveralls (0.8.15)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
cucumber-core (1.4.0)
gherkin (~> 3.2.0)
tins (>= 1.6.0, < 2)
cucumber-core (1.5.0)
gherkin (~> 4.0)
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
Expand All @@ -104,12 +106,12 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
fauxhai (3.5.0)
fauxhai (3.8.0)
net-ssh
ffi (1.9.10)
ffi-yajl (2.2.3)
ffi (1.9.14)
ffi-yajl (2.3.0)
libyajl2 (~> 1.2)
foodcritic (6.3.0)
foodcritic (7.0.1)
cucumber-core (>= 1.3)
erubis
nokogiri (>= 1.5, < 2.0)
Expand All @@ -125,14 +127,14 @@ GEM
multi_json (~> 1.0)
net-http-persistent (>= 2.7)
net-http-pipeline
gherkin (3.2.0)
gherkin (4.0.0)
hashie (3.4.4)
highline (1.7.8)
hitimes (1.2.4)
httpclient (2.7.2)
iniparse (1.4.2)
ipaddress (0.8.3)
json (1.8.3)
json (2.0.2)
kitchen-vagrant (0.20.0)
test-kitchen (~> 1.4)
kramdown (1.11.1)
Expand All @@ -145,15 +147,17 @@ GEM
mixlib-config (~> 2.1, >= 2.1.0)
mini_portile2 (2.1.0)
minitar (0.5.4)
mixlib-archive (0.2.0)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-cli (1.6.0)
mixlib-cli (1.7.0)
mixlib-config (2.2.1)
mixlib-install (1.0.12)
mixlib-install (1.1.0)
artifactory
mixlib-shellout
mixlib-versioning
mixlib-log (1.6.0)
mixlib-log (1.7.0)
mixlib-shellout (2.2.6)
mixlib-versioning (1.1.0)
molinillo (0.4.5)
Expand All @@ -165,7 +169,7 @@ GEM
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (3.1.1)
net-ssh (3.2.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.1)
Expand All @@ -178,7 +182,7 @@ GEM
pkg-config (~> 1.1.7)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
ohai (8.16.0)
ohai (8.18.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand All @@ -190,7 +194,7 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
overcommit (0.33.0)
overcommit (0.34.2)
childprocess (~> 0.5.8)
iniparse (~> 1.4)
parser (2.3.1.2)
Expand All @@ -205,13 +209,13 @@ GEM
websocket (~> 1.0)
rack (1.6.4)
rainbow (2.1.0)
rake (11.1.2)
retryable (2.0.3)
ridley (4.5.1)
rake (11.2.2)
retryable (2.0.4)
ridley (4.6.1)
addressable
buff-config (~> 1.0)
buff-extensions (~> 1.0)
buff-ignore (~> 1.1)
buff-ignore (~> 1.1.1)
buff-shell_out (~> 0.1)
celluloid (~> 0.16.0)
celluloid-io (~> 0.16.1)
Expand All @@ -225,27 +229,27 @@ GEM
retryable (~> 2.0)
semverse (~> 1.1)
varia_model (~> 0.4.0)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.4)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (~> 3.5.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.4.1)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.40.0)
parser (>= 2.3.1.0, < 3.0)
rubocop (0.42.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
Expand All @@ -263,15 +267,15 @@ GEM
rspec-its
specinfra (~> 2.53)
sfl (2.2)
simplecov (0.11.2)
simplecov (0.12.0)
docile (~> 1.1.0)
json (~> 1.8)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
specinfra (2.59.0)
specinfra (2.60.3)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
Expand All @@ -280,7 +284,7 @@ GEM
systemu (2.6.5)
term-ansicolor (1.3.2)
tins (~> 1.0)
test-kitchen (1.9.1)
test-kitchen (1.10.2)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
Expand All @@ -290,7 +294,7 @@ GEM
thor (0.19.1)
timers (4.0.4)
hitimes
tins (1.6.0)
tins (1.12.0)
travis (1.8.2)
backports
faraday (~> 0.9)
Expand All @@ -300,11 +304,11 @@ GEM
launchy (~> 2.1)
pusher-client (~> 0.4)
typhoeus (~> 0.6, >= 0.6.8)
treetop (1.6.5)
treetop (1.6.8)
polyglot (~> 0.3)
typhoeus (0.8.0)
ethon (>= 0.8.0)
unicode-display_width (1.0.5)
unicode-display_width (1.1.0)
uuidtools (2.1.5)
varia_model (0.4.1)
buff-extensions (~> 1.0)
Expand Down Expand Up @@ -332,4 +336,4 @@ DEPENDENCIES
travis

BUNDLED WITH
1.12.4
1.12.5
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ then [add recipes to the corresponding OpsWorks actions](#recipes).
* [deployer](https://supermarket.chef.io/cookbooks/deployer)
* [ruby-ng](https://supermarket.chef.io/cookbooks/ruby-ng)
* [nginx (~> 2.7)](https://supermarket.chef.io/cookbooks/nginx)
* [application_ruby](https://supermarket.chef.io/cookbooks/application_ruby)

### Platform

Expand Down
6 changes: 3 additions & 3 deletions libraries/helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def every_enabled_rds
end

def perform_bundle_install(release_path)
bundle_install File.join(release_path, 'Gemfile') do
deployment true
without %w(development test)
execute 'bundle_install' do
command 'bundle install --deployment --without development test'
cwd release_path
end
end

Expand Down
1 change: 0 additions & 1 deletion metadata.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
depends 'deployer'
depends 'ruby-ng'
depends 'nginx', '~> 2.7'
depends 'application_ruby'

supports 'amazon', '>= 2015.03'
supports 'ubuntu', '>= 12.04'
Expand Down

0 comments on commit 6709568

Please sign in to comment.