bard 1.0.0 → 1.0.2

data/lib/bard/provision.rb

@@ -3,16 +3,10 @@ module Bard
     def self.call(...) = new(...).call
 
     def call
-      SSH.call(*values)
-      User.call(*values)
-      MySQL.call(*values)
-      Repo.call(*values)
-      MasterKey.call(*values)
-      RVM.call(*values)
-      App.call(*values)
-      Passenger.call(*values)
-      Data.call(*values)
-      HTTP.call(*values)
+      %w[SSH User Apt MySQL Repo MasterKey RVM App Passenger Data HTTP].each do |step|
+        require "bard/provision/#{step.downcase}"
+        self.class.const_get(step).call(*values)
+      end
     end
 
     private
@@ -27,14 +21,3 @@ module Bard
   end
 end
 
-require "bard/provision/ssh"
-require "bard/provision/user"
-require "bard/provision/mysql"
-require "bard/provision/passenger"
-require "bard/provision/repo"
-require "bard/provision/master_key"
-require "bard/provision/rvm"
-require "bard/provision/app"
-require "bard/provision/data"
-require "bard/provision/http"
-

data/lib/bard/server.rb

@@ -3,7 +3,13 @@ require "bard/command"
 require "bard/copy"
 
 module Bard
-  class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env, :provision)
+  class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env)
+    def self.define project_name, key, &block
+      new(project_name, key).tap do |server|
+        server.instance_eval &block
+      end
+    end
+
     def self.setting *fields
       fields.each do |field|
         define_method field do |*args|
@@ -18,20 +24,19 @@ module Bard
       end
     end
 
-    setting :ssh, :path, :ping, :gateway, :ssh_key, :env, :provision
+    setting :ssh, :path, :ping, :gateway, :ssh_key, :env
 
     def ping(*args)
       if args.length == 0
-        (super() || [nil]).map(&method(:normalize_ping))
+        (super() || [nil]).map(&method(:normalize_ping)).flatten
       else
         self.ping = args
       end
     end
 
     private def normalize_ping value
-      return value if value == false
-      uri = URI.parse("ssh://#{ssh}")
-      normalized = "https://#{uri.host}" # default if none specified
+      return [] if value == false
+      normalized = "https://#{ssh_uri.host}" # default if none specified
       if value =~ %r{^/}
         normalized += value
       elsif value.to_s.length > 0
@@ -55,7 +60,24 @@ module Bard
 
     def ssh_uri which=:ssh
       value = send(which)
-      URI.parse("ssh://#{value}")
+      URI("ssh://#{value}")
+    end
+
+    def scp_uri file_path=nil
+      ssh_uri.dup.tap do |uri|
+        uri.scheme = "scp"
+        uri.path = "/#{path}"
+        uri.path += "/#{file_path}" if file_path
+      end
+    end
+
+    def rsync_uri file_path=nil
+      ssh_uri.dup.tap do |uri|
+        uri.scheme = nil
+        uri.port = nil
+        uri.path = ":#{path}"
+        uri.path += "/#{file_path}" if file_path
+      end.to_s[2..]
     end
 
     def with(attrs)

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end
 

data/spec/bard/ci_spec.rb

@@ -0,0 +1,10 @@
+require "bard/ci"
+
+describe Bard::CI do
+  subject { described_class.new("tracker", "master") }
+
+  describe "#exists?"
+  describe "#status"
+  describe "#console"
+  describe "#run"
+end

data/spec/bard/config_spec.rb

@@ -0,0 +1,83 @@
+require "bard/config"
+
+describe Bard::Config do
+  context "empty" do
+    subject { described_class.new("tracker") }
+
+    describe "#project_name" do
+      it "returns the project_name setting" do
+        expect(subject.project_name).to eq "tracker"
+      end
+    end
+
+    describe "#servers" do
+      it "is prefilled with many servers" do
+        expect(subject.servers.keys).to eq %i[local gubs ci staging]
+      end
+    end
+
+    describe "#[]" do
+      it "promotes staging to production when production doesn't exist" do
+        expect(subject[:production]).to eq subject[:staging]
+      end
+    end
+
+    describe "#data" do
+      it "return an empty array" do
+        expect(subject.data).to eq []
+      end
+    end
+
+    describe "#backup" do
+      it "returns true" do
+        expect(subject.backup).to eq true
+      end
+    end
+  end
+
+  context "with production definition" do
+    subject { described_class.new("tracker", source: <<~SOURCE) }
+      server :production do
+        ssh "www@ssh.botandrose.com:22022"
+        ping "tracker.botandrose.com"
+      end
+
+      data "public/system", "public/ckeditor"
+      backup false
+    SOURCE
+
+    describe "#project_name" do
+      it "returns the project_name setting" do
+        expect(subject.project_name).to eq "tracker"
+      end
+    end
+
+    describe "#servers" do
+      it "contains the defined server" do
+        expect(subject.servers.keys).to eq %i[local gubs ci staging production]
+      end
+    end
+
+    describe "#server" do
+      it "can overwrite existing definition" do
+        subject.server :staging do
+          ssh "www@tracker-staging.botandrose.com:22022"
+        end
+        expect(subject[:staging].ssh).to eq "www@tracker-staging.botandrose.com:22022"
+      end
+    end
+
+    describe "#data" do
+      it "returns the data setting" do
+        expect(subject.data).to eq ["public/system", "public/ckeditor"]
+      end
+    end
+
+    describe "#backup" do
+      it "returns the backup setting" do
+        expect(subject.backup).to eq false
+      end
+    end
+  end
+end
+

data/spec/bard/server_spec.rb

@@ -0,0 +1,127 @@
+require "bard/server"
+
+describe Bard::Server do
+  subject do
+    described_class.define("tracker", :production) do
+      ssh "www@tracker.botandrose.com:22022"
+      path "work/tracker"
+      ping "tracker.botandrose.com", "www.tracker.botandrose.com"
+      gateway "www@staging.botandrose.com:22022"
+      ssh_key "~/.ssh/id_rsa.pub"
+      env "RAILS_ENV=production"
+    end
+  end
+
+  describe "#ssh" do
+    it "returns the ssh setting" do
+      expect(subject.ssh).to eq "www@tracker.botandrose.com:22022"
+    end
+  end
+
+  describe "#ssh_uri" do
+    it "exposes the host" do
+      expect(subject.ssh_uri.host).to eq "tracker.botandrose.com"
+    end
+
+    it "exposes the user" do
+      expect(subject.ssh_uri.user).to eq "www"
+    end
+
+    it "exposes the port" do
+      expect(subject.ssh_uri.port).to eq 22022
+    end
+
+    it "has no path" do
+      expect(subject.ssh_uri.path).to be_empty
+    end
+
+    it "can specify another field to read from" do
+      expect(subject.ssh_uri(:gateway).host).to eq "staging.botandrose.com"
+    end
+
+    it "has no path" do
+      expect(subject.ssh_uri.path).to be_empty
+    end
+  end
+
+  describe "#scp_uri" do
+    it "exposes the host" do
+      expect(subject.scp_uri.host).to eq "tracker.botandrose.com"
+    end
+
+    it "exposes the user" do
+      expect(subject.scp_uri.user).to eq "www"
+    end
+
+    it "exposes the port" do
+      expect(subject.scp_uri.port).to eq 22022
+    end
+
+    it "includes the path to the project" do
+      expect(subject.scp_uri.path).to eq "/work/tracker"
+    end
+
+    it "compiles to an scp:// string" do
+      expect(subject.scp_uri.to_s).to eq "scp://www@tracker.botandrose.com:22022/work/tracker"
+    end
+  end
+
+  describe "#rsync_uri" do
+    it "works" do
+      expect(subject.rsync_uri("public/assets")).to eq "www@tracker.botandrose.com:work/tracker/public/assets"
+    end
+  end
+
+  describe "#path" do
+    it "returns the path setting" do
+      expect(subject.path).to eq "work/tracker"
+    end
+
+    it "defaults to the project name" do
+      subject.path nil
+      expect(subject.path).to eq "tracker"
+    end
+  end
+
+  describe "#ping" do
+    it "returns the ping urls, normalized" do
+      expect(subject.ping).to eq [
+        "https://tracker.botandrose.com",
+        "https://www.tracker.botandrose.com",
+      ]
+    end
+
+    it "accepts paths" do
+      subject.ping "/ping"
+      expect(subject.ping).to eq ["https://tracker.botandrose.com/ping"]
+    end
+
+    it "defaults to the ssh value" do
+      subject.ping nil
+      expect(subject.ping).to eq ["https://tracker.botandrose.com"]
+    end
+
+    it "accepts false to disable pings" do
+      subject.ping false
+      expect(subject.ping).to eq []
+    end
+  end
+
+  describe "#gateway" do
+    it "returns the gateway setting" do
+      expect(subject.gateway).to eq "www@staging.botandrose.com:22022"
+    end
+  end
+
+  describe "#ssh_key" do
+    it "returns the ssh_key setting" do
+      expect(subject.ssh_key).to eq "~/.ssh/id_rsa.pub"
+    end
+  end
+
+  describe "#env" do
+    it "returns the env setting" do
+      expect(subject.env).to eq "RAILS_ENV=production"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -138,6 +138,20 @@ files:
 - lib/bard/ci/jenkins.rb
 - lib/bard/ci/local.rb
 - lib/bard/cli.rb
+- lib/bard/cli/ci.rb
+- lib/bard/cli/data.rb
+- lib/bard/cli/deploy.rb
+- lib/bard/cli/hurt.rb
+- lib/bard/cli/install.rb
+- lib/bard/cli/master_key.rb
+- lib/bard/cli/open.rb
+- lib/bard/cli/ping.rb
+- lib/bard/cli/provision.rb
+- lib/bard/cli/run.rb
+- lib/bard/cli/setup.rb
+- lib/bard/cli/ssh.rb
+- lib/bard/cli/stage.rb
+- lib/bard/cli/vim.rb
 - lib/bard/command.rb
 - lib/bard/config.rb
 - lib/bard/copy.rb
@@ -146,9 +160,10 @@ files:
 - lib/bard/ping.rb
 - lib/bard/provision.rb
 - lib/bard/provision/app.rb
+- lib/bard/provision/apt.rb
 - lib/bard/provision/data.rb
 - lib/bard/provision/http.rb
-- lib/bard/provision/master_key.rb
+- lib/bard/provision/masterkey.rb
 - lib/bard/provision/mysql.rb
 - lib/bard/provision/passenger.rb
 - lib/bard/provision/repo.rb
@@ -158,6 +173,9 @@ files:
 - lib/bard/server.rb
 - lib/bard/version.rb
 - spec/bard/ci/github_actions_spec.rb
+- spec/bard/ci_spec.rb
+- spec/bard/config_spec.rb
+- spec/bard/server_spec.rb
 - spec/bard_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/job.json
@@ -199,6 +217,9 @@ test_files:
 - features/support/grit_ext.rb
 - features/support/io.rb
 - spec/bard/ci/github_actions_spec.rb
+- spec/bard/ci_spec.rb
+- spec/bard/config_spec.rb
+- spec/bard/server_spec.rb
 - spec/bard_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/job.json