bard 0.44.1 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e79ccc420d8bed3ff834d150b9f58da74e34981dc59a244dd92de38fb5e831
-  data.tar.gz: 816db71d99a04cb75aff222369e41e719de7da1b608fc518b74e9ec3ba5a5ec0
+  metadata.gz: 052770d2821e0c8ed3ad4b90a031bfb1cde2dc7b1c8b346b9ac3c0433db667fd
+  data.tar.gz: 5c42dcb089ff3488eb990f582986354acd974c0f68199f6a7a9cca01e91cb2ad
 SHA512:
-  metadata.gz: 70fedcdd193a7588a6342a7efee99ddf95598599d80b50d48206fb29674e1dcf002ac3a239c0e836630190a1b5e8552d2bfe8ecc53f600fc031e3d44330631ac
-  data.tar.gz: 1c2dc2a6b0f6c6b225b520f7d801f8ae0dfd16b4007302db9ab2b713036f1bf89a4a5e4cd9f0bd422e23c5c3830b45ea94095283a780540fb1e87c88c0559917
+  metadata.gz: '09cc31d6f12248a5995cc93e435d540f4379c08b77e166196db38e96d11e40f73170989c1e86aa6309d57f3504072edda6827bee2eb05c49887ab2448d3d2248'
+  data.tar.gz: b34c19977c459886d012248301bc0b35afa668d08f5c0eb8ed05a76378c21174edd6192c53406b8f8ebf06bf97723ce3765bba488caae7db2b89ec9a5866af6e

data/lib/bard/base.rb

@@ -1,6 +1,7 @@
 require "thor"
 require "term/ansicolor"
 require "open3"
+require "uri"
 
 class Bard::CLI < Thor
   include Term::ANSIColor
@@ -28,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}\""
@@ -44,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
@@ -61,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

@@ -1,3 +1,5 @@
+require "uri"
+
 class Bard::CLI < Thor
   class Config
     def initialize project_name, path
@@ -55,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|
@@ -70,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.44.1"
+  VERSION = "0.46.0"
 end
 

data/lib/bard.rb

@@ -178,7 +178,7 @@ class Bard::CLI < Thor
 
     command = "curl -sfL #{url} 2>&1 1>/dev/null"
     unless system command
-      puts "#{server.to_s.capitalize} is down!"
+      puts "#{server.key.to_s.capitalize} is down!"
       exit 1
     end
   end
@@ -197,5 +197,10 @@ class Bard::CLI < Thor
   def download_ci_test_coverage
     rsync :from, :ci, "coverage"
   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`"
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.44.1
+  version: 0.46.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-12-31 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.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: CLI to automate common development tasks.