rbzk 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1290a1fd6cc12310c5471f045a47e0c8d5b598326d7e5db899bde02ec6bc96ee
-  data.tar.gz: 172c829144c8aa97e998c19803d5d19fd9d379f38c93170295f149f4a163c2c0
+  metadata.gz: 73a55ff7a558ac52bd29c070e50d62cecaff6881a04e5426777a70a3f4f67cd3
+  data.tar.gz: 697c3d0eddfbc1e7c2c71a2fdcdbd937727863776bf03c16beb729797ea507c7
 SHA512:
-  metadata.gz: 4ee4a5a83b9f129158ea253868b4033d6c0013360d67fe05ba7518a67c6baaf971eeaf764ef447638a0e029a927524ccc51e7871ef0c22ea89b98d3608579542
-  data.tar.gz: 75af5b6ac2c57fe3e0dce24be118ac1fc69cb941d8d78bb8d706da6913ddcc9cf36e669c12e2f114c366eded3be18da5e3bec956e071657250a0812acf57810d
+  metadata.gz: ca7705c199d61813975fc7200d747cca655f4743c3db9f3a3d23a1dc5967dd2e26e993d4450d62bfca7084cfbff497485f8caed9500b3be6d58a4bc3f9e546ca
+  data.tar.gz: c150348cb994e1c30fd3990852e27508d80090df6d3ae66fe7ed74076309d2fbd5f41f800fbc4715162d3444e52d7a6b0c1cf67411dbdf6c964d6560c9cf4093

data/lib/rbzk/cli/commands.rb

@@ -427,17 +427,35 @@ module RBZK
         with_connection(ip, options) do |conn|
           puts 'Adding/updating user...'
 
-          result = conn.set_user(
-            uid: options[:uid],
-            name: options[:name] || '',
-            privilege: options[:privilege] || 0,
-            password: options[:password] || '',
-            group_id: options[:group_id] || '',
-            user_id: options[:user_id] || '',
-            card: options[:card] || 0
-          )
-
-          puts '✓ User added/updated successfully!' if result
+          # Disable device for exclusive access during modification
+          begin
+            conn.disable_device
+          rescue StandardError
+            nil
+          end
+
+          begin
+            result = conn.set_user(
+              uid: options[:uid],
+              name: options[:name] || '',
+              privilege: options[:privilege] || 0,
+              password: options[:password] || '',
+              group_id: options[:group_id] || '',
+              user_id: options[:user_id] || '',
+              card: options[:card] || 0
+            )
+            puts '✓ User added/updated successfully!' if result
+          rescue RBZK::ZKError => e
+            # Reraise to let the with_connection handler print device messages
+            raise e
+          ensure
+            # Re-enable device after modification (always)
+            begin
+              conn.enable_device
+            rescue StandardError
+              nil
+            end
+          end
         end
       end
 
@@ -743,6 +761,8 @@ module RBZK
         rescue RBZK::ZKNetworkError => e
           puts "✗ Network Error: #{e.message}"
           puts 'Please check the IP address and ensure the device is reachable.'
+        rescue RBZK::ZKErrorExists => e
+          puts "✗ Device Error: #{e.message}"
         rescue RBZK::ZKErrorResponse => e
           puts "✗ Device Error: #{e.message}"
           puts 'The device returned an error response.'
@@ -815,11 +835,10 @@ module RBZK
 
       def format_privilege(privilege)
         case privilege
-        when 0 then 'User'
-        when 1 then 'Enroller'
-        when 2 then 'Manager'
-        when 3 then 'Administrator'
-        when 14 then 'Super Admin'
+        when RBZK::Constants::USER_DEFAULT then 'User'
+        when RBZK::Constants::USER_ENROLLER then 'Enroller'
+        when RBZK::Constants::USER_MANAGER then 'Manager'
+        when RBZK::Constants::USER_ADMIN then 'Admin'
         else "Unknown (#{privilege})"
         end
       end

data/lib/rbzk/exceptions.rb

@@ -20,4 +20,10 @@ module RBZK
       super
     end
   end
+
+  class ZKErrorExists < ZKError
+    def initialize(msg = 'Data already exists')
+      super
+    end
+  end
 end

data/lib/rbzk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBZK
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end