Merge pull request #363 from chef/chefstyle_fixes

Resolve chefstyle warnings

bin/chef-vault

@@ -79,7 +79,7 @@ options_config.each do |option, config|
 end
 
 options_config.each do |option, config|
-  options[option] = options[option] ? options[option] : config[:default]
+  options[option] = options[option] || config[:default]
 end
 
 require "rubygems" unless defined?(Gem)

chef-vault.gemspec

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("lib", __dir__)
 require "chef-vault/version"
 
 Gem::Specification.new do |s|

lib/chef/knife/mixin/helper.rb

@@ -49,8 +49,8 @@ def values_from_json(json)
       # Raises `InvalidValue` if any of the json's values contain non-printable characters.
       def validate_json(json)
         begin
-          evaled_json = eval(json)
-        rescue SyntaxError => e
+          evaled_json = eval(json) # rubocop: disable Security/Eval
+        rescue SyntaxError
           raise ChefVault::Exceptions::InvalidValue, "#{json} is not valid JSON!"
         end
 

lib/chef/knife/vault_admins.rb

@@ -26,7 +26,7 @@ def admins
         vault_admins = Chef::Config[:knife][:vault_admins]
         admin_array = [Chef::Config[:node_name]]
 
-        if !vault_admins.kind_of?(Array)
+        unless vault_admins.is_a?(Array)
           ui.warn("Vault admin must be an array")
         end
 

lib/chef/knife/vault_base.rb

@@ -23,7 +23,7 @@ def self.included(includer)
         includer.class_eval do
           deps do
             require "chef/search/query"
-            require File.expand_path("../mixin/helper", __FILE__)
+            require File.expand_path("mixin/helper", __dir__)
             include ChefVault::Mixin::Helper
           end