bard 0.53.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c4861dcea4b2723d99684bcb37a13326bf779615c86c0d09acb772f5b5cd51
-  data.tar.gz: 3d194df21abfc837309af140377c4a136b41e9014c943373cdbd1e087072cc57
+  metadata.gz: f7b5104dd7439dfc79a1c608bebc1481c9a1d1ced133a637b94593acb944a6a0
+  data.tar.gz: 85d8e12e5957a3a16a74ff6cf400b3ccf4a58f6ad15171d656ef18a0dddf1967
 SHA512:
-  metadata.gz: 2e3232ea8eef55fa1066dcdaa8ce594ed09f40cbc167262b24d34d98a54c99772e312b95a353eca9ff4ccd353a3ff9205926fd9f8caca0e7fbccf84cd1da4521
-  data.tar.gz: 1fd179d767a62d2a4fe756647d097f295a6101ceb380771eaf5dbb926eac23735e0a83bf3ff257b4a5ccf918779a5f315b012b8bb245e1f45fa162fd02a0f13b
+  metadata.gz: 656e71d268890def82ef43283375d91e4b1f88fa4007c58b7f855be64946210ae32d4db518faafc9301e0c7baf17b763f90d6866f3df06f3c5e51813ca3c4cee
+  data.tar.gz: be4a640a1eb96fe264cf25d7b1c22c11766e3a4647580c8d7d4a19f06fe5afd3b34e9882f11636b3fe0c37e1ae2ae44bfbb923d6d5051ef9cf637fda5b5aacec

data/install_files/.github/workflows/ci.yml

@@ -1,5 +1,6 @@
 name: ci
 on:
+  pull_request:
   workflow_dispatch:
     inputs:
       git-ref:

data/lib/bard/base.rb

@@ -8,18 +8,24 @@ class Bard::CLI < Thor
 
   private
 
-  def run_crucial(command, verbose = false)
-    stdout, stderr, status = Open3.capture3(command)
-    failed = status.to_i.nonzero?
-    if verbose || failed
-      $stdout.puts stdout
-      $stderr.puts stderr
+  def run_crucial command, verbose: false
+    failed = false
+
+    if verbose
+      failed = !(system command)
+    else
+      stdout, stderr, status = Open3.capture3(command)
+      failed = status.to_i.nonzero?
+      if failed
+        $stdout.puts stdout
+        $stderr.puts stderr
+      end
     end
+
     if failed
       puts red("!!! ") + "Running command failed: #{yellow(command)}"
       exit 1
     end
-    stdout.chomp
   end
 
   def project_name
@@ -40,7 +46,7 @@ class Bard::CLI < Thor
     command
   end
 
-  def copy direction, server, path
+  def copy direction, server, path, verbose: false
     server = @config.servers[server.to_sym]
 
     uri = URI.parse("ssh://#{server.gateway}")
@@ -56,10 +62,10 @@ class Bard::CLI < Thor
     from_and_to.reverse! if direction == :from
     command = "scp #{gateway} #{ssh_key} #{port} #{from_and_to.join(" ")}"
 
-    run_crucial command
+    run_crucial command, verbose: verbose
   end
 
-  def rsync direction, server, path
+  def rsync direction, server, path, verbose: false
     server = @config.servers[server.to_sym]
 
     uri = URI.parse("ssh://#{server.gateway}")
@@ -77,9 +83,9 @@ class Bard::CLI < Thor
     from_and_to.reverse! if direction == :from
     from_and_to[-1].sub! %r(/[^/]+$), '/'
 
-    command = "rsync #{ssh} --delete -avz #{from_and_to.join(" ")}"
+    command = "rsync #{ssh} --delete --info=progress2 -az #{from_and_to.join(" ")}"
 
-    run_crucial command
+    run_crucial command, verbose: verbose
   end
 end
 

data/lib/bard/data.rb

@@ -15,16 +15,26 @@ class Bard::CLI < Thor
 
     def data_pull_db server
       bard.instance_eval do
+        puts "Dumping remote database to file..."
         run_crucial ssh_command(server, "bin/rake db:dump")
-        copy :from, server, "db/data.sql.gz"
+
+        puts "Downloading file..."
+        copy :from, server, "db/data.sql.gz", verbose: true
+
+        puts "Loading file into local database..."
         run_crucial "bin/rake db:load"
       end
     end
 
     def data_push_db server
       bard.instance_eval do
+        puts "Dumping local database to file..."
         run_crucial "bin/rake db:dump"
-        copy :to, server, "db/data.sql.gz"
+
+        puts "Uploading file..."
+        copy :to, server, "db/data.sql.gz", verbose: true
+
+        puts "Loading file into remote database..."
         run_crucial ssh_command(server, "bin/rake db:load")
       end
     end
@@ -32,7 +42,8 @@ class Bard::CLI < Thor
     def data_pull_assets server
       bard.instance_eval do
         @config.data.each do |path|
-          rsync :from, server, path
+          puts "Downloading files..."
+          rsync :from, server, path, verbose: true
         end
       end
     end
@@ -40,7 +51,8 @@ class Bard::CLI < Thor
     def data_push_assets server
       bard.instance_eval do
         @config.data.each do |path|
-          rsync :to, server, path
+          puts "Uploading files..."
+          rsync :to, server, path, verbose: true
         end
       end
     end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.53.0"
+  VERSION = "0.55.0"
 end
 

data/lib/bard.rb

@@ -26,7 +26,7 @@ class Bard::CLI < Thor
       raise Thor::Error.new("`bard stage` is disabled until a production server is defined. Until then, please use `bard deploy` to deploy to the staging server.")
     end
 
-    run_crucial "git push -u origin #{branch}", true
+    run_crucial "git push -u origin #{branch}", verbose: true
     command = "git fetch && git checkout -f origin/#{branch} && bin/setup"
     run_crucial ssh_command(:staging, command)
     puts green("Stage Succeeded")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.55.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor