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: 9e6dd764d305
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: a0554cba56cf
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Jul 16, 2014

  1. Copy the full SHA
    bd4b5fe View commit details
  2. cleanup

    dwradcliffe committed Jul 16, 2014
    Copy the full SHA
    a0554cb View commit details
Showing with 24 additions and 21 deletions.
  1. +1 −0 .rubocop.yml
  2. +3 −2 Berksfile.lock
  3. +16 −16 Rakefile
  4. +2 −2 cookbooks/rubygems-balancer/recipes/default.rb
  5. +2 −1 cookbooks/rubygems-chef/metadata.rb
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ AllCops:
Exclude:
- vendor/**/*
- /**/files/**/*
- cookbooks/rubygems-chef/templates/default/librato.rb

Encoding:
Enabled: false
5 changes: 3 additions & 2 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@ GRAPH
rubygems-backups (0.0.14)
chef-vault (>= 0.0.0)
rubygems-ruby (>= 0.0.0)
rubygems-balancer (0.0.21)
rubygems-balancer (0.0.22)
chef-vault (>= 0.0.0)
nginx (>= 0.0.0)
rubygems (>= 0.0.0)
@@ -220,8 +220,9 @@ GRAPH
rubygems-cache (0.0.1)
memcached (>= 0.0.0)
rubygems (>= 0.0.0)
rubygems-chef (0.0.13)
rubygems-chef (0.0.14)
chef-client (>= 0.0.0)
chef-vault (>= 0.0.0)
omnibus_updater (>= 0.0.0)
rubygems-ci (0.0.7)
chef-vault (>= 0.0.0)
32 changes: 16 additions & 16 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'rubocop/rake_task'
require 'foodcritic'
require 'rspec/core/rake_task'
# require 'rspec/core/rake_task'
require 'English'

desc 'Run RuboCop style and lint checks'
@@ -18,24 +18,24 @@ FoodCritic::Rake::LintTask.new(:foodcritic) do |t|
}
end

desc 'Run ChefSpec examples'
RSpec::Core::RakeTask.new(:spec)
# desc 'Run ChefSpec examples'
# RSpec::Core::RakeTask.new(:spec)

desc 'Run all tests'
task test: [:rubocop, :foodcritic, :spec]
task default: :test
task lint: :foodcritic
# desc 'Run all tests'
# task test: [:rubocop, :foodcritic, :spec]
# task default: :test
# task lint: :foodcritic

begin
require 'kitchen/rake_tasks'
Kitchen::RakeTasks.new
# begin
# require 'kitchen/rake_tasks'
# Kitchen::RakeTasks.new

desc 'Alias for kitchen:all'
task integration: 'kitchen:all'
task test_all: [:test, :integration]
rescue LoadError
puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
end
# desc 'Alias for kitchen:all'
# task integration: 'kitchen:all'
# task test_all: [:test, :integration]
# rescue LoadError
# puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
# end

desc 'Refresh all chef vaults'
task :refresh_vaults do
4 changes: 2 additions & 2 deletions cookbooks/rubygems-balancer/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
include_recipe 'rubygems-balancer::maintenance'
include_recipe 'rubygems-balancer::site'

cookbook_file "/etc/default/nginx" do
source "nginx"
cookbook_file '/etc/default/nginx' do
source 'nginx'
notifies :reload, 'service[nginx]'
end
3 changes: 2 additions & 1 deletion cookbooks/rubygems-chef/metadata.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name 'rubygems-chef'
maintainer 'RubyGems.org ops team'

version '0.0.13'
version '0.0.14'

depends 'chef-client'
depends 'chef-vault'
depends 'omnibus_updater'

supports 'ubuntu'