litestream 0.6.0-x86_64-darwin → 0.7.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1eb2bab212bb5bc65bace83d1b9d529e5a12bdbd239c4f7682e6e7cb25f469
-  data.tar.gz: 2ef146420dede9306f234aa4e5ceba9dfbf54a3dc4bf4d3da8105b5e1efc02fd
+  metadata.gz: 75f39eb6b172e110a094a82699b67806eb4305fbc1701547cab58a27c83e4ea3
+  data.tar.gz: 7cb76b03b3224081ead9a508a504f2ec8fc2fcc107b54a4e7b15627bdde7bf28
 SHA512:
-  metadata.gz: 658408fabff862b286b2deabdc8d70168d4f271c5a61f18b0c452f5cd689dd9875607f938ed624c4870eff76058be0ec5b5dfe7194b8c89fc3f9515479cb76cd
-  data.tar.gz: 7dead1f3dbee576dbe99675584e38ef2623270fa5e3465d8aef808165a114aced962e776d84b3d5580b3b3765820d7fecd7fa8666914d2cee76ebd9ec92680e7
+  metadata.gz: 7c6852efcd97ba1216a0c2da06d2d74dcd9da3af0fa24a3f050aa8191aa50759d17694dc740da58758a80f49701d89977100a5096d1ada9499c7b33e187eaf93
+  data.tar.gz: 21eabb4cf37cbfb18991c0b15df85cf004a803539a62357e689d0f466ec152e5ff8dfe0a247aab4b8b80883c9a07a2a5d9530cf9c28a61ca8289f1b0be5e8bb0

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: x86_64-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