open_directory_utils 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61e2e2aca525175359c6fb86db2fd8a29951f2b36a134dbce4eed2c58bd646a
-  data.tar.gz: da2402a3e3c19cc361173a28765af73b97c15ffa920c0135774cb10c966d1c99
+  metadata.gz: c37dea537a3c3bc485752eda8c5ffc5ae651ba59abeb19ed797c9361337eca77
+  data.tar.gz: 9acd8a277cd637a83fa5e2c378f58542b2ca8a64498ad80cabc2848ad1dddd47
 SHA512:
-  metadata.gz: b2331c724ea6e615328177b1665268623da72f4944c52659b6c381ecda39899a2269db1408f8321c2315094c7c74f6b9ac6c6551ef0dc567c2b34d21f022410f
-  data.tar.gz: 372507f3d5f28b8984ac319cd57700bda70c51fffde75757a7b594efcb40b657a17675f433e09338625d3f64156de2e6cf8f57ad47f018e31087118b9fb3fc41
+  metadata.gz: a2e8b07003c61f730a5f1559737cfb7e20740694981ebba75afd3aadcb32973931e3b357705ee1b52c8cd0f0e32ac098ff335145bbf4639b2982c8b838edf628
+  data.tar.gz: 153f9fc11e4951844fb27a20d462abb1035416cecec907a60573940fd43308d13d4a68e4c881276982ad47c4856167b9b3622be5d88f3d002b7fa6b8a39c6db2

data/README.md

@@ -7,6 +7,7 @@ One can also build custom DSCL commands and send them to the server as needed to
 
 ## Change Log
 
+* **v0.1.4** - 2018-06-13 - changed the return hash to {response: xxx, status: 'success'}
 * **v0.1.3** - 2018-06-13 - able to sync all fields in typcial OD
 - refactored results code (ssh_cmds have redacted passwords)
 - finished adding pre-built od commands for users - good for syncing accounts

data/lib/open_directory_utils/connection.rb

@@ -42,6 +42,7 @@ module OpenDirectoryUtils
     # @command [Symbol] - required -- to choose the action wanted
     # @params [Hash] - required -- necessary information to accomplish action
     # @output [String] - optional -- 'xml' or 'plist' will return responses using xml format
+    # response [Hash] - { response: results, status: status, command: command, attributes: params, dscl_cmds: ssh_clean }
     def run(command:, params:, output: nil)
       answer = {}
       params[:format] = output
@@ -54,7 +55,7 @@ module OpenDirectoryUtils
       answer = process_results(results, command, params, ssh_cmds )
       return answer
       rescue ArgumentError, NoMethodError => error
-        format_results(error.message, command, params, ssh_cmds, success: false)
+        format_results(error.message, command, params, ssh_cmds, 'error')
     end
 
     private
@@ -78,7 +79,7 @@ module OpenDirectoryUtils
       if missing_resource?(results)
         results = ["Resource not found", results]
         # report lack of success
-        return format_results(results, command, params, ssh_cmds, success: false)
+        return format_results(results, command, params, ssh_cmds, 'error')
       end
       if command.eql?(:user_password_verified?) or command.eql?(:user_password_ok?)
         return report_password_check(results, command, params, ssh_cmds)
@@ -91,35 +92,28 @@ module OpenDirectoryUtils
       end
       if results.to_s.include? 'attribute status: eDSNoStdMappingAvailable'
         results = ["Bad Attribute Description", results]
-        format_results(results, command, params, ssh_cmds, success: false)
+        format_results(results, command, params, ssh_cmds, 'error')
       end
       if missed_errors?(results)
         results = ["Unexpected Error", results]
-        format_results(results, command, params, ssh_cmds, success: false)
+        format_results(results, command, params, ssh_cmds, 'error')
       end
       # return any general success answers
-      format_results(results, command, params, ssh_cmds, success: true)
+      format_results(results, command, params, ssh_cmds, 'success')
     end
 
-    def format_results(results, command, params, ssh_cmds, success:)
+    def format_results(results, command, params, ssh_cmds, status)
       ssh_clean = ssh_cmds.to_s
       ssh_clean = ssh_clean.gsub(/-[p] ".+"/, '-p "************"')
       ssh_clean = ssh_clean.gsub(/-[P] ".+"/, '-P "************"')
-
-      case success
-      when true
-        return { success:{response: results, command: command,
-                          attributes: params, dscl_cmds: ssh_clean} }
-      else
-        return { error:  {response: results, command: command,
-                          attributes: params, dscl_cmds: ssh_clean} }
-      end
+      { response: results, status: status, command: command,
+        attributes: params, dscl_cmds: ssh_clean }
     end
 
     def report_existence(results, command, params, ssh_cmds)
       results = [false, results]    if results.to_s.include?('eDSRecordNotFound')
       results = [true, results] unless results.to_s.include?('eDSRecordNotFound')
-      return format_results(results, command, params, ssh_cmds, success: true)
+      return format_results(results, command, params, ssh_cmds, 'success')
     end
 
     def missing_resource?(results)
@@ -135,7 +129,7 @@ module OpenDirectoryUtils
     def report_password_check(results, command, params, ssh_cmds)
       results = [false, results]    if results.to_s.include?('eDSAuthFailed')
       results = [true, results] unless results.to_s.include?('eDSAuthFailed')
-      return format_results(results, command, params, ssh_cmds, success: true)
+      return format_results(results, command, params, ssh_cmds, 'success')
     end
 
     def missed_errors?(results)
@@ -149,14 +143,14 @@ module OpenDirectoryUtils
       results = [false, results]     if results.to_s.include?('account is disabled')
       results = [true, results]  unless results.to_s.include?('isDisabled=1') or
                                         results.to_s.include?('account is disabled')
-      return format_results(results, command, params, ssh_cmds, success: true)
+      return format_results(results, command, params, ssh_cmds, 'success')
     end
 
     def report_in_group(results, command, params, ssh_cmds)
       username = params[:value]
       results = [true, results]      if results.to_s.include?( username )
       results = [false, results] unless results.to_s.include?( username )
-      return format_results(results, command, params, ssh_cmds, success: true)
+      return format_results(results, command, params, ssh_cmds, 'success')
     end
 
     def defaults

data/lib/open_directory_utils/version.rb

@@ -1,5 +1,5 @@
 module OpenDirectoryUtils
   module Version
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_directory_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Bill Tihen