bard 0.52.2 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b81579bf6b2d38156c3271b824ae9e40cea6353ff6832075e35e2978ec6b1ea5
-  data.tar.gz: 623b7ccecb228a7e13cd7af255a5f43a60cbad2ace2b6017cc9f985a58cc6ffa
+  metadata.gz: c363121d882f1187b0b2b6ab383f58915953049292ac8a9487165c37f81fc8c7
+  data.tar.gz: 4139f89737660638d08615ba092691a7080dc85e3371a6a578a7f6de7af8e50f
 SHA512:
-  metadata.gz: b905fd71ca0fa031b83a9a39f55a41628e9a19f5c7a3d52b19982fa079145b7e78ae7d49b0b49ad8854e23762fdc43c1366543897f7794e2c212d013919acc34
-  data.tar.gz: a36d8116aa16cdcec6312fbdbccd5446520908b4c94c7354b08d8e32b4758f1199590236ef3f23ef6dce13cd20124ccac030294dabecae1a1068fd8a70428368
+  metadata.gz: abca4f0b039b4f4ce92de897d106ff5a9f0db4281e61e0744947b64a2c636594b0b571a1b52764fa90b9a8e3b3a4353d0d9de9c392fb5ad1f762d8409626fc00
+  data.tar.gz: 8cca8f6920e8dfea3828270de1baf944604be203997f46c9f25c5f98123735f57526e02d51b0bedf4719247958292706d36c6a7326a6c366e81e555a00cc72d7

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/ci/local.rb

@@ -33,7 +33,7 @@ class Bard::CLI < Thor
       private
 
       def start
-        @stdin, @stdout_and_stderr, @wait_thread = Open3.popen2e("bin/rake ci")
+        @stdin, @stdout_and_stderr, @wait_thread = Open3.popen2e("CLEAN=true bin/rake ci")
       end
 
       def building?

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.52.2"
+  VERSION = "0.54.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.52.2
+  version: 0.54.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor