Rubocop cleanup

lib/zanzibar.rb

@@ -1,19 +1,16 @@
-require "zanzibar/version"
+require 'zanzibar/version'
 require 'savon'
 require 'io/console'
 require 'fileutils'
 
 module Zanzibar
-
   ##
   # Class for interacting with Secret Server
   class Zanzibar
-
     ##
     # @param args{:domain, :wsdl, :pwd, :username, :globals{}}
 
     def initialize(args = {})
-
       if args[:username]
         @@username = args[:username]
       else
@@ -26,7 +23,7 @@ module Zanzibar
         @@wsdl = get_wsdl_location
       end
       if args[:pwd]
-          @@password = args[:pwd]
+        @@password = args[:pwd]
       else
         @@password = prompt_for_password
       end
@@ -43,7 +40,7 @@ module Zanzibar
     # @param globals{}, optional
 
     def init_client(globals = {})
-      globals = {} if globals == nil
+      globals = {} if globals.nil?
       @@client = Savon.client(globals) do
         wsdl @@wsdl
       end
@@ -54,39 +51,36 @@ module Zanzibar
 
     def prompt_for_password
       puts "Please enter password for #{@@username}:"
-      return STDIN.noecho(&:gets).chomp
+      STDIN.noecho(&:gets).chomp
     end
 
     ## Gets the wsdl document location if none is provided in the constructor
     # @return [String] the location of the WDSL document
 
     def prompt_for_wsdl_location
-      puts "Enter the URL of the Secret Server WSDL:"
-      return STDIN.gets.chomp
+      puts 'Enter the URL of the Secret Server WSDL:'
+      STDIN.gets.chomp
     end
 
     ## Gets the domain of the Secret Server installation if none is provided in the constructor
     # @return [String] the domain of the secret server installation
 
     def prompt_for_domain
-      puts "Enter the domain of your Secret Server:"
-      return STDIN.gets.chomp
+      puts 'Enter the domain of your Secret Server:'
+      STDIN.gets.chomp
     end
 
-
     ## Get an authentication token for interacting with Secret Server. These are only good for about 10 minutes so just get a new one each time.
     # Will raise an error if there is an issue with the authentication.
     # @return the authentication token for the current user.
 
     def get_token
-      begin
-        response = @@client.call(:authenticate, message: { username: @@username, password: @@password, organization: "", domain: @@domain })
-          .hash[:envelope][:body][:authenticate_response][:authenticate_result]
-        raise "Error generating the authentication token for user #{@@username}: #{response[:errors][:string]}"  if response[:errors]
-        response[:token]
-      rescue Savon::Error => err
-        raise "There was an error generating the authentiaton token for user #{@@username}: #{err}"
-      end
+      response = @@client.call(:authenticate, message: { username: @@username, password: @@password, organization: '', domain: @@domain })
+                 .hash[:envelope][:body][:authenticate_response][:authenticate_result]
+      fail "Error generating the authentication token for user #{@@username}: #{response[:errors][:string]}"  if response[:errors]
+      response[:token]
+    rescue Savon::Error => err
+      raise "There was an error generating the authentiaton token for user #{@@username}: #{err}"
     end
 
     ## Get a secret returned as a hash
@@ -95,13 +89,11 @@ module Zanzibar
     # @return [Hash] the secret hash retrieved from the wsdl
 
     def get_secret(scrt_id, token = nil)
-      begin
-        secret = @@client.call(:get_secret, message: { token: token || get_token, secretId: scrt_id}).hash[:envelope][:body][:get_secret_response][:get_secret_result]
-        raise "There was an error getting secret #{scrt_id}: #{secret[:errors][:string]}" if secret[:errors]
-        return secret
-      rescue Savon::Error => err
-        raise "There was an error getting the secret with id #{scrt_id}: #{err}"
-      end
+      secret = @@client.call(:get_secret, message: { token: token || get_token, secretId: scrt_id }).hash[:envelope][:body][:get_secret_response][:get_secret_result]
+      fail "There was an error getting secret #{scrt_id}: #{secret[:errors][:string]}" if secret[:errors]
+      return secret
+    rescue Savon::Error => err
+      raise "There was an error getting the secret with id #{scrt_id}: #{err}"
     end
 
     ## Retrieve a simple password from a secret
@@ -110,13 +102,11 @@ module Zanzibar
     # @return [String] the password for the given secret
 
     def get_password(scrt_id)
-      begin
-        secret = get_secret(scrt_id)
-        secret_items = secret[:secret][:items][:secret_item]
-        return get_secret_item_by_field_name(secret_items,"Password")[:value]
-      rescue Savon::Error => err
-        raise "There was an error getting the password for secret #{scrt_id}: #{err}"
-      end
+      secret = get_secret(scrt_id)
+      secret_items = secret[:secret][:items][:secret_item]
+      return get_secret_item_by_field_name(secret_items, 'Password')[:value]
+    rescue Savon::Error => err
+      raise "There was an error getting the password for secret #{scrt_id}: #{err}"
     end
 
     def write_secret_to_file(path, secret_response)
@@ -151,23 +141,21 @@ module Zanzibar
     # Raise on error
     # @param [Hash] args, :scrt_id, :type (one of "Private Key", "Public Key", "Attachment"), :scrt_item_id - optional, :path - optional
 
-
     def download_secret_file(args = {})
       token = get_token
       FileUtils.mkdir_p(args[:path]) if args[:path]
       path = args[:path] ? args[:path] : '.' ## The File.join below doesn't handle nils well, so let's take that possibility away.
       begin
         response = @@client.call(:download_file_attachment_by_item_id, message:
-          { token: token, secretId: args[:scrt_id], secretItemId: args[:scrt_item_id] || get_scrt_item_id(args[:scrt_id], args[:type], token)})
-            .hash[:envelope][:body][:download_file_attachment_by_item_id_response][:download_file_attachment_by_item_id_result]
-        raise "There was an error getting the #{args[:type]} for secret #{args[:scrt_id]}: #{response[:errors][:string]}"  if response[:errors]
+          { token: token, secretId: args[:scrt_id], secretItemId: args[:scrt_item_id] || get_scrt_item_id(args[:scrt_id], args[:type], token) })
+                   .hash[:envelope][:body][:download_file_attachment_by_item_id_response][:download_file_attachment_by_item_id_result]
+        fail "There was an error getting the #{args[:type]} for secret #{args[:scrt_id]}: #{response[:errors][:string]}"  if response[:errors]
         write_secret_to_file(path, response)
       rescue Savon::Error => err
         raise "There was an error getting the #{args[:type]} for secret #{args[:scrt_id]}: #{err}"
       end
     end
 
-
     ## Methods to maintain backwards compatibility
     def download_private_key(args = {})
       args[:type] = 'Private Key'
@@ -183,6 +171,5 @@ module Zanzibar
       args[:type] = 'Attachment'
       download_secret_file(args)
     end
-
   end
 end

lib/zanzibar/version.rb

@@ -1,3 +1,3 @@
 module Zanzibar
-  VERSION = "0.1.10"
+  VERSION = '0.1.10'
 end