equitrac_utilities 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c56d5baffe1fc3d4fed4283391c508869b24faaa73ad76406211ffc906a166
-  data.tar.gz: f36337e3cecaf50ec47dee44180a69ae5df8cfb51bb233912865c9192af30542
+  metadata.gz: 6e050a9a78e9b6ab78759ccae31433163b684e5143e05ae4466c86cf4129fcff
+  data.tar.gz: c803665fd91de1510dc6bc53f29968f18e4acaf0e17e7be1cf5d0555e0c8e11e
 SHA512:
-  metadata.gz: 3545e140782698895a8671b1c6f343bc3a7a6335e63ced8f80e23be8145df845710c9e063b94feafc9fb23be325462654e1a16626d8383825af91ed79febe167
-  data.tar.gz: b04e946ccdf95b44a6f182519d5bc7ef5fe740e4148b92ba1e546ff9b3aadbe801aa06a4884c6ec7509e5468f90c0de2c759dcf3a9b0c9f6ac568693c919415b
+  metadata.gz: 7d757129d5456af4dbed26f789d9ec6d3106f142b0a6496ed08bee1e3844129dcce238dbcdf16a671b82b4f2ecb11cbdcd9761265b7d12fc4f5c4ae2571217ea
+  data.tar.gz: c24d3fb9d4fa174a305cc79793858ca4b5258d9a2a5979cd5934c80767cbec442911eb53804b8f6de00dd38e8fb5f2b898aa5b19d44646c248b8dd8f534a4214

data/lib/equitrac_utilities/connection.rb

@@ -36,16 +36,16 @@ module EquitracUtilities
     # @param attributes [Hash] attributes needed to perform command
     # @return [String] the restult from the ssh command
     def run(command:, attributes:)
-      unless attributes[:user_id].nil? or attributes[:user_id].empty? or attributes[:user_id].eql? ''
-        # Prep command
-        action  = send(command, attributes)
-        ssh_cmd = build_full_command(action)
-        # Execute command
-        answer = send_eqcmd(ssh_cmd)
-        # Post processing answer
-        return post_processing(command, answer)
+      result = ''
+      begin
+        action   = send(:check_user_id, command, attributes)
+        ssh_cmd  = build_full_command(action)
+        response = send_eqcmd(ssh_cmd)
+        result   = post_processing(command, response)
+      rescue ArgumentError, NoMethodError => error
+        result   = "#{error.message} -- :#{command} using #{attributes}"
       end
-      return "user_id missing -- #{attributes}"
+      return result
     end
 
     private

data/lib/equitrac_utilities/user_actions.rb

@@ -3,6 +3,20 @@ module EquitracUtilities
   # @note Equitrac Administration Guide - https://download.equitrac.com/271828/EE5.6/Docs/Administration_Guide.pdf
   module UserActions
 
+
+    # Be sure Actions have correct user_id data
+    #
+    # @param action [Symbol] the action to be formatted
+    # @return [String] this attribute MUST include: { user_id: "userid" }
+    def check_user_id(action, attribs)
+      attribs[:user_id] = attribs[:user_id]&.strip
+      answer = send(action, attribs)
+      raise ArgumentError, "missing user_id"   if attribs[:user_id].nil? or
+                                                  attribs[:user_id].empty?
+      raise ArgumentError, "user_id has space" if attribs[:user_id].include?(' ')
+      return answer
+    end
+
     # Get Equitrac User Info
     #
     # @param attr [Hash] this attribute MUST include: { user_id: "userid" }

data/lib/equitrac_utilities/version.rb

@@ -1,5 +1,5 @@
 module EquitracUtilities
   module Version
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: equitrac_utilities
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bill Tihen