bard 1.8.0.beta2 → 1.8.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115799c766998efdc0b5dba97ed4f3135fe77a2d30b67248db1a52f28915b126
-  data.tar.gz: 6eb18a8ddc93efffd1de4da94270766f50883bb2bb2cee91cf50c02cb624ca9d
+  metadata.gz: b1a0399d5fd80c8599d584b056a6ae7b77959cdf9f394e3d76461826f2219f9f
+  data.tar.gz: cd5b858005ffeddd001fffcef8538c07572b70d81ab086c9b44c4b06b2304f18
 SHA512:
-  metadata.gz: e03e8f2f53ee3349355b4f14ae6ed238b2067350ff1159a46127738a59a5e08afcdcef2635d46536d9441cb001d4823ff074d1e39a03c291581f664c7b56eb05
-  data.tar.gz: 67d2d63759fc54b8e68216f3149ca5f936111f9fad72acec45423d396027568778e1c4817240d4c0613869ed8832306f2bbff8fa2cfc7359f357920dac0a6ef5
+  metadata.gz: 279c018696cdbef81518d54e37bc5f1508b42808e8c8f448bd048816a398f28b46ecd62865481ab3f83da742c4015b1d5acb69941769f004f40e7d88f765add7
+  data.tar.gz: 3b7d5e076a8f5f20ac500e8261e4ff15b10dd7a8814c1aba097a8f1635dc610ed60f951af648a2a0e56e6adce2f2da8eee2ca54a2ad93312446883de3e416d93

data/lib/bard/copy.rb

@@ -35,7 +35,7 @@ module Bard
       port = ssh_server.port
       port_opt = port && port.to_s != "22" ? "-P #{port}" : ""
 
-      from_and_to = [path, target_or_server.scp_uri(path)]
+      from_and_to = [path, target_or_server.scp_uri(path).to_s]
       from_and_to.reverse! if direction == :from
 
       command = ["scp", ssh_opts, gateway, ssh_key, port_opt, *from_and_to].reject(&:empty?).join(" ")
@@ -65,18 +65,7 @@ module Bard
       # Support both new Target (with server attribute) and old Server
       ssh_server = target_or_server.respond_to?(:server) ? target_or_server.server : target_or_server
 
-      # Get ssh_uri - it might be a URI object (old Server), string (new SSHServer), or mock
-      ssh_uri_value = ssh_server.respond_to?(:ssh_uri) ? ssh_server.ssh_uri : nil
-      if ssh_uri_value.respond_to?(:port)
-        # Already a URI-like object (old Server or mock)
-        ssh_uri = ssh_uri_value
-      elsif ssh_uri_value.is_a?(String)
-        # String from new SSHServer
-        ssh_uri = URI("ssh://#{ssh_uri_value}")
-      else
-        # Fallback
-        ssh_uri = ssh_uri_value
-      end
+      ssh_uri = ssh_server.ssh_uri
 
       gateway = ssh_server.gateway ? "-oProxyCommand=\"ssh #{ssh_server.gateway} -W %h:%p\"" : ""
 
@@ -97,24 +86,8 @@ module Bard
 
       raise NotImplementedError if from_server.gateway || to_server.gateway || from_server.ssh_key || to_server.ssh_key
 
-      # Get ssh_uri - it might be a URI object (old Server), string (new SSHServer), or mock
-      from_uri_value = from_server.respond_to?(:ssh_uri) ? from_server.ssh_uri : nil
-      if from_uri_value.respond_to?(:port)
-        from_uri = from_uri_value
-      elsif from_uri_value.is_a?(String)
-        from_uri = URI("ssh://#{from_uri_value}")
-      else
-        from_uri = from_uri_value
-      end
-
-      to_uri_value = to_server.respond_to?(:ssh_uri) ? to_server.ssh_uri : nil
-      if to_uri_value.respond_to?(:port)
-        to_uri = to_uri_value
-      elsif to_uri_value.is_a?(String)
-        to_uri = URI("ssh://#{to_uri_value}")
-      else
-        to_uri = to_uri_value
-      end
+      from_uri = from_server.ssh_uri
+      to_uri = to_server.ssh_uri
 
       from_str = "-p#{from_uri.port || 22} #{from_uri.user}@#{from_uri.host}"
       to_str = to.rsync_uri(path).sub(%r(/[^/]+$), '/')

data/lib/bard/server.rb

@@ -101,6 +101,10 @@ module Bard
       URI("ssh://#{value}")
     end
 
+    def port
+      ssh_uri.port || 22
+    end
+
     def scp_uri file_path=nil
       ssh_uri.dup.tap do |uri|
         uri.scheme = "scp"

data/lib/bard/ssh_server.rb

@@ -23,7 +23,7 @@ module Bard
     end
 
     def ssh_uri
-      "#{user}@#{host}:#{port}"
+      URI("ssh://#{user}@#{host}:#{port}")
     end
 
     def hostname

data/lib/bard/target.rb

@@ -117,8 +117,8 @@ module Bard
     # Ping configuration
     def ping(*urls)
       if urls.empty?
-        # Getter
-        @ping_urls
+        # Getter - normalize URLs like Server does
+        @ping_urls.map { |url| normalize_ping(url) }
       elsif urls.first == false
         # Disable ping
         @ping_urls = []
@@ -247,15 +247,13 @@ module Bard
 
     # URI methods for compatibility
     def scp_uri(file_path = nil)
-      # Use traditional scp format: user@host:path (relative to home)
-      # Port is NOT included here - it must be passed via -P flag to scp
-      full_path = path
+      full_path = "/#{path}"
       full_path += "/#{file_path}" if file_path
-      "#{server.user}@#{server.host}:#{full_path}"
+      URI::Generic.build(scheme: "scp", userinfo: server.user, host: server.host, port: server.port.to_i, path: full_path)
     end
 
     def rsync_uri(file_path = nil)
-      uri = URI("ssh://#{ssh_uri}")
+      uri = ssh_uri
       str = "#{uri.user}@#{uri.host}"
       str += ":#{path}"
       str += "/#{file_path}" if file_path
@@ -278,5 +276,14 @@ module Bard
         end
       end
     end
+
+    private
+
+    def normalize_ping(value)
+      return nil if value == false || value.nil?
+      normalized = value.to_s
+      normalized = "https://#{normalized}" unless normalized.start_with?("http")
+      normalized
+    end
   end
 end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.8.0.beta2"
+  VERSION = "1.8.0.beta4"
 end
 

data/spec/bard/ssh_server_spec.rb

@@ -40,14 +40,18 @@ describe Bard::SSHServer do
   end
 
   describe "#ssh_uri" do
-    it "returns the SSH connection string" do
+    it "returns a URI object" do
       server = described_class.new("deploy@example.com:22")
-      expect(server.ssh_uri).to eq("deploy@example.com:22")
+      expect(server.ssh_uri).to be_a(URI::Generic)
+      expect(server.ssh_uri.scheme).to eq("ssh")
+      expect(server.ssh_uri.user).to eq("deploy")
+      expect(server.ssh_uri.host).to eq("example.com")
+      expect(server.ssh_uri.port).to eq(22)
     end
 
     it "includes port if non-standard" do
       server = described_class.new("deploy@example.com:2222")
-      expect(server.ssh_uri).to eq("deploy@example.com:2222")
+      expect(server.ssh_uri.port).to eq(2222)
     end
   end
 

data/spec/bard/target_spec.rb

@@ -37,7 +37,11 @@ describe Bard::Target do
       end
 
       it "parses SSH URI" do
-        expect(target.ssh_uri).to eq("deploy@example.com:22")
+        expect(target.ssh_uri).to be_a(URI::Generic)
+        expect(target.ssh_uri.scheme).to eq("ssh")
+        expect(target.ssh_uri.user).to eq("deploy")
+        expect(target.ssh_uri.host).to eq("example.com")
+        expect(target.ssh_uri.port).to eq(22)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.8.0.beta2
+  version: 1.8.0.beta4
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2025-12-31 00:00:00.000000000 Z
+date: 2026-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor