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: 8ff959f8e572^
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: 0671447ea434
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 18, 2015

  1. Fix most offenses

    Andre Medeiros committed Jun 18, 2015
    Copy the full SHA
    8ff959f View commit details
  2. Fix the remaining offenses

    Andre Medeiros committed Jun 18, 2015
    Copy the full SHA
    0671447 View commit details
4 changes: 0 additions & 4 deletions cookbooks/dns/providers/record.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
action :create do

route53_record new_resource.name do
name "#{new_resource.name}.#{new_resource.domain}"
value new_resource.value
@@ -19,11 +18,9 @@
domain_api_token new_resource.credentials[:dnsimple][:domain_api_token]
action :create
end

end

action :delete do

route53_record new_resource.name do
name "#{new_resource.name}.#{new_resource.domain}"
value new_resource.value
@@ -43,5 +40,4 @@
domain_api_token new_resource.credentials[:dnsimple][:domain_api_token]
action :destroy
end

end
2 changes: 0 additions & 2 deletions cookbooks/dnsimple/providers/record.rb
Original file line number Diff line number Diff line change
@@ -17,12 +17,10 @@
#

action :create do

if node['skip_dnsimple']
Chef::Log.info 'Skipping DNSimple because of node attribute!'
new_resource.updated_by_last_action(false)
else

begin
require 'rubygems'
require 'dnsimple'
6 changes: 4 additions & 2 deletions cookbooks/rubygems-people/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -13,8 +13,10 @@
users.each do |user_name|
user = data_bag_item('users', user_name)

if (user['action'] && user['action'] == 'remove') || \
(!user['environments'].include?(node.chef_environment))
remove_user = user['action'] && user['action'] == 'remove'
remove_user |= !user['environments'].include?(node.chef_environment)

if remove_user
user_account user['username'] do
action :remove
only_if "/usr/bin/id -u #{user['username']}"
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
require 'spec_helper'

describe 'rubygems-ruby::rubygems' do

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

end