litestream 0.6.0-arm64-darwin → 0.7.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b81241fd9899e8f5754d918117c11a7e0ca7c608885beb2e02050d33982816
-  data.tar.gz: 5e8e54ab1295285b5feec0c5da6d411cddd16193db58ef9af70d7c9cb8c907c8
+  metadata.gz: 967c31a26666bcd7193ede513157881e3fc1f66d2ea0a6efaf7b447d38b58f4f
+  data.tar.gz: 43bc78c25f357d6c0ee553a5f5f883b019e9ad7e7fbfb7f5ce094a1e50572ab4
 SHA512:
-  metadata.gz: 89894bc3bdd5e88a86bd005eb13dc1b2dcd6b5322b6b20d2e38e7f0daa156050261df64fdacd1164eadc3ca552be52314bd3633320811f503429b529e0e78df6
-  data.tar.gz: e6db3d75cb2abd4ae490bb09c436493cf97656722d071187c6549f35ba72a5d5406b506d349ddc78222213dc3ae61c2747cf3033caa2681a3f6dc3960a8bab28
+  metadata.gz: 1db86a3b28f14a1c0a5151fd69875dcdbbb93ef65a4709e113105775754864f2a4f6d5c64c5eddfdef55bfa01fecbb307ecec4d3cc59f2ccab563ef8d403d2c5
+  data.tar.gz: b2fb5ca27c1c9f4348baba9322d638544dc323fe55243d289a1397b00916ecfab6a424205d60a99b862dbc8745b90c0871205e9879dc9c7d225a5392b09d688e

data/lib/litestream/commands.rb

@@ -17,8 +17,8 @@ module Litestream
     # raised when a litestream command requires a database argument but it isn't provided
     DatabaseRequiredException = Class.new(StandardError)
 
-    # raised when litestream fails to restore a database backup
-    BackupFailedException = Class.new(StandardError)
+    # raised when a litestream command fails
+    CommandFailedException = Class.new(StandardError)
 
     class << self
       def platform
@@ -77,16 +77,14 @@ module Litestream
       end
 
       def replicate(async: false, **argv)
-        execute("replicate", argv, async: async, hashify: false)
+        execute("replicate", argv, async: async, tabled_output: false)
       end
 
       def restore(database, async: false, **argv)
         raise DatabaseRequiredException, "database argument is required for restore command, e.g. litestream:restore -- --database=path/to/database.sqlite" if database.nil?
         argv.stringify_keys!
 
-        execute("restore", argv, database, async: async, hashify: false)
-
-        argv["-o"] || database
+        execute("restore", argv, database, async: async, tabled_output: false)
       end
 
       def verify(database, async: false, **argv)
@@ -101,10 +99,7 @@ module Litestream
         args = {
           "-o" => backup
         }.merge(argv)
-
-        backup = restore(database, async: false, **args)
-
-        raise BackupFailedException, "Failed to create backup for validation" unless File.exist?(backup)
+        restore(database, async: false, **args)
 
         restored_tables_count = `sqlite3 #{backup} "select count(*) from sqlite_schema where type='table';"`.chomp.to_i
         restored_size = File.size(backup)
@@ -120,26 +115,32 @@ module Litestream
       end
 
       def databases(async: false, **argv)
-        execute("databases", argv, async: async, hashify: true)
+        execute("databases", argv, async: async, tabled_output: true)
       end
 
       def generations(database, async: false, **argv)
         raise DatabaseRequiredException, "database argument is required for generations command, e.g. litestream:generations -- --database=path/to/database.sqlite" if database.nil?
 
-        execute("generations", argv, database, async: async, hashify: true)
+        execute("generations", argv, database, async: async, tabled_output: true)
       end
 
       def snapshots(database, async: false, **argv)
         raise DatabaseRequiredException, "database argument is required for snapshots command, e.g. litestream:snapshots -- --database=path/to/database.sqlite" if database.nil?
 
-        execute("snapshots", argv, database, async: async, hashify: true)
+        execute("snapshots", argv, database, async: async, tabled_output: true)
       end
 
       private
 
-      def execute(command, argv = {}, database = nil, async: false, hashify: false)
+      def execute(command, argv = {}, database = nil, async: false, tabled_output: false)
         cmd = prepare(command, argv, database)
-        run(cmd, async: async, hashify: hashify)
+        results = run(cmd, async: async, tabled_output: tabled_output)
+
+        if Array === results && results.one? && results[0]["level"] == "ERROR"
+          raise CommandFailedException, "Failed to execute `#{cmd.join(" ")}`; Reason: #{results[0]["error"]}"
+        else
+          results
+        end
       end
 
       def prepare(command, argv = {}, database = nil)
@@ -158,14 +159,14 @@ module Litestream
         cmd
       end
 
-      def run(cmd, async: false, hashify: false)
+      def run(cmd, async: false, tabled_output: false)
         if async
           # To release the resources of the Ruby process, just fork and exit.
           # The forked process executes litestream and replaces itself.
           exec(*cmd) if fork.nil?
         else
-          out = `#{cmd.join(" ")}`
-          text_table_to_hashes(out) if hashify
+          stdout = `#{cmd.join(" ")}`.champ
+          tabled_output ? text_table_to_hashes(stdout) : stdout.split("\n").map { Logfmt.parse(_1) }
         end
       end
 

data/lib/litestream/version.rb

@@ -1,3 +1,3 @@
 module Litestream
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: litestream
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: arm64-darwin
 authors:
 - Stephen Margheim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logfmt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement