bard 0.62.2 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0639401698f2f8efedc908dec19e665c0c7e067446fa6a8e3c38e877c072c0
-  data.tar.gz: '0510189b034d15caa908e1841f6223076a68ef429fa011dba4d6191e672d4bff'
+  metadata.gz: f618df3bbb634f25fcb5f03f81a68b733e2fd70d5a654b8e8f9e0733ce180849
+  data.tar.gz: 155060b90c13a3365bf3cd768642966bbc4926643b92d9f18378f69a9516df01
 SHA512:
-  metadata.gz: d99981c90eef79bf61b4fe0cda6b6ebae19baf426ec555e38209d9d60a7bebe67f83b8b991ab0ebbfec7df24d7fddf03eb1afe1085a18f63b71a2a43bff98e07
-  data.tar.gz: 9b97be4d649e3d168327eeb63aab76bb2cf7a713540709a020dde53d143bf536c90292428636e063b7822481f06bd61046ba66593a29a6001b796d476f26d17c
+  metadata.gz: f4e42669d831bdf57dc6749ca7443690a307d9abf048f1a1e0eecbfd33a7f53e0a94a4aa1bf78f3724054407f7e679f49fcac029cc1fa00199c7584e68c5301b
+  data.tar.gz: 7193a3c7324ee1da26262f18516f3a672299ccc29b1f1737eee7ad121c7cb992e7609fd271cc963b5f673285f9ec31f5c44074ae869f738264ba6ecd8b6749c8

data/lib/bard/base.rb

@@ -32,8 +32,8 @@ class Bard::CLI < Thor
     @project_name ||= File.expand_path(".").split("/").last
   end
 
-  def ssh_command server, command, home: false
-    server = @config.servers[server.to_sym]
+  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
@@ -46,8 +46,8 @@ class Bard::CLI < Thor
     command
   end
 
-  def copy direction, server, path, verbose: false
-    server = @config.servers[server.to_sym]
+  def copy direction, server_name, path, verbose: false
+    server = @config.servers.fetch(server_name.to_sym)
 
     uri = URI.parse("ssh://#{server.gateway}")
     port = uri.port ? "-p#{uri.port}" : ""
@@ -65,9 +65,9 @@ class Bard::CLI < Thor
     run_crucial command, verbose: verbose
   end
 
-  def move from, to, path, verbose: false
-    from = @config.servers[from.to_sym]
-    to = @config.servers[to.to_sym]
+  def move from_name, to_name, path, verbose: false
+    from = @config.servers.fecth(from_name.to_sym)
+    to = @config.servers.fetch(to_name.to_sym)
     raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
 
     from_uri = URI.parse("ssh://#{from.ssh}")
@@ -81,8 +81,8 @@ class Bard::CLI < Thor
     run_crucial command, verbose: verbose
   end
 
-  def rsync direction, server, path, verbose: false
-    server = @config.servers[server.to_sym]
+  def rsync direction, server_name, path, verbose: false
+    server = @config.servers.fetch(server_name.to_sym)
 
     uri = URI.parse("ssh://#{server.gateway}")
     port = uri.port ? "-p#{uri.port}" : ""
@@ -104,9 +104,9 @@ class Bard::CLI < Thor
     run_crucial command, verbose: verbose
   end
 
-  def rsync_remote from, to, path, verbose: false
-    from = @config.servers[from.to_sym]
-    to = @config.servers[to.to_sym]
+  def rsync_remote from_name, to_name, path, verbose: false
+    from = @config.servers.fetch(from_name.to_sym)
+    to = @config.servers.fetch(to_name.to_sym)
     raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
 
     dest_path = path.dup

data/lib/bard/ci/github_actions.rb

@@ -1,7 +1,6 @@
 require "thor"
 require "time"
-require "json"
-require "net/http"
+require "bard/github"
 
 class Bard::CLI < Thor
   class CI
@@ -53,31 +52,31 @@ class Bard::CLI < Thor
 
       class API < Struct.new(:project_name)
         def last_run
-          response = client.get("runs", event: "workflow_dispatch", per_page: 1)
+          response = client.get("actions/runs", event: "workflow_dispatch", per_page: 1)
           if json = response["workflow_runs"][0]
             Run.new(self, json)
           end
         end
 
         def last_successful_run
-          successful_runs = client.get("runs", event: "workflow_dispatch", status: "success", per_page: 1)
+          successful_runs = client.get("actions/runs", event: "workflow_dispatch", status: "success", per_page: 1)
           if json = successful_runs["workflow_runs"][0]
             Run.new(self, json)
           end
         end
 
         def find_run id
-          json = client.get("runs/#{id}")
+          json = client.get("actions/runs/#{id}")
           Run.new(self, json)
         end
 
         def create_run! branch
           start_time = Time.now
-          client.post("workflows/ci.yml/dispatches", ref: branch, inputs: { "git-ref": branch })
+          client.post("actions/workflows/ci.yml/dispatches", ref: branch, inputs: { "git-ref": branch })
           sha = `git rev-parse #{branch}`.chomp
 
           loop do
-            runs = client.get("runs", head_sha: sha, created: ">#{start_time.iso8601}")
+            runs = client.get("actions/runs", head_sha: sha, created: ">#{start_time.iso8601}")
             if json = runs["workflow_runs"].first
               return Run.new(self, json)
             end
@@ -86,19 +85,19 @@ class Bard::CLI < Thor
         end
 
         def find_job_by_run_id run_id
-          jobs = client.get("runs/#{run_id}/jobs", filter: "latest", per_page: 1)
+          jobs = client.get("actions/runs/#{run_id}/jobs", filter: "latest", per_page: 1)
           job_json = jobs["jobs"][0]
           Job.new(self, job_json)
         end
 
         def download_logs_by_job_id job_id
-          client.get("jobs/#{job_id}/logs")
+          client.get("actions/jobs/#{job_id}/logs")
         end
 
         private
 
         def client
-          @client ||= Client.new(project_name)
+          @client ||= Bard::Github.new(project_name)
         end
       end
 
@@ -171,62 +170,6 @@ class Bard::CLI < Thor
           @logs ||= api.download_logs_by_job_id(id)
         end
       end
-
-      class Client < Struct.new(:project_name)
-        def get path, params={}
-          request(path) do |uri|
-            uri.query = URI.encode_www_form(params)
-            Net::HTTP::Get.new(uri)
-          end
-        end
-
-        def post path, params={}
-          request(path) do |uri|
-            Net::HTTP::Post.new(uri).tap do |r|
-              r.body = JSON.dump(params)
-            end
-          end
-        end
-
-        private
-
-        def github_apikey
-          @github_apikey ||= begin
-            raw = `git ls-remote -t git@github.com:botandrose/bard`
-            raw[/github-apikey\|(.+)$/, 1]
-          end
-        end
-
-        def request path, &block
-          uri = if path =~ /^http/
-            URI(path)
-          else
-            URI("https://api.github.com/repos/botandrosedesign/#{project_name}/actions/#{path}")
-          end
-
-          req = nil
-          response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-            req = block.call(uri)
-            req["Accept"] = "application/vnd.github+json"
-            req["Authorization"] = "Bearer #{github_apikey}"
-            req["X-GitHub-Api-Version"] = "2022-11-28"
-            http.request(req)
-          end
-
-          case response
-          when Net::HTTPRedirection then
-            Net::HTTP.get(URI(response["Location"]))
-          when Net::HTTPSuccess then
-            if response["Content-Type"].to_s.include?("/json")
-              JSON.load(response.body)
-            else
-              response.body
-            end
-          else
-            raise [req.method, req.uri, req.to_hash, response].inspect
-          end
-        end
-      end
     end
   end
 end

data/lib/bard/config.rb

@@ -1,8 +1,8 @@
 require "uri"
 
-class Bard::CLI < Thor
+module Bard
   class Config
-    def initialize project_name, path
+    def initialize project_name, path: nil, source: nil
       @project_name = project_name
       @servers = {
         local: Server.new(
@@ -39,7 +39,10 @@ class Bard::CLI < Thor
           "www@#{project_name}.botandrose.com:22022",
         ),
       }
-      load_local_config! path
+      if path && File.exist?(path)
+        source = File.read(File.expand_path(path))
+      end
+      instance_eval source
     end
 
     attr_reader :servers
@@ -60,10 +63,6 @@ class Bard::CLI < Thor
 
     private
 
-    def load_local_config! path
-      instance_eval File.read(File.expand_path(path)) if File.exist?(path)
-    end
-
     class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env)
       def self.setting *fields
         fields.each do |field|

data/lib/bard/github.rb

@@ -0,0 +1,67 @@
+require "net/http"
+require "json"
+require "base64"
+
+module Bard
+  class Github < Struct.new(:project_name)
+    def get path, params={}
+      request(path) do |uri|
+        uri.query = URI.encode_www_form(params)
+        Net::HTTP::Get.new(uri)
+      end
+    end
+
+    def post path, params={}
+      request(path) do |uri|
+        Net::HTTP::Post.new(uri).tap do |r|
+          r.body = JSON.dump(params)
+        end
+      end
+    end
+
+    def read_file path, branch: "master"
+      metadata = get("contents/#{path}", ref: branch)
+      Base64.decode64(metadata["content"])
+    end
+
+    private
+
+    def github_apikey
+      @github_apikey ||= begin
+        raw = `git ls-remote -t git@github.com:botandrose/bard`
+        raw[/github-apikey\|(.+)$/, 1]
+      end
+    end
+
+    def request path, &block
+      uri = if path =~ /^http/
+        URI(path)
+      else
+        URI("https://api.github.com/repos/botandrosedesign/#{project_name}/#{path}")
+      end
+
+      req = nil
+      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        req = block.call(uri)
+        req["Accept"] = "application/vnd.github+json"
+        req["Authorization"] = "Bearer #{github_apikey}"
+        req["X-GitHub-Api-Version"] = "2022-11-28"
+        http.request(req)
+      end
+
+      case response
+      when Net::HTTPRedirection then
+        Net::HTTP.get(URI(response["Location"]))
+      when Net::HTTPSuccess then
+        if response["Content-Type"].to_s.include?("/json")
+          JSON.load(response.body)
+        else
+          response.body
+        end
+      else
+        raise [req.method, req.uri, req.to_hash, response].inspect
+      end
+    end
+  end
+end
+

data/lib/bard/ping.rb

@@ -0,0 +1,21 @@
+module Bard
+  class Ping < Struct.new(:server)
+    def self.call server
+      new(server).call
+    end
+
+    def call
+      return true if server.ping == false
+
+      url = server.default_ping
+      if server.ping =~ %r{^/}
+        url += server.ping
+      elsif server.ping.to_s.length > 0
+        url = server.ping
+      end
+
+      command = "curl -sfL #{url} 2>&1 1>/dev/null"
+      system command
+    end
+  end
+end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.62.2"
+  VERSION = "0.64.0"
 end
 

data/lib/bard.rb

@@ -4,7 +4,8 @@ require "bard/base"
 require "bard/git"
 require "bard/ci"
 require "bard/data"
-
+require "bard/github"
+require "bard/ping"
 require "bard/config"
 
 class Bard::CLI < Thor
@@ -12,7 +13,7 @@ class Bard::CLI < Thor
 
   def initialize(*args, **kwargs, &block)
     super
-    @config = Config.new(project_name, "bard.rb")
+    @config = Bard::Config.new(project_name, path: "bard.rb")
   end
 
   desc "data --from=production --to=local", "copy database and assets from from to to"
@@ -207,24 +208,18 @@ 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]
-    return false if server.ping == false
-
-    url = server.default_ping
-    if server.ping =~ %r{^/}
-      url += server.ping
-    elsif server.ping.to_s.length > 0
-      url = server.ping
-    end
-
-    command = "curl -sfL #{url} 2>&1 1>/dev/null"
-    unless system command
+    unless Bard::Ping.call(server)
       puts "#{server.key.to_s.capitalize} is down!"
       exit 1
     end
   end
 
-  desc "master_key [FROM=production, TO=local]", "copy master key from FROM to TO"
-  def master_key from="production", to="local"
+  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
+    default_from = @config.servers.key?(:production) ? "production" : "staging"
+    from = options.fetch(:from, default_from)
+    to = options.fetch(:to, "local")
     if to == "local"
       copy :from, from, "config/master.key"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.62.2
+  version: 0.64.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -155,6 +155,8 @@ files:
 - lib/bard/config.rb
 - lib/bard/data.rb
 - lib/bard/git.rb
+- lib/bard/github.rb
+- lib/bard/ping.rb
 - lib/bard/version.rb
 - spec/bard/ci/github_actions_spec.rb
 - spec/bard_spec.rb