From 811abf7591844ef3229c5705e221cbf1e7ea3cd1 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Mon, 14 Mar 2016 12:54:35 -0700
Subject: manual fixing for raise unless

---
 lib/chef/chef_fs/config.rb                   |  3 ++-
 lib/chef/event_loggers/base.rb               |  4 ++--
 lib/chef/formatters/base.rb                  |  4 ++--
 lib/chef/http/socketless_chef_zero_client.rb |  3 ++-
 lib/chef/policy_builder/policyfile.rb        | 14 +++++---------
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/chef/chef_fs/config.rb b/lib/chef/chef_fs/config.rb
index 53964c8b85..9c3810a492 100644
--- a/lib/chef/chef_fs/config.rb
+++ b/lib/chef/chef_fs/config.rb
@@ -270,7 +270,8 @@ class Chef
           end
           object_names.each do |object_name|
             # cookbooks -> cookbook_path
-            (singular_name = INFLECTIONS[object_name]) || raise("Unknown object name #{object_name}")
+            singular_name = INFLECTIONS[object_name]
+            raise("Unknown object name #{object_name}") unless singular_name
             variable_name = "#{singular_name}_path"
             paths = Array(@chef_config[variable_name]).flatten
             result[object_name] = paths.map { |path| File.expand_path(path) }
diff --git a/lib/chef/event_loggers/base.rb b/lib/chef/event_loggers/base.rb
index 17fd6198ff..3c11e809f6 100644
--- a/lib/chef/event_loggers/base.rb
+++ b/lib/chef/event_loggers/base.rb
@@ -42,8 +42,8 @@ class Chef
     end
 
     def self.new(name)
-      (event_logger_class = by_name(name.to_s)) ||
-        raise(UnknownEventLogger, "No event logger found for #{name} (available: #{available_event_loggers.join(', ')})")
+      event_logger_class = by_name(name.to_s)
+      raise UnknownEventLogger, "No event logger found for #{name} (available: #{available_event_loggers.join(', ')})" unless event_logger_class
       raise UnavailableEventLogger unless available_event_loggers.include? name.to_s
       event_logger_class.new
     end
diff --git a/lib/chef/formatters/base.rb b/lib/chef/formatters/base.rb
index 2ac1274c37..90925ffdb4 100644
--- a/lib/chef/formatters/base.rb
+++ b/lib/chef/formatters/base.rb
@@ -51,8 +51,8 @@ class Chef
     #--
     # TODO: is it too clever to be defining new() on a module like this?
     def self.new(name, out, err)
-      (formatter_class = by_name(name.to_s)) ||
-        raise(UnknownFormatter, "No output formatter found for #{name} (available: #{available_formatters.join(', ')})")
+      formatter_class = by_name(name.to_s)
+      raise UnknownFormatter, "No output formatter found for #{name} (available: #{available_formatters.join(', ')})" unless formatter_class
 
       formatter_class.new(out, err)
     end
diff --git a/lib/chef/http/socketless_chef_zero_client.rb b/lib/chef/http/socketless_chef_zero_client.rb
index 9d5be78a57..1acac5e758 100644
--- a/lib/chef/http/socketless_chef_zero_client.rb
+++ b/lib/chef/http/socketless_chef_zero_client.rb
@@ -177,7 +177,8 @@ class Chef
 
       def to_net_http(code, headers, chunked_body)
         body = chunked_body.join("")
-        (msg = STATUS_MESSAGE[code]) || raise("Cannot determine HTTP status message for code #{code}")
+        msg = STATUS_MESSAGE[code]
+        raise "Cannot determine HTTP status message for code #{code}" unless msg
         response = Net::HTTPResponse.send(:response_class, code.to_s).new("1.0", code.to_s, msg)
         response.instance_variable_set(:@body, body)
         headers.each do |name, value|
diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb
index e2238d4a73..875ca735c7 100644
--- a/lib/chef/policy_builder/policyfile.rb
+++ b/lib/chef/policy_builder/policyfile.rb
@@ -256,10 +256,9 @@ class Chef
       # @api private
       def run_list
         if named_run_list_requested?
-          named_run_list ||
-            raise(ConfigurationError,
+          raise ConfigurationError,
             "Policy '#{retrieved_policy_name}' revision '#{revision_id}' does not have named_run_list '#{named_run_list_name}'" +
-              "(available named_run_lists: [#{available_named_run_lists.join(', ')}])")
+            "(available named_run_lists: [#{available_named_run_lists.join(', ')}])" unless named_run_list
         else
           policy["run_list"]
         end
@@ -321,17 +320,14 @@ class Chef
 
       # @api private
       def deployment_group
-        Chef::Config[:deployment_group] ||
-          raise(ConfigurationError, "Setting `deployment_group` is not configured.")
+        raise ConfigurationError, "Setting `deployment_group` is not configured." unless Chef::Config[:deployment_group]
       end
 
       # @api private
       def validate_policy_config!
-        policy_group ||
-          raise(ConfigurationError, "Setting `policy_group` is not configured.")
+        raise ConfigurationError, "Setting `policy_group` is not configured." unless policy_group
 
-        policy_name ||
-          raise(ConfigurationError, "Setting `policy_name` is not configured.")
+        raise ConfigurationError, "Setting `policy_name` is not configured." unless policy_name
       end
 
       # @api private
-- 
cgit v1.2.1