litestream 0.5.5-arm64-darwin → 0.7.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a5c5ae7fdeb51f926aa3d7e75310dac1f3b8cc9d4fb462d37cbb0135e1ad05
-  data.tar.gz: e12caf009c5915e769b185638d4b3dae3a52ea7922711512f1203b984b1424fb
+  metadata.gz: 967c31a26666bcd7193ede513157881e3fc1f66d2ea0a6efaf7b447d38b58f4f
+  data.tar.gz: 43bc78c25f357d6c0ee553a5f5f883b019e9ad7e7fbfb7f5ce094a1e50572ab4
 SHA512:
-  metadata.gz: d415cd48549eb62928c83fcfbb845fc4ef248fd5f23b2ed98afed2b0a84bfa61a8a3766146c4965b6188a06d197242c45dac370644a466927c961113a36b680d
-  data.tar.gz: 8f02d3d01c8cc5e703238dc2c8c8ba7a881b42daae13da13f540a21961ce0ecc45756981ee9739b8f12e2313bccc92559c6d5de31f9a3e84719fb52e54b80948
+  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,33 +77,29 @@ 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, tabled_output: false)
+      end
+
+      def verify(database, async: false, **argv)
+        raise DatabaseRequiredException, "database argument is required for verify command, e.g. litestream:verify -- --database=path/to/database.sqlite" if database.nil? || !File.exist?(database)
+        argv.stringify_keys!
 
         dir, file = File.split(database)
         ext = File.extname(file)
         base = File.basename(file, ext)
         now = Time.now.utc.strftime("%Y%m%d%H%M%S")
         backup = File.join(dir, "#{base}-#{now}#{ext}")
-
         args = {
           "-o" => backup
         }.merge(argv)
-
-        execute("restore", args, database, async: async, hashify: false)
-
-        backup
-      end
-
-      def verify(database, async: false, **argv)
-        raise DatabaseRequiredException, "database argument is required for verify command, e.g. litestream:verify -- --database=path/to/database.sqlite" if database.nil? || !File.exist?(database)
-
-        backup = restore(database, async: false, **argv)
-
-        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)
@@ -119,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)
@@ -157,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/upstream.rb

@@ -1,5 +1,4 @@
 module Litestream
-  # constants describing the upstream tailwindcss project
   module Upstream
     VERSION = "v0.3.13"
 

data/lib/litestream/version.rb

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

data/lib/tasks/litestream_tasks.rake

@@ -97,14 +97,14 @@ namespace :litestream do
     puts <<~TXT if result
 
       size
-        original          #{result[:size][:original]}
-        restored          #{result[:size][:restored]}
-        delta             #{result[:size][:original] - result[:size][:restored]}
+        original          #{result["size"]["original"]}
+        restored          #{result["size"]["restored"]}
+        delta             #{result["size"]["original"] - result["size"]["restored"]}
 
       tables
-        original          #{result[:tables][:original]}
-        restored          #{result[:tables][:restored]}
-        delta             #{result[:tables][:original] - result[:tables][:restored]}
+        original          #{result["tables"]["original"]}
+        restored          #{result["tables"]["restored"]}
+        delta             #{result["tables"]["original"] - result["tables"]["restored"]}
     TXT
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: litestream
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  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