bard 0.64.1 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d061d17e01a9c194b56cbc5c86ed626e390048c939453f6af87a7b9a136f24
-  data.tar.gz: 89cbc27d550599e4a8c2eb5287969d19dafdb2176f37d0f65c606966d77542a8
+  metadata.gz: 1b9f7c09700f669c4d27c2d9dfa5661fc3b7eab6bb38f80fa09387af65dbfaa3
+  data.tar.gz: de2789065284a2506f3951f7d957b6e798d5af2ef03891540c3371ae9629e961
 SHA512:
-  metadata.gz: 468913ca2b377d72a317fa44c73a7602445f4a9479d260326be1044598feb727aa13a2d35bebd65d06120eb50ade5960e767ff292f664e602ad394f96a996130
-  data.tar.gz: d322765c29287237823708b6cb71887d8662445826e61d726c0acfd819526062ffec20a5e79a33f404f959969d8b45ecc9d70f21506f2f9312027c16eab85111
+  metadata.gz: 3fa281ed15c4befefce3ee6035ccab28831c8ea2e619b108187c5cb94eb6da29ba53a7df6c50bd4910df50a0bd029d1734daf58de666bff7920c64a93f6f5d38
+  data.tar.gz: c7988b2f2f7287a4b74e6b1fb3f5d37aacb91c94741276d252df465213641056edb1906964c17368792b96d5a10b143658949a176b81e3dd2d8bb6bc54bc5ee9

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
@@ -81,12 +81,10 @@ module Bard
       setting :ssh, :path, :ping, :gateway, :ssh_key, :env
 
       def ping(*args)
-        if args.length == 1
-          self.ping = args.first
-        elsif args.length == 0
-          normalize_ping(super())
+        if args.length == 0
+          (super() || [nil]).map(&method(:normalize_ping))
         else
-          raise ArgumentError
+          self.ping = args
         end
       end
 

data/lib/bard/data.rb

@@ -3,7 +3,7 @@ class Bard::CLI < Thor
     def call
       if to == "production"
         server = bard.instance_variable_get(:@config).servers[to.to_sym]
-        url = server.ping
+        url = server.ping.first
         puts bard.yellow("WARNING: You are about to push data to production, overwriting everything that is there!")
         answer = bard.ask("If you really want to do this, please type in the full HTTPS url of the production server:")
         if answer != url

data/lib/bard/ping.rb

@@ -8,9 +8,11 @@ module Bard
     end
 
     def call
-      return true if server.ping == false
-      response = get_response_with_redirect(server.ping)
-      response.is_a?(Net::HTTPSuccess)
+      server.ping.reject do |url|
+        next true if url == false
+        response = get_response_with_redirect(url) rescue nil
+        response.is_a?(Net::HTTPSuccess)
+      end
     end
 
     private

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.64.1"
+  VERSION = "0.66.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
@@ -138,7 +139,7 @@ class Bard::CLI < Thor
   def open server=nil
     server ||= @config.servers.key?(:production) ? :production : :staging
     server = @config.servers[server.to_sym]
-    exec "xdg-open #{server.default_ping}"
+    exec "xdg-open #{server.ping.first}"
   end
 
   desc "hurt", "reruns a command until it fails"
@@ -208,10 +209,19 @@ class Bard::CLI < Thor
   desc "ping [SERVER=production]", "hits the server over http to verify that its up."
   def ping server=:production
     server = @config.servers[server.to_sym]
-    unless Bard::Ping.call(server)
-      puts "#{server.key.to_s.capitalize} is down!"
-      exit 1
-    end
+    down_urls = Bard::Ping.call(server)
+    down_urls.each { |url| puts "#{url} is down!" }
+    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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.64.1
+  version: 0.66.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