bard 0.45.1 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2aaf36ed328b519c7b21dde4613e2c5f9549477d032cb5208512a8a50c23fd
-  data.tar.gz: a8d341af27fd88167618074ed12621a3cec1c14ed80abab8bb359f2678043de2
+  metadata.gz: 30db9f340faac772ea3260d4684fbe069eff20c418f81940070d087c22537881
+  data.tar.gz: 37a0849b559a8f53080fdff3dded230053d004440eb6b74276745b5578ddb3ba
 SHA512:
-  metadata.gz: 2f5de7283881fd2d654fe4a9c4975c9d03c110520982a9cfbb828bf1c31eb66da9aab1fa86e44218899b0ec85483105aa7efe9ec61319facf9e05c0001c8fad4
-  data.tar.gz: 4f52fd46c07b105ae5ee32c379296785a0c06c2ba78c69a0731b8379c3577afdd7eaaddad09cb0d91d4dc2b247c0a082e1e383f9b1253beb4c94073f6b47e13e
+  metadata.gz: c6b419ea8c5cf37c5a51c3f89abec27c7505a9a973ce05bcffaddb2a5f43d4307d640a280b74b418e2cc9119b84669d9b1cf358b786006f82ad06e5f282a6136
+  data.tar.gz: 483be73924429a4e788efcc833ccd9aba2229bb7be2cd9e46d9b5147be366dee6b6d137b7753fc8c6c90f25644596064a7fd6e8d6e94d37ecc1f11947ee9d6cd

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.47.0"
 end
 

data/lib/bard.rb

@@ -199,8 +199,8 @@ class Bard::CLI < Thor
   end
 
   desc "vim", "open all files that have changed since master"
-  def vim
-    exec "vim -p `git diff master --name-only | grep -v sass$ | tac`"
+  def vim branch="master"
+    exec "vim -p `git diff #{branch} --name-only | grep -v sass$ | tac`"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.47.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: CLI to automate common development tasks.