bard 0.45.1 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2aaf36ed328b519c7b21dde4613e2c5f9549477d032cb5208512a8a50c23fd
-  data.tar.gz: a8d341af27fd88167618074ed12621a3cec1c14ed80abab8bb359f2678043de2
+  metadata.gz: 052770d2821e0c8ed3ad4b90a031bfb1cde2dc7b1c8b346b9ac3c0433db667fd
+  data.tar.gz: 5c42dcb089ff3488eb990f582986354acd974c0f68199f6a7a9cca01e91cb2ad
 SHA512:
-  metadata.gz: 2f5de7283881fd2d654fe4a9c4975c9d03c110520982a9cfbb828bf1c31eb66da9aab1fa86e44218899b0ec85483105aa7efe9ec61319facf9e05c0001c8fad4
-  data.tar.gz: 4f52fd46c07b105ae5ee32c379296785a0c06c2ba78c69a0731b8379c3577afdd7eaaddad09cb0d91d4dc2b247c0a082e1e383f9b1253beb4c94073f6b47e13e
+  metadata.gz: '09cc31d6f12248a5995cc93e435d540f4379c08b77e166196db38e96d11e40f73170989c1e86aa6309d57f3504072edda6827bee2eb05c49887ab2448d3d2248'
+  data.tar.gz: b34c19977c459886d012248301bc0b35afa668d08f5c0eb8ed05a76378c21174edd6192c53406b8f8ebf06bf97723ce3765bba488caae7db2b89ec9a5866af6e

data/lib/bard/base.rb

@@ -29,8 +29,10 @@ class Bard::CLI < Thor
   def ssh_command server, command, home: false
     server = @config.servers[server.to_sym]
     uri = URI.parse("ssh://#{server.ssh}")
+    ssh_key = server.ssh_key ? "-i #{server.ssh_key} " : ""
+    command = "#{server.env} #{command}" if server.env
     command = "cd #{server.path} && #{command}" unless home
-    command = "ssh -tt #{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{command}'"
+    command = "ssh -tt #{ssh_key}#{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{command}'"
     if server.gateway
       uri = URI.parse("ssh://#{server.gateway}")
       command = "ssh -tt #{" -p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} \"#{command}\""
@@ -45,12 +47,14 @@ class Bard::CLI < Thor
     port = uri.port ? "-p#{uri.port}" : ""
     gateway = server.gateway ? "-oProxyCommand='ssh #{port} #{uri.user}@#{uri.host} -W %h:%p'" : ""
 
+    ssh_key = server.ssh_key ? "-i #{server.ssh_key}" : ""
+
     uri = URI.parse("ssh://#{server.ssh}")
     port = uri.port ? "-P#{uri.port}" : ""
     from_and_to = [path, "#{uri.user}@#{uri.host}:#{server.path}/#{path}"]
 
     from_and_to.reverse! if direction == :from
-    command = "scp #{gateway} #{port} #{from_and_to.join(" ")}"
+    command = "scp #{gateway} #{ssh_key} #{port} #{from_and_to.join(" ")}"
 
     run_crucial command
   end
@@ -62,9 +66,10 @@ class Bard::CLI < Thor
     port = uri.port ? "-p#{uri.port}" : ""
     gateway = server.gateway ? "-oProxyCommand=\"ssh #{port} #{uri.user}@#{uri.host} -W %h:%p\"" : ""
 
+    ssh_key = server.ssh_key ? "-i #{server.ssh_key}" : ""
     uri = URI.parse("ssh://#{server.ssh}")
     port = uri.port ? "-p#{uri.port}" : ""
-    ssh = "-e'ssh #{port} #{gateway}'"
+    ssh = "-e'ssh #{ssh_key} #{port} #{gateway}'"
 
     dest_path = path.dup
     dest_path = "./#{dest_path}"

data/lib/bard/config.rb

@@ -57,7 +57,7 @@ class Bard::CLI < Thor
       instance_eval File.read(File.expand_path(path)) if File.exist?(path)
     end
 
-    class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway)
+    class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env)
       def self.setting *fields
         fields.each do |field|
           define_method field do |*args|
@@ -72,7 +72,7 @@ class Bard::CLI < Thor
         end
       end
 
-      setting :ssh, :path, :ping, :gateway
+      setting :ssh, :path, :ping, :gateway, :ssh_key, :env
 
       def default_ping
         uri = URI.parse("ssh://#{ssh}")

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.45.1"
+  VERSION = "0.46.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.46.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor