bard 0.57.0 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185f8659f83ac6f3ddcc4922db94061b58a610d09d1da8bd92de1c30f3be1d3f
-  data.tar.gz: 2552ea154c16e106b64c2e7b4db26eb1a0dfb92e99d5e158a93cc818620de14b
+  metadata.gz: b89c9ca0ee7b64e04e0b04063bc8b24d8d46785f2bd445b8755971812a54607a
+  data.tar.gz: 0bb3e4a76f0220ae5116215a19ad3a68172eca16185cb4e7e43d431dc95e9984
 SHA512:
-  metadata.gz: d5db740a15a9b346f96ba6cdf1ba2e82841ef5c9f18fa07d7068a47de6d7b7490cb93388622af030e70471905d0ed58c100b73e9c1105ea17754233cbdfec573
-  data.tar.gz: a82d8134445429bf9562c47ec4921a52dc32f81082ef82529d5fd97b1ffa2610f317569496ed577525639720f647194f46c87d1f88ac695242e557313ef3d327
+  metadata.gz: fd28186f63c5e0e3e0a77c94d2756c622477f164e0fae220642e5ebd03ca3aa4d04858ee3ec1fb1efb9eb2ed189a93314c89b8d1d44310d249bb6d1064cdc0ad
+  data.tar.gz: b3b71f60070f6cdefa1c7d733188130f2a6e2f4c6ea236878d17e064a35dc9558ba05ca889b4a761fa311538736f3fcfb2276c5a4d5a1872a66772cdfe2b661c

data/lib/bard/base.rb

@@ -65,6 +65,22 @@ 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]
+    raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
+
+    from_uri = URI.parse("ssh://#{from.ssh}")
+    from_str = "scp://#{from_uri.user}@#{from_uri.host}:#{from_uri.port || 22}/#{from.path}/#{path}"
+
+    to_uri = URI.parse("ssh://#{to.ssh}")
+    to_str = "scp://#{to_uri.user}@#{to_uri.host}:#{to_uri.port || 22}/#{to.path}/#{path}"
+
+    command = "scp -o ForwardAgent=yes #{from_str} #{to_str}"
+
+    run_crucial command, verbose: verbose
+  end
+
   def rsync direction, server, path, verbose: false
     server = @config.servers[server.to_sym]
 
@@ -87,5 +103,25 @@ 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]
+    raise NotImplementedError if from.gateway || to.gateway || from.ssh_key || to.ssh_key
+
+    dest_path = path.dup
+    dest_path = "./#{dest_path}"
+
+    from_uri = URI.parse("ssh://#{from.ssh}")
+    from_str = "-p#{from_uri.port || 22} #{from_uri.user}@#{from_uri.host}"
+
+    to_uri = URI.parse("ssh://#{to.ssh}")
+    to_str = "#{to_uri.user}@#{to_uri.host}:#{to.path}/#{path}"
+    to_str.sub! %r(/[^/]+$), '/'
+
+    command = %(ssh -A #{from_str} 'rsync -e \"ssh -A -p#{to_uri.port || 22} -o StrictHostKeyChecking=no\" --delete --info=progress2 -az #{from.path}/#{path} #{to_str}')
+
+    run_crucial command, verbose: verbose
+  end
 end
 

data/lib/bard/config.rb

@@ -83,7 +83,13 @@ class Bard::CLI < Thor
 
       def default_ping
         uri = URI.parse("ssh://#{ssh}")
-        "http://#{uri.host}"
+        "https://#{uri.host}"
+      end
+
+      def normalized_ping
+        normalized = ping || default_ping
+        normalized = "https://#{normalized}" unless normalized =~ /^http/
+        normalized
       end
 
       def path(*args)

data/lib/bard/data.rb

@@ -1,13 +1,26 @@
 class Bard::CLI < Thor
   class Data < Struct.new(:bard, :from, :to)
     def call
+      if to == "production"
+        server = bard.instance_variable_get(:@config).servers[to.to_sym]
+        url = server.normalized_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
+          puts bard.red("!!! ") + "Failed! We expected #{url}. Is this really where you want to overwrite all the data?"
+          exit 1
+        end
+      end
+
       if to == "local"
         data_pull_db from.to_sym
         data_pull_assets from.to_sym
-      end
-      if from == "local"
+      elsif from == "local"
         data_push_db to.to_sym
         data_push_assets to.to_sym
+      else
+        data_move_db from.to_sym, to.to_sym
+        data_move_assets from.to_sym, to.to_sym
       end
     end
 
@@ -39,6 +52,19 @@ class Bard::CLI < Thor
       end
     end
 
+    def data_move_db from, to
+      bard.instance_eval do
+        puts "Dumping local database to file..."
+        run_crucial ssh_command(from, "bin/rake db:load")
+
+        puts "Uploading file..."
+        move from, to, "db/data.sql.gz", verbose: true
+
+        puts "Loading file into remote database..."
+        run_crucial ssh_command(to, "bin/rake db:load")
+      end
+    end
+
     def data_pull_assets server
       bard.instance_eval do
         @config.data.each do |path|
@@ -56,6 +82,15 @@ class Bard::CLI < Thor
         end
       end
     end
+
+    def data_move_assets from, to
+      bard.instance_eval do
+        @config.data.each do |path|
+          puts "Copying files..."
+          rsync_remote from, to, path, verbose: true
+        end
+      end
+    end
   end
 end
 

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.57.0"
+  VERSION = "0.59.0"
 end
 

data/lib/bard.rb

@@ -13,9 +13,12 @@ class Bard::CLI < Thor
     @config = Config.new(project_name, "bard.rb")
   end
 
-  desc "data [FROM=production, TO=local]", "copy database and assets from FROM to TO"
-  def data(from=nil, to="local")
-    from ||= @config.servers.key?(:production) ? "production" : "staging"
+  desc "data --from=production --to=local", "copy database and assets from from to to"
+  method_options %w[from] => :string, %w[to] => :string
+  def data
+    default_from = @config.servers.key?(:production) ? "production" : "staging"
+    from = options.fetch(:from, default_from)
+    to = options.fetch(:to, "local")
     Data.new(self, from, to).call
   end
 

metadata

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