litestream 0.5.5-x86_64-linux → 0.7.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648805a3cffb477ea03431e8c2732d4d720535d89c025c32984d0f84208f7b4e
-  data.tar.gz: '058d838e90983b0a5c6ededcba5a8f7f6a8dd8e394ff41867256bf7140612178'
+  metadata.gz: 7cfa0076b6d51cab813ffb681f7c14e986cd15ec8eda4f8c2025d87dc78fe8fd
+  data.tar.gz: b7ffe2e3d089d8fdecd773152204d93d91c1a8b1111cf771d21eb97001939db5
 SHA512:
-  metadata.gz: 1ec46d29aee555a7d172cb8085920bf4935d5f4cc887d247498f27217c6be50021ab8866d67e942f8ff837088580ef9c938a399dc012b4ac1b33bc4db48f5a84
-  data.tar.gz: bc9e0fbdf41d79dbba29e43ab3b50c031edea6bf9f4b0fe63892968e3fa355ef2249940c95110a8d2b56369836ebcb76c2e30a17ed64ccb3f652f8cc4fd5851a
+  metadata.gz: ab73f138d8653969fbccc8ea2bc52bc3cbb9afedb7352e015d9472d1dc19fe903a1e8e05b3fe3a9e56b4ec10e335a58504041ac1b627ae4f78c2f02d274f594d
+  data.tar.gz: 42ea9accdba745c79395f760fcb15ca8cb9f89915cd10e98d02330b6ee9a78b76741d72e2d8fae8a662414232a44f4f4ce3e89a757125b8889e3a11ccb93d4a5

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