restic-service 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d2e8bcf01431f060bd3bf7873017742400d672
-  data.tar.gz: da02e19bdb412eb16fdd109c4af7dc2bc7ae23c6
+  metadata.gz: fc0cdefcecb418357241e0acc940dc84572263d8
+  data.tar.gz: 9b3bf2bc152405e6fd8d4ffd4e950f8176b34a7f
 SHA512:
-  metadata.gz: f772fd3950f54eda022a99db6b46a07f8fb8ee5ffb2095b312f30a6fb85111b1bb0cef9afca36e82d7d60704f8e517cc23daf2c6e12baa340a199b8cd55e1428
-  data.tar.gz: edb746be5a8aff2b7c18fd90b97aededccc4b82520c5cdddc8dd781ce696542c5a36c96661210131bb4934ddfaff406d9d4ba99307ec9e92c1cb3fe22876225c
+  metadata.gz: 58013743c7a6ebf256b6eddc6ade110c43245513fa78242cb151698538307388af6a95e3c36b46fc381d19219780cec4c1c8543d571757429a3f81671083ae00
+  data.tar.gz: bd65807a2ca4f8314b39cf4f4c1fd571693c9148bb6f70db19c75d2965526bc0b69a28c4449e468a77b7ddcfd733a26650275a0138553f205cc6f8776a27e69b

data/lib/restic/service/auto_update.rb

@@ -12,6 +12,14 @@ module Restic
                 "https://github.com/restic/restic/releases/download/v#{RESTIC_RELEASE_VERSION}/restic_#{RESTIC_RELEASE_VERSION}_#{platform}.bz2"
             end
 
+            RCLONE_RELEASE_VERSION = "1.41"
+
+            def self.rclone_release_url(platform)
+                basename = "rclone-v#{RCLONE_RELEASE_VERSION}-#{platform}"
+                url = "https://github.com/ncw/rclone/releases/download/v#{RCLONE_RELEASE_VERSION}/#{basename}.zip"
+                [basename, url]
+            end
+
 
             def initialize(binary_path)
                 @root = File.dirname(File.dirname(binary_path))
@@ -61,39 +69,72 @@ module Restic
                 reader.close if reader && !reader.closed?
             end
 
-            def update_restic(platform, target_path)
-                release_url = self.class.restic_release_url(platform)
-
-                release_binary = nil
-                while !release_binary
-                    response = Net::HTTP.get_response(URI(release_url))
+            def download_file(temp_path, url)
+                binary = nil
+                while !binary
+                    response = Net::HTTP.get_response(URI(url))
                     case response
                     when Net::HTTPSuccess
-                        release_binary = response.body
+                        binary = response.body
                     when Net::HTTPRedirection
-                        release_url = response['location']
+                        url = response['location']
                     else
-                        raise FailedUpdate, "failed to fetch restic at #{release_url}: #{response}"
+                        raise FailedUpdate, "failed to fetch #{url}: #{response}"
                     end
                 end
 
+                File.open(temp_path, 'w') do |io|
+                    io.write binary
+                end
+            end
+
+            def update_release_if_needed(target_path, temp_path)
+                if File.file?(target_path)
+                    current = File.read(target_path)
+                    new     = File.read(temp_path)
+                    return false if current == new
+                end
+
+                FileUtils.mv temp_path, target_path
+                FileUtils.chmod 0755, target_path
+                true
+            end
+
+            def update_restic(platform, target_path)
+                release_url = self.class.restic_release_url(platform)
+
                 tmpdir = Dir.mktmpdir
                 restic_path = File.join(tmpdir, "restic")
-                File.open("#{restic_path}.bz2", 'w') do |io|
-                    io.write release_binary
-                end
+                download_file("#{restic_path}.bz2", release_url)
 
                 if !system("bzip2", "-d", "#{restic_path}.bz2")
                     raise FailedUpdate, "failed to uncompress the restic release file"
                 end
+                update_release_if_needed(target_path, restic_path)
+
+            ensure
+                FileUtils.rm_rf tmpdir if tmpdir
+            end
+
+            def update_rclone(platform, target_path)
+                basename, release_url = self.class.rclone_release_url(platform)
+
+                tmpdir  = Dir.mktmpdir
+                tmppath = File.join(tmpdir, "rclone.zip")
+                download_file(tmppath, release_url)
+
+                if !system("unzip", tmppath, chdir: tmpdir, out: '/dev/null')
+                    raise FailedUpdate, "failed to uncompress the rclone release file"
+                end
 
+                rclone_path = File.join(tmpdir, basename, 'rclone')
                 if File.file?(target_path)
                     current = File.read(target_path)
-                    new     = File.read(restic_path)
+                    new     = File.read(rclone_path)
                     return if current == new
                 end
 
-                FileUtils.mv restic_path, target_path
+                FileUtils.mv rclone_path, target_path
                 FileUtils.chmod 0755, target_path
                 true
 

data/lib/restic/service/cli.rb

@@ -67,6 +67,22 @@ module Restic
                         target.forget
                     end
                 end
+
+                def auto_update_tool(conf, updater, name, version)
+                    begin
+                        path = conf.tool_path(name, only_if_present: false)
+                    rescue ArgumentError
+                        puts "cannot auto-update #{name}, provide an explicit path in the 'tools' section of the configuration first"
+                        return
+                    end
+
+                    puts "attempting to auto-update #{name}"
+                    if updater.send("update_#{name}", conf.send("#{name}_platform"), path)
+                        puts "updated #{name} to version #{version}"
+                    else
+                        puts "restic was already up-to-date"
+                    end
+                end
             end
 
             desc 'whereami', 'finds the available backup targets'
@@ -104,25 +120,16 @@ module Restic
                     puts "updating restic-service disabled in configuration"
                 end
 
-                update_restic = conf.auto_update_restic?
-                if update_restic
-                    begin
-                        restic_path = conf.tool_path('restic')
-                    rescue ArgumentError
-                        puts "cannot auto-update restic, provide an explicit path in the 'tools' section of the configuration first"
-                        update_restic = false
-                    end
+                if conf.auto_update_restic?
+                    auto_update_tool(conf, updater, 'restic', AutoUpdate::RESTIC_RELEASE_VERSION)
                 else
                     puts "updating restic disabled in configuration"
                 end
 
-                if update_restic
-                    puts "attempting to auto-update restic"
-                    if updater.update_restic(conf.restic_platform, restic_path)
-                        puts "updated restic to version #{AutoUpdate::RESTIC_RELEASE_VERSION}"
-                    else
-                        puts "restic was already up-to-date"
-                    end
+                if conf.auto_update_rclone?
+                    auto_update_tool(conf, updater, 'rclone', AutoUpdate::RCLONE_RELEASE_VERSION)
+                else
+                    puts "updating rclone disabled in configuration"
                 end
             end
 

data/lib/restic/service/conf.rb

@@ -202,16 +202,17 @@ module Restic
             # @param [String]
             # @return [Boolean]
             def tool_available?(tool_name)
-                @tools.has_key?(tool_name)
+                _, available = @tools[tool_name]
+                available
             end
 
             # The full path of a given tool
             #
             # @param [String]
             # @return [Pathname]
-            def tool_path(tool_name)
+            def tool_path(tool_name, only_if_present: true)
                 if tool = @tools[tool_name]
-                    tool
+                    tool[0] if tool[1] || !only_if_present
                 else
                     raise ArgumentError, "cound not find '#{tool_name}'"
                 end
@@ -229,6 +230,14 @@ module Restic
                 @auto_update_restic
             end
 
+            def auto_update_rclone?
+                @auto_update_rclone
+            end
+
+            def rclone_platform
+                @auto_update_rclone
+            end
+
             # Add the information stored in a YAML-like hash into this
             # configuration
             #
@@ -247,6 +256,8 @@ module Restic
                         @auto_update_restic_service = do_update
                     elsif update_target == 'restic'
                         @auto_update_restic = do_update
+                    elsif update_target == 'rclone'
+                        @auto_update_rclone = do_update
                     end
                 end
 
@@ -268,12 +279,10 @@ module Restic
                     if tool_path.relative?
                         tool_path = find_in_path(tool_path)
                     end
-                    if tool_path && tool_path.file?
-                        @tools[tool_name] = tool_path
-                    else
-                        STDERR.puts "cannot find path to #{tool_name}"
-                        @tools.delete(tool_name)
-                    end
+
+                    exists = tool_path.file?
+                    STDERR.puts "#{tool_path} does not exist" unless exists
+                    @tools[tool_name] = [tool_path, exists]
                 end
             end
         end

data/lib/restic/service/targets/rclone_b2.rb

@@ -18,6 +18,7 @@ module Restic
                     super
                     @rclone_path = conf.tool_path('rclone')
                     @src = yaml['src']
+                    @filter = yaml['filter'] || []
                     @conf_path = conf.conf_path
                 end
 
@@ -39,6 +40,8 @@ EOCONF
                         system(@rclone_path.to_path,
                             '--transfers', '16',
                             '--config', io.path,
+                            '--delete-during',
+                            *@filter.flat_map { |p| ['--filter', p] },
                             *extra_args,
                             'sync', @src, "restic-service:#{@bucket}/#{@path}", in: :close)
                     end

data/lib/restic/service/version.rb

@@ -1,5 +1,5 @@
 module Restic
   module Service
-    VERSION = "0.2.2"
+      VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restic-service
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor