rustic 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749ff9e10d60fb610892f8c1984fcc5badf605eb5ef7dbe954d71f70aaf6e335
-  data.tar.gz: 0c499c7d0fd8536f464a8c9410099c9d0d9e587895f53fd50e8aff406dc20344
+  metadata.gz: 30e838337c1ba5bf363393a9cbf6fc0f40ddab1785b3fb399e3d9d5dc560654c
+  data.tar.gz: 36d175e6c52b3c54d2963be3430483f1de91b63df7f61db3f17759f3cba2a2a4
 SHA512:
-  metadata.gz: 1d806e658a7aedb406195cf6eeb87579c891a2e4c71db159685a5bcfe8ad94375e9ecdb9dcf9d56c06ed1e2164376f565793e55854b1d222fdf0fd2ada5bdcae
-  data.tar.gz: 1f592a8a4e737873ede871bc1877bf0da4f5959a8e384835f7412950456d6db38fb55ce691b71cd75a2f0a22144cc80730a873bbf77026db4b12bb1a990fef2a
+  metadata.gz: 3b66b1fd5f70a44162507001f41f2016260a98bfcc7ecc97c31451624837e39dd465ec2d9e34d503c99bbceb7be18734cdf171a21e95048153282a7992ed408b
+  data.tar.gz: b56904d7bb921a10c6600ff29b15687b16fa5b9809c79f774cedcc48ac1ee5dd4320700c1788a0a6726b8d84021d1764a561783984933082eaac990da3469554

data/.tool-versions

@@ -1 +1 @@
-ruby 3.0.2
+ruby 3.2.1

data/Gemfile

@@ -5,6 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rustic.gemspec
 gemspec
 
+gem "aws-sdk-s3"
+gem "ox"
 gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rustic (0.3.3)
+    rustic (0.5.0)
       async-process (~> 1.3)
       ptools (~> 1.4)
       zeitwerk (~> 2.5)
@@ -10,113 +10,146 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    async (1.30.3)
-      console (~> 1.10)
-      nio4r (~> 2.3)
-      timers (~> 4.1)
-    async-io (1.33.0)
+    async (2.12.1)
+      console (~> 1.25, >= 1.25.2)
+      fiber-annotation
+      io-event (~> 1.6, >= 1.6.5)
+    async-io (1.43.2)
       async
     async-process (1.3.1)
       async
       async-io
-    async-rspec (1.16.1)
+    async-rspec (1.17.0)
       rspec (~> 3.0)
       rspec-files (~> 1.0)
       rspec-memory (~> 1.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.949.0)
+    aws-sdk-core (3.200.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.155.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     backport (1.2.0)
-    benchmark (0.2.0)
-    console (1.15.3)
-      fiber-local
-    diff-lcs (1.4.4)
+    benchmark (0.3.0)
+    console (1.25.2)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
+    diff-lcs (1.5.1)
     docile (1.4.0)
     e2mmap (0.1.0)
-    fiber-local (1.0.0)
-    jaro_winkler (1.5.4)
-    kramdown (2.3.1)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (0.1.2)
+    io-event (1.6.5)
+    jaro_winkler (1.6.0)
+    jmespath (1.6.2)
+    json (2.7.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-linux)
+    language_server-protocol (3.17.0.3)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    ox (2.14.18)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
-    ptools (1.4.2)
-    racc (1.6.0)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
+      racc
+    ptools (1.5.0)
+    racc (1.8.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rbs (2.8.4)
+    regexp_parser (2.9.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-files (1.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-files (1.1.3)
       rspec (~> 3.0)
-    rspec-memory (1.0.2)
+    rspec-memory (1.0.4)
       rspec (~> 3.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.23.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.12.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.6.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    solargraph (0.44.0)
+    simplecov_json_formatter (0.1.4)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
-      bundler (>= 1.17.2)
+      bundler (~> 2.0)
       diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.1.0)
-    tilt (2.0.10)
-    timers (4.3.3)
-    unicode-display_width (2.1.0)
-    yard (0.9.26)
-    zeitwerk (2.6.0)
+    strscan (3.1.0)
+    thor (1.3.1)
+    tilt (2.4.0)
+    unicode-display_width (2.5.0)
+    yard (0.9.36)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   async-rspec
+  aws-sdk-s3
+  ox
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop

data/examples/rustic.rb

@@ -9,18 +9,18 @@ Rustic.define do # rubocop:disable Metrics/BlockLength
   password "password"
 
   before do
-    logger.info(self, "BEFORE")
+    Console.logger.info(self, "BEFORE")
   end
 
   backup do
     one_fs!
 
     before do |exists|
-      logger.info(self, "BEFORE BACKUP #{exists}")
+      Console.logger.info(self, "BEFORE BACKUP #{exists}")
     end
 
     after do
-      logger.info(self, "AFTER BACKUP")
+      Console.logger.info(self, "AFTER BACKUP")
     end
 
     backup "lib"
@@ -29,21 +29,21 @@ Rustic.define do # rubocop:disable Metrics/BlockLength
 
   check do
     before do
-      logger.info(self, "BEFORE CHECK")
+      Console.logger.info(self, "BEFORE CHECK")
     end
 
     after do
-      logger.info(self, "AFTER CHECK")
+      Console.logger.info(self, "AFTER CHECK")
     end
   end
 
   forget do
     before do
-      logger.info(self, "BEFORE FORGET")
+      Console.logger.info(self, "BEFORE FORGET")
     end
 
     after do
-      logger.info(self, "AFTER FORGET")
+      Console.logger.info(self, "AFTER FORGET")
     end
 
     prune!
@@ -51,10 +51,10 @@ Rustic.define do # rubocop:disable Metrics/BlockLength
   end
 
   after do
-    logger.info(self, "AFTER")
+    Console.logger.info(self, "AFTER")
   end
 
   on_error do |error|
-    logger.warn(self, "ERROR:", error)
+    Console.logger.warn(self, "ERROR:", error)
   end
 end

data/lib/rustic/command_builder.rb

@@ -25,7 +25,7 @@ class Rustic::CommandBuilder
 
   private
 
-  def add_repository_path! = @args.concat(["-r", @config.repository])
+  def add_repository_path! = @args.push("-r", @config.repository)
 
   def add_password!
     return @env_variables.merge!("RESTIC_PASSWORD" => @config.password) if @config.password

data/lib/rustic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rustic
-  VERSION = "0.3.3"
+  VERSION = "0.5.0"
 end

data/lib/rustic/wrapper.rb

@@ -8,11 +8,11 @@ class Rustic::Wrapper
 
   def initialize(argv, env_variables = {})
     @argv = argv
-    @env_variables = env_variables
+    @env_variables = env_variables.merge("RESTIC_PROGRESS_FPS" => "1", "TERM" => "dumb")
   end
 
   def run
-    logger.info(self, "Executing:", @argv)
+    Console.logger.info(self, "Executing:", @argv)
     begin
       status = Async::Process.spawn(@env_variables, *@argv)
     rescue StandardError

data/rustic.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "DSL for the restic backup tool."
   spec.homepage      = "https://github.com/zhulik/rustic"
   spec.license       = "MIT"
-  spec.required_ruby_version = [">= 3.0.0", "< 3.1"]
+  spec.required_ruby_version = [">= 3.0.0"] # rubocop:disable Gemspec/RequiredRubyVersion
 
   spec.metadata["homepage_uri"] = spec.homepage
   # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."

data/rustic_script.rb

@@ -5,18 +5,18 @@ repository "tmp/repository"
 password "password"
 
 before do
-  logger.info(self, "BEFORE")
+  Console.logger.info(self, "BEFORE")
 end
 
 backup do
   one_fs!
 
   before do |exists|
-    logger.info(self, "BEFORE BACKUP #{exists}")
+    Console.logger.info(self, "BEFORE BACKUP #{exists}")
   end
 
   after do
-    logger.info(self, "AFTER BACKUP")
+    Console.logger.info(self, "AFTER BACKUP")
   end
 
   backup "lib"
@@ -24,9 +24,9 @@ backup do
 end
 
 after do
-  logger.info(self, "AFTER")
+  Console.logger.info(self, "AFTER")
 end
 
 on_error do |error|
-  logger.warn(self, "ERROR:", error)
+  Console.logger.warn(self, "ERROR:", error)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rustic
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2024-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-process
@@ -108,16 +108,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.0.0
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: DSL for the restic backup tool.