bard 0.63.0 → 0.64.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d7d5a0ea2e8612375c2cdff91db9018db99cbebd5c7b261eac8bd8cd759c56d
-  data.tar.gz: b92bf6109d27d6266ea4d5c600814fcc27c0cede6620a7cac3d2a1f829dc9604
+  metadata.gz: c9d061d17e01a9c194b56cbc5c86ed626e390048c939453f6af87a7b9a136f24
+  data.tar.gz: 89cbc27d550599e4a8c2eb5287969d19dafdb2176f37d0f65c606966d77542a8
 SHA512:
-  metadata.gz: 78f9952dad75d7cd3b2bc3320b94101e184173edc10fab5c8d12a7c8ed1e87db17852715879fc18d446a1fa077ac9fae34b85c13ddce626ffd54bd87cc013476
-  data.tar.gz: 639bb68fe3c42d18d9c5709f4fae18707578496423c4982b37c97e00e981458a7dc3eee4bf7eae596c99c18efd39f0bee714c0fb47d2d721fad1b5acb0b7caa5
+  metadata.gz: 468913ca2b377d72a317fa44c73a7602445f4a9479d260326be1044598feb727aa13a2d35bebd65d06120eb50ade5960e767ff292f664e602ad394f96a996130
+  data.tar.gz: d322765c29287237823708b6cb71887d8662445826e61d726c0acfd819526062ffec20a5e79a33f404f959969d8b45ecc9d70f21506f2f9312027c16eab85111

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|
@@ -81,14 +80,28 @@ class Bard::CLI < Thor
 
       setting :ssh, :path, :ping, :gateway, :ssh_key, :env
 
-      def default_ping
-        uri = URI.parse("ssh://#{ssh}")
-        "https://#{uri.host}"
+      def ping(*args)
+        if args.length == 1
+          self.ping = args.first
+        elsif args.length == 0
+          normalize_ping(super())
+        else
+          raise ArgumentError
+        end
       end
 
-      def normalized_ping
-        normalized = ping || default_ping
-        normalized = "https://#{normalized}" unless normalized =~ /^http/
+      private def normalize_ping value
+        return value if value == false
+        uri = URI.parse("ssh://#{ssh}")
+        normalized = "https://#{uri.host}" # default if none specified
+        if value =~ %r{^/}
+          normalized += value
+        elsif value.to_s.length > 0
+          normalized = value
+        end
+        if normalized !~ /^http/
+          normalized = "https://#{normalized}"
+        end
         normalized
       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.normalized_ping
+        url = server.ping
         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/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,34 @@
+require "net/http"
+require "uri"
+
+module Bard
+  class Ping < Struct.new(:server)
+    def self.call server
+      new(server).call
+    end
+
+    def call
+      return true if server.ping == false
+      response = get_response_with_redirect(server.ping)
+      response.is_a?(Net::HTTPSuccess)
+    end
+
+    private
+
+    def get_response_with_redirect uri_str, limit=5
+      response = Net::HTTP.get_response(URI(uri_str))
+
+      case response
+      when Net::HTTPRedirection
+        if limit == 0
+          puts "too many HTTP redirects"
+          response
+        else
+          get_response_with_redirect(response["location"], limit - 1)
+        end
+      else
+        response
+      end
+    end
+  end
+end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.63.0"
+  VERSION = "0.64.1"
 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,17 +208,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.64.1
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-12 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