sdls 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1649a83c3850e7e6a8657edfa6fce674ca844211d5264ef016dd9ddc6c413e8f
-  data.tar.gz: f826f7983ee0a67f1c1aabaeb6e172df8541f76c63415dbbf028600d479beeef
+  metadata.gz: 80ab5c882f651304f21232bd31b312a328d08531c13db2a023e3a6ea28d47fd5
+  data.tar.gz: b40ac3decbb740eddef2e8a97e16e8079783bfa858b73ab922ef8849c3076eb6
 SHA512:
-  metadata.gz: 17ab00c3765268aa845339d54e65caea98c69e791d3f9f1d13345ab6aea5c82bc58576449b0921b1e6d9720163e30c03337ad0e1b6fbd3241b60601fe13b13d1
-  data.tar.gz: 54eca13f2a055533da40642741dd1e897816ea0daed83b59108cc92d53040bdeac0d29ebe3a5cdedf9e4ed19dd43c055113f3ee43a5ef0d5005d2470647f3d9f
+  metadata.gz: c2193a8357febf6e99d1164bdbdd7b12fbd7e374ba851ef267fda2b53f09bccde84fed20ddcc03d6ca72da39d177a6c698e8028abb04e0abbd84a2a058938a22
+  data.tar.gz: 48924c08c46cc3862e61cd6101c5b0c68b75500fdd3f43c46e9eb7c969591864954489b141e3bf0b9f092c888ad987e9790a1651e32be0c19bc288ed82c8add0

data/lib/sdls/cli.rb

@@ -23,7 +23,8 @@ module SDLS
           host: current_config.host,
           username: current_config.username,
           password: current_config.password,
-          op_item_name: current_config.op_item_name
+          op_item_name: current_config.op_item_name,
+          op_account: current_config.op_account
         )
       end
 
@@ -49,6 +50,7 @@ module SDLS
       puts "  username: #{current_config.username}"
       puts "  password: [REDACTED]"
       puts "  op_item_name: #{current_config.op_item_name || "[NOT SET]"}"
+      puts "  op_account: #{current_config.op_account || "[NOT SET]"}"
       puts "  directories: #{current_config.directories.join(", ")}" if current_config.directories&.any?
     end
 

data/lib/sdls/client.rb

@@ -6,11 +6,12 @@ require "tty-prompt"
 
 module SDLS
   class Client
-    def initialize(host:, username:, password:, op_item_name: nil)
+    def initialize(host:, username:, password:, op_item_name: nil, op_account: nil)
       @host = host
       @username = username
       @password = password
       @op_item_name = op_item_name
+      @op_account = op_account
     end
 
     def authenticate(otp: nil)
@@ -121,7 +122,10 @@ module SDLS
     def fetch_otp_from_1password
       return nil unless @op_item_name
 
-      stdout, stderr, status = Open3.capture3("op item get \"#{@op_item_name}\" --otp")
+      cmd = ["op", "item", "get", @op_item_name, "--otp"]
+      cmd += ["--account", @op_account] if @op_account && !@op_account.to_s.strip.empty?
+
+      stdout, stderr, status = Open3.capture3(*cmd)
       if status.success?
         stdout.strip
       else

data/lib/sdls/config.rb

@@ -13,7 +13,7 @@ module SDLS
   # Core configuration keys that must be present
   REQUIRED_KEYS = %i[host].freeze
 
-  Config = Data.define(:host, :username, :password, :op_item_name, :directories) do
+  Config = Data.define(:host, :username, :password, :op_item_name, :op_account, :directories) do
     class << self
       def load(path, prompt: nil)
         validate_file_exists!(path)
@@ -52,6 +52,7 @@ module SDLS
 
       def set_defaults(data)
         data[:op_item_name] ||= nil
+        data[:op_account] ||= nil
         data[:directories] ||= []
         data
       end
@@ -62,6 +63,7 @@ module SDLS
 
       def resolve_credentials(data, prompt: nil)
         op_item_name = data[:op_item_name]
+        op_account = data[:op_account]
 
         # Check if we have both username and password from config
         has_config_username = data[:username] && !data[:username].to_s.strip.empty?
@@ -77,7 +79,7 @@ module SDLS
 
         # If 1Password item is specified and we're missing some credentials, try to fetch from there
         if op_item_name && !op_item_name.to_s.strip.empty? && (!has_config_username || !has_config_password)
-          onepassword_credentials = fetch_credentials_from_1password(op_item_name)
+          onepassword_credentials = fetch_credentials_from_1password(op_item_name, op_account)
           if onepassword_credentials[:success]
             final_username = has_config_username ? data[:username] : onepassword_credentials[:username]
             final_password = has_config_password ? data[:password] : onepassword_credentials[:password]
@@ -122,13 +124,13 @@ module SDLS
         prompt_for_credential("password", mask: true, prompt: prompt)
       end
 
-      def fetch_credentials_from_1password(op_item_name)
+      def fetch_credentials_from_1password(op_item_name, op_account = nil)
         return {success: false} unless onepassword_cli_available?
 
         puts "Fetching credentials from 1Password for item: #{op_item_name}..."
 
-        username = fetch_field_from_1password(op_item_name, "username")
-        password = fetch_field_from_1password(op_item_name, "password")
+        username = fetch_field_from_1password(op_item_name, "username", op_account)
+        password = fetch_field_from_1password(op_item_name, "password", op_account)
 
         puts "1Password item '#{op_item_name}' retrieved successfully."
         puts "Username: #{username.nil? ? "not found" : username}"
@@ -152,10 +154,11 @@ module SDLS
         {success: false}
       end
 
-      def fetch_field_from_1password(op_item_name, field)
-        stdout, _, status = Open3.capture3(
-          "op", "item", "get", op_item_name, "--fields", field, "--reveal"
-        )
+      def fetch_field_from_1password(op_item_name, field, op_account = nil)
+        cmd = ["op", "item", "get", op_item_name, "--fields", field, "--reveal"]
+        cmd += ["--account", op_account] if op_account && !op_account.to_s.strip.empty?
+
+        stdout, _, status = Open3.capture3(*cmd)
 
         if status.success? && !stdout.strip.empty?
           stdout.strip

data/lib/sdls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SDLS
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdls
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Camillo Visini