bard 0.65.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846754c2ad0d14dc0df687db107e05ecad69a9122540fba07b2362b83ff7b4a0
-  data.tar.gz: 04da3c9f2faa9d2d698d6d08442360a69bbe114e0333b6730257bc9b3ff18e35
+  metadata.gz: 4170341bba5f3a124381a496820b362c93c2ea3c446c9bfbeaa2278ecee747b5
+  data.tar.gz: 30a958dfa912b143f6985eb97f8a47935e62a208a084729840d0d7504719e764
 SHA512:
-  metadata.gz: e742ede7bf2afc73dd8e68e60991ef1b13a819df55b0adea253b58ba70e5102a0139bdb26fcd10e2fe51574cd7a69262224484f6b6855794d930e57bd6739ab1
-  data.tar.gz: 17de7f6f053b646ccdf948197846f0890c2d765e86098a8b41b23d9063bfb376e16dd42bb912b7ad7ce65fc0fcfb84514b43fcac67dd187750f49d280f5c992e
+  metadata.gz: 19098e1641726805f743f38780b55733aaf65d7b4c95457f978303d09421e0caa90d36819310f521c6cac28f69c0440092caf9d23fe8b6641953a47e10a08570
+  data.tar.gz: bf75c63be5037270cdad29f60ebc4b6d1025342ab3db10359a7200a592552b21d9ccfb7fa52b8162ba4ddc710b0e5ede4bd4541efab7f366b16aa2c571bed62d

data/lib/bard/base.rb

@@ -2,6 +2,7 @@ require "thor"
 require "term/ansicolor"
 require "open3"
 require "uri"
+require "bard/remote_command"
 
 class Bard::CLI < Thor
   include Term::ANSIColor
@@ -34,16 +35,7 @@ class Bard::CLI < Thor
 
   def ssh_command server_name, command, home: false
     server = @config.servers.fetch(server_name.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 #{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}\""
-    end
-    command
+    Bard::RemoteCommand.new(server, command, home).local_command
   end
 
   def copy direction, server_name, path, verbose: false

data/lib/bard/config.rb

@@ -45,10 +45,10 @@ module Bard
       instance_eval source
     end
 
-    attr_reader :servers
+    attr_reader :project_name, :servers
 
     def server key, &block
-      @servers[key] ||= Server.new(@project_name, key)
+      @servers[key] ||= Server.new(project_name, key)
       @servers[key].instance_eval &block if block_given?
       @servers[key]
     end
@@ -61,6 +61,17 @@ module Bard
       end
     end
 
+    def backup *args
+      if args.length == 1
+        @backup = args.first
+      elsif args.length == 0
+        return @backup if defined?(@backup)
+        @backup = true
+      else
+        raise ArgumentError
+      end
+    end
+
     private
 
     class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env)

data/lib/bard/remote_command.rb

@@ -0,0 +1,22 @@
+module Bard
+  class RemoteCommand < Struct.new(:server, :command, :home)
+    def local_command
+      uri = URI.parse("ssh://#{server.ssh}")
+      ssh_key = server.ssh_key ? "-i #{server.ssh_key} " : ""
+      cmd = command
+      if server.env
+        cmd = "#{server.env} #{command}"
+      end
+      unless home
+        cmd = "cd #{server.path} && #{cmd}"
+      end
+      cmd = "ssh -tt #{ssh_key}#{"-p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} '#{cmd}'"
+      if server.gateway
+        uri = URI.parse("ssh://#{server.gateway}")
+        cmd = "ssh -tt #{" -p#{uri.port} " if uri.port}#{uri.user}@#{uri.host} \"#{cmd}\""
+      end
+      cmd
+    end
+  end
+end
+

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.65.0"
+  VERSION = "0.67.0"
 end
 

data/lib/bard.rb

@@ -7,6 +7,7 @@ require "bard/data"
 require "bard/github"
 require "bard/ping"
 require "bard/config"
+require "bard/remote_command"
 
 class Bard::CLI < Thor
   include Thor::Actions
@@ -213,6 +214,16 @@ class Bard::CLI < Thor
     exit 1 if down_urls.any?
   end
 
+  desc "command <command> --on=production", "run the given command on the remote server"
+  method_options %w[on] => :string
+  def command command
+    default_from = @config.servers.key?(:production) ? "production" : "staging"
+    on = options.fetch(:on, default_from)
+    server = @config.servers[on.to_sym]
+    remote_command = Bard::RemoteCommand.new(server, command).local_command
+    run_crucial remote_command, verbose: true
+  end
+
   desc "master_key --from=production --to=local", "copy master key from from to to"
   method_options %w[from] => :string, %w[to] => :string
   def master_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.65.0
+  version: 0.67.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -157,6 +157,7 @@ files:
 - lib/bard/git.rb
 - lib/bard/github.rb
 - lib/bard/ping.rb
+- lib/bard/remote_command.rb
 - lib/bard/version.rb
 - spec/bard/ci/github_actions_spec.rb
 - spec/bard_spec.rb