Update copyrights and resolve cookstyle warnings

Signed-off-by: Tim Smith <tsmith@chef.io>
sous-chefs · Jul 18, 2016 · d6f66e4 · d6f66e4
1 parent 95c221b
commit d6f66e4
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 29 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/chef_provider_package_rbenvrubygems.rb b/libraries/chef_provider_package_rbenvrubygems.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/chef_rbenv_mixin.rb b/libraries/chef_rbenv_mixin.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/libraries/chef_rbenv_recipe_helpers.rb b/libraries/chef_rbenv_recipe_helpers.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,11 +51,11 @@ def install_or_upgrade_rbenv(opts = {})
       private
 
       def git_deploy_rbenv(opts)
-        if opts[:upgrade_strategy] == 'none'
-          git_exec_action = :checkout
-        else
-          git_exec_action = :sync
-        end
+        git_exec_action = if opts[:upgrade_strategy] == 'none'
+                            :checkout
+                          else
+                            :sync
+                          end
 
         git opts[:rbenv_prefix] do
           repository opts[:git_url]
@@ -89,11 +89,11 @@ def git_deploy_rbenv(opts)
       def initialize_rbenv(opts)
         prefix = opts[:rbenv_prefix]
 
-        if opts[:user]
-          init_env = { 'USER' => opts[:user], 'HOME' => opts[:home_dir] }
-        else
-          init_env = {}
-        end
+        init_env = if opts[:user]
+                     { 'USER' => opts[:user], 'HOME' => opts[:home_dir] }
+                   else
+                     {}
+                   end
 
         bash "Initialize rbenv (#{opts[:user] || 'system'})" do
           code %(PATH="#{prefix}/bin:$PATH" rbenv init -)

diff --git a/libraries/chef_rbenv_script_helpers.rb b/libraries/chef_rbenv_script_helpers.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -62,16 +62,16 @@ def set_updated
       end
 
       # Execute the supplied block of code as the given user.
-      def run_as_user(username, &block)
+      def run_as_user(username)
         if username
           user = Etc.getpwnam(username)
           Process.fork do
             Process.uid = user.uid
-            block.call
+            yield
           end
           Process.wait
         else
-          block.call
+          yield
         end
       end
     end

diff --git a/providers/ruby.rb b/providers/ruby.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 # limitations under the License.
 #
 
+use_inline_resources
+
 provides :rbenv_ruby
 
 include Chef::Rbenv::ScriptHelpers

diff --git a/providers/script.rb b/providers/script.rb
@@ -70,11 +70,12 @@ def build_script_environment
   script_env.merge!(new_resource.environment) if new_resource.environment
 
   if new_resource.path
-    script_env.merge!('PATH' => "#{new_resource.path.join(':')}:#{ENV['PATH']}")
+    script_env['PATH'] = "#{new_resource.path.join(':')}:#{ENV['PATH']}"
   end
 
   if new_resource.user
-    script_env.merge!('USER' => new_resource.user, 'HOME' => user_home)
+    script_env['USER'] = new_resource.user
+    script_env['HOME'] = user_home
   end
 
   script_env

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: ruby_rbenv
 # Recipe:: default
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/system_install.rb b/recipes/system_install.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: ruby_rbenv
 # Recipe:: system_install
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/recipes/user_install.rb b/recipes/user_install.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: ruby_rbenv
 # Recipe:: user_install
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/resources/gem.rb b/resources/gem.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/resources/global.rb b/resources/global.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/resources/rehash.rb b/resources/rehash.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/resources/ruby.rb b/resources/ruby.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/resources/script.rb b/resources/script.rb
@@ -4,7 +4,7 @@
 #
 # Author:: Fletcher Nichol <fnichol@nichol.ca>
 #
-# Copyright 2011, Fletcher Nichol
+# Copyright 2011-2016, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.