rubygems · Jun 18, 2015 · Jun 18, 2015
Showing with 4 additions and 10 deletions.

+0 −4 cookbooks/dns/providers/record.rb

+0 −2 cookbooks/dnsimple/providers/record.rb

+4 −2 cookbooks/rubygems-people/recipes/default.rb

+0 −2 cookbooks/rubygems-ruby/test/integration/default/serverspec/rubygems_spec.rb
diff --git a/cookbooks/dns/providers/record.rb b/cookbooks/dns/providers/record.rb
@@ -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
diff --git a/cookbooks/dnsimple/providers/record.rb b/cookbooks/dnsimple/providers/record.rb
@@ -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'

diff --git a/cookbooks/rubygems-people/recipes/default.rb b/cookbooks/rubygems-people/recipes/default.rb
@@ -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']}"

diff --git a/cookbooks/rubygems-ruby/test/integration/default/serverspec/rubygems_spec.rb b/cookbooks/rubygems-ruby/test/integration/default/serverspec/rubygems_spec.rb
@@ -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