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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 10b81241fd9899e8f5754d918117c11a7e0ca7c608885beb2e02050d33982816
4
- data.tar.gz: 5e8e54ab1295285b5feec0c5da6d411cddd16193db58ef9af70d7c9cb8c907c8
3
+ metadata.gz: 967c31a26666bcd7193ede513157881e3fc1f66d2ea0a6efaf7b447d38b58f4f
4
+ data.tar.gz: 43bc78c25f357d6c0ee553a5f5f883b019e9ad7e7fbfb7f5ce094a1e50572ab4
5
5
  SHA512:
6
- metadata.gz: 89894bc3bdd5e88a86bd005eb13dc1b2dcd6b5322b6b20d2e38e7f0daa156050261df64fdacd1164eadc3ca552be52314bd3633320811f503429b529e0e78df6
7
- data.tar.gz: e6db3d75cb2abd4ae490bb09c436493cf97656722d071187c6549f35ba72a5d5406b506d349ddc78222213dc3ae61c2747cf3033caa2681a3f6dc3960a8bab28
6
+ metadata.gz: 1db86a3b28f14a1c0a5151fd69875dcdbbb93ef65a4709e113105775754864f2a4f6d5c64c5eddfdef55bfa01fecbb307ecec4d3cc59f2ccab563ef8d403d2c5
7
+ data.tar.gz: b2fb5ca27c1c9f4348baba9322d638544dc323fe55243d289a1397b00916ecfab6a424205d60a99b862dbc8745b90c0871205e9879dc9c7d225a5392b09d688e
@@ -17,8 +17,8 @@ module Litestream
17
17
  # raised when a litestream command requires a database argument but it isn't provided
18
18
  DatabaseRequiredException = Class.new(StandardError)
19
19
 
20
- # raised when litestream fails to restore a database backup
21
- BackupFailedException = Class.new(StandardError)
20
+ # raised when a litestream command fails
21
+ CommandFailedException = Class.new(StandardError)
22
22
 
23
23
  class << self
24
24
  def platform
@@ -77,16 +77,14 @@ module Litestream
77
77
  end
78
78
 
79
79
  def replicate(async: false, **argv)
80
- execute("replicate", argv, async: async, hashify: false)
80
+ execute("replicate", argv, async: async, tabled_output: false)
81
81
  end
82
82
 
83
83
  def restore(database, async: false, **argv)
84
84
  raise DatabaseRequiredException, "database argument is required for restore command, e.g. litestream:restore -- --database=path/to/database.sqlite" if database.nil?
85
85
  argv.stringify_keys!
86
86
 
87
- execute("restore", argv, database, async: async, hashify: false)
88
-
89
- argv["-o"] || database
87
+ execute("restore", argv, database, async: async, tabled_output: false)
90
88
  end
91
89
 
92
90
  def verify(database, async: false, **argv)
@@ -101,10 +99,7 @@ module Litestream
101
99
  args = {
102
100
  "-o" => backup
103
101
  }.merge(argv)
104
-
105
- backup = restore(database, async: false, **args)
106
-
107
- raise BackupFailedException, "Failed to create backup for validation" unless File.exist?(backup)
102
+ restore(database, async: false, **args)
108
103
 
109
104
  restored_tables_count = `sqlite3 #{backup} "select count(*) from sqlite_schema where type='table';"`.chomp.to_i
110
105
  restored_size = File.size(backup)
@@ -120,26 +115,32 @@ module Litestream
120
115
  end
121
116
 
122
117
  def databases(async: false, **argv)
123
- execute("databases", argv, async: async, hashify: true)
118
+ execute("databases", argv, async: async, tabled_output: true)
124
119
  end
125
120
 
126
121
  def generations(database, async: false, **argv)
127
122
  raise DatabaseRequiredException, "database argument is required for generations command, e.g. litestream:generations -- --database=path/to/database.sqlite" if database.nil?
128
123
 
129
- execute("generations", argv, database, async: async, hashify: true)
124
+ execute("generations", argv, database, async: async, tabled_output: true)
130
125
  end
131
126
 
132
127
  def snapshots(database, async: false, **argv)
133
128
  raise DatabaseRequiredException, "database argument is required for snapshots command, e.g. litestream:snapshots -- --database=path/to/database.sqlite" if database.nil?
134
129
 
135
- execute("snapshots", argv, database, async: async, hashify: true)
130
+ execute("snapshots", argv, database, async: async, tabled_output: true)
136
131
  end
137
132
 
138
133
  private
139
134
 
140
- def execute(command, argv = {}, database = nil, async: false, hashify: false)
135
+ def execute(command, argv = {}, database = nil, async: false, tabled_output: false)
141
136
  cmd = prepare(command, argv, database)
142
- run(cmd, async: async, hashify: hashify)
137
+ results = run(cmd, async: async, tabled_output: tabled_output)
138
+
139
+ if Array === results && results.one? && results[0]["level"] == "ERROR"
140
+ raise CommandFailedException, "Failed to execute `#{cmd.join(" ")}`; Reason: #{results[0]["error"]}"
141
+ else
142
+ results
143
+ end
143
144
  end
144
145
 
145
146
  def prepare(command, argv = {}, database = nil)
@@ -158,14 +159,14 @@ module Litestream
158
159
  cmd
159
160
  end
160
161
 
161
- def run(cmd, async: false, hashify: false)
162
+ def run(cmd, async: false, tabled_output: false)
162
163
  if async
163
164
  # To release the resources of the Ruby process, just fork and exit.
164
165
  # The forked process executes litestream and replaces itself.
165
166
  exec(*cmd) if fork.nil?
166
167
  else
167
- out = `#{cmd.join(" ")}`
168
- text_table_to_hashes(out) if hashify
168
+ stdout = `#{cmd.join(" ")}`.champ
169
+ tabled_output ? text_table_to_hashes(stdout) : stdout.split("\n").map { Logfmt.parse(_1) }
169
170
  end
170
171
  end
171
172
 
@@ -1,3 +1,3 @@
1
1
  module Litestream
2
- VERSION = "0.6.0"
2
+ VERSION = "0.7.0"
3
3
  end
metadata CHANGED
@@ -1,15 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: litestream
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.7.0
5
5
  platform: arm64-darwin
6
6
  authors:
7
7
  - Stephen Margheim
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-04-30 00:00:00.000000000 Z
11
+ date: 2024-05-02 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: logfmt
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: 0.0.10
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ">="
25
+ - !ruby/object:Gem::Version
26
+ version: 0.0.10
13
27
  - !ruby/object:Gem::Dependency
14
28
  name: rubyzip
15
29
  requirement: !ruby/object:Gem::Requirement