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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19001beb0a03
Choose a base ref
...
head repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3803deab5b95
Choose a head ref
  • 3 commits
  • 17 files changed
  • 1 contributor

Commits on Jul 9, 2014

  1. update foodcritic gem

    dwradcliffe committed Jul 9, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d016201 View commit details
  2. syntax cleanup

    dwradcliffe committed Jul 9, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3363fad View commit details
  3. run foodcritic on travis

    dwradcliffe committed Jul 9, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3803dea View commit details
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
rvm:
- 2.0.0
script:
- bundle exec rubocop
- bundle exec rubocop
- bundle exec rake foodcritic
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ gem 'berkshelf', '~> 3.0'
gem 'chef', '~> 11.12'
gem 'chef-vault', '~> 2.2'
gem 'chefspec', '~> 4.0'
gem 'foodcritic', '~> 3.0'
gem 'foodcritic', '~> 4.0'
gem 'kitchen-docker'
gem 'kitchen-vagrant'
gem 'knife-ec2'
27 changes: 15 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -94,15 +94,16 @@ GEM
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (>= 1.5.11)
foodcritic (3.0.3)
foodcritic (4.0.0)
erubis
gherkin (~> 2.11.7)
nokogiri (~> 1.5.4)
gherkin (~> 2.11)
nokogiri (~> 1.5)
rake
treetop (~> 1.4.10)
yajl-ruby (~> 1.1.0)
rufus-lru (~> 1.0)
treetop (~> 1.4)
yajl-ruby (~> 1.1)
formatador (0.2.5)
gherkin (2.11.8)
gherkin (2.12.2)
multi_json (~> 1.3)
gssapi (1.0.3)
ffi (>= 1.0.1)
@@ -135,6 +136,7 @@ GEM
multi_json (>= 1.8.4)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.6.0)
minitar (0.5.4)
mixlib-authentication (1.3.0)
mixlib-log
@@ -154,7 +156,8 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nio4r (1.0.0)
nokogiri (1.5.11)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
nori (1.1.5)
octokit (3.2.0)
sawyer (~> 0.5.3)
@@ -219,6 +222,7 @@ GEM
ruby-progressbar (~> 1.4)
ruby-progressbar (1.5.1)
rubyntlm (0.1.1)
rufus-lru (1.0.5)
safe_yaml (1.0.3)
savon (0.9.5)
akami (~> 1.0)
@@ -246,9 +250,8 @@ GEM
thor (0.19.1)
timers (3.0.1)
hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
treetop (1.5.3)
polyglot (~> 0.3)
uuidtools (2.1.4)
varia_model (0.4.0)
buff-extensions (~> 1.0)
@@ -263,7 +266,7 @@ GEM
rubyntlm (~> 0.1.1)
savon (= 0.9.5)
uuidtools (~> 2.1.2)
yajl-ruby (1.1.0)
yajl-ruby (1.2.1)

PLATFORMS
ruby
@@ -273,7 +276,7 @@ DEPENDENCIES
chef (~> 11.12)
chef-vault (~> 2.2)
chefspec (~> 4.0)
foodcritic (~> 3.0)
foodcritic (~> 4.0)
kitchen-docker
kitchen-vagrant
knife-backup
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
cd /applications/rubygems/current

exec 2>&1
exec <%= node[:runit][:chpst_bin] %> \
exec <%= node['runit']['chpst_bin'] %> \
-u <%= @options[:owner] %>:<%= @options[:group] %> \
-e <%= node[:runit][:sv_dir] %>/delayed_job/env \
-e <%= node['runit']['sv_dir'] %>/delayed_job/env \
<%= @options[:bundle_command] %> exec \
rake jobs:work
4 changes: 2 additions & 2 deletions cookbooks/rubygems-app/templates/default/sv-unicorn-run.erb
Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
cd /applications/rubygems/current

exec 2>&1
exec <%= node[:runit][:chpst_bin] %> \
exec <%= node['runit']['chpst_bin'] %> \
-u <%= @options[:owner] %>:<%= @options[:group] %> \
-e <%= node[:runit][:sv_dir] %>/unicorn/env \
-e <%= node['runit']['sv_dir'] %>/unicorn/env \
<%= @options[:bundle_command] %> exec \
<%= @options[:smells_like_rack] ? 'unicorn' : 'unicorn_rails' %> \
-E <%= @options[:rails_env] %> \
Binary file removed vendor/cache/foodcritic-3.0.3.gem
Binary file not shown.
Binary file added vendor/cache/foodcritic-4.0.0.gem
Binary file not shown.
Binary file removed vendor/cache/gherkin-2.11.8.gem
Binary file not shown.
Binary file added vendor/cache/gherkin-2.12.2.gem
Binary file not shown.
Binary file added vendor/cache/mini_portile-0.6.0.gem
Binary file not shown.
Binary file removed vendor/cache/nokogiri-1.5.11.gem
Binary file not shown.
Binary file added vendor/cache/nokogiri-1.6.2.1.gem
Binary file not shown.
Binary file added vendor/cache/rufus-lru-1.0.5.gem
Binary file not shown.
Binary file removed vendor/cache/treetop-1.4.15.gem
Binary file not shown.
Binary file added vendor/cache/treetop-1.5.3.gem
Binary file not shown.
Binary file removed vendor/cache/yajl-ruby-1.1.0.gem
Binary file not shown.
Binary file added vendor/cache/yajl-ruby-1.2.1.gem
Binary file not shown.