filbunke 2.1.3 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 44578b9db2dc8322b72700297dd29b692fe8d640
-  data.tar.gz: 99b49067517d284e74aa463b0430dd9dd421ec94
+SHA256:
+  metadata.gz: ad6c0602a7d2dd0e234114495836e1479ba02fa338befd5a3399e65aed9564d9
+  data.tar.gz: 79292e2acb04273425a16fd6cc33950a467e77f2021c0dee6a90aac4262f2f67
 SHA512:
-  metadata.gz: 6d7ab975f18b1c882f7d927ed81d7fb2ccd97ed4b45e7cff39ede7da90079316c5a15a21135879a725b3ff0e8335d1bf5434c6be7f8bfc627ac1097d5e8ad261
-  data.tar.gz: 8185277d98c33556f26c7b52197691206c7b9241a357724e068302458abe5bf4d485feb40c2ad162df790f31ac6c28ba3b35917d592b852ed10e5d6320606c80
+  metadata.gz: b7328935e1ebdb2f1e0c2536ac124233d154be026e86f33ae77f0fdca14f15b1c056f6927481305dd82fc2b376f700d4b5ebcae4ba5a67a73e6fa3188db8997d
+  data.tar.gz: 34824f421d84ef82cf3fe7f4506e8ecdcc6dbe198635263a82d98ee3aeddad18c95f3261650f2b7813b2e43ea84e9cb196864373d0ab183645dc6c0eabdae902

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3

data/Rakefile

@@ -4,11 +4,12 @@ require 'rake'
 begin
   require 'jeweler'
   required_dependencies = {
-    "json" => "1.8.3",
-    "typhoeus" => "1.0.1",
+    "addressable" => "2.8.0",
+    "json" => "2.6.1",
+    "typhoeus" => "1.4.0",
     "open4" => "1.3.4",
-    "mime-types" => "2.6.2",
-    "parallel" => "1.6.1"
+    "mime-types" => "3.4.1",
+    "parallel" => "1.21.0"
   }
   Jeweler::Tasks.new do |gem|
     gem.name = "filbunke"

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.7

data/filbunke.gemspec

@@ -1,20 +1,20 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: filbunke 2.1.3 ruby lib
+# stub: filbunke 2.1.7 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "filbunke"
-  s.version = "2.1.3"
+  s.name = "filbunke".freeze
+  s.version = "2.1.7"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Wouter de Bie", "Bjorn Sperber", "Karl Ravn", "Magnus Spangdal"]
-  s.date = "2016-03-11"
-  s.description = "Filbunke client and library"
-  s.email = "technical@deltaprojects.com"
-  s.executables = ["filbunked"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Wouter de Bie".freeze, "Bjorn Sperber".freeze, "Karl Ravn".freeze, "Magnus Spangdal".freeze]
+  s.date = "2022-02-23"
+  s.description = "Filbunke client and library".freeze
+  s.email = "technical@deltaprojects.com".freeze
+  s.executables = ["filbunked".freeze]
   s.files = [
     ".gitignore",
     ".ruby-gemset",
@@ -41,35 +41,30 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_filbunke.rb"
   ]
-  s.homepage = "https://rubygems.org/gems/filbunke"
-  s.rubygems_version = "2.4.8"
-  s.summary = "Filbunke client"
+  s.homepage = "https://rubygems.org/gems/filbunke".freeze
+  s.rubygems_version = "3.1.2".freeze
+  s.summary = "Filbunke client".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, ["~> 0"])
-      s.add_runtime_dependency(%q<json>, ["= 1.8.3"])
-      s.add_runtime_dependency(%q<typhoeus>, ["= 1.0.1"])
-      s.add_runtime_dependency(%q<open4>, ["= 1.3.4"])
-      s.add_runtime_dependency(%q<mime-types>, ["= 2.6.2"])
-      s.add_runtime_dependency(%q<parallel>, ["= 1.6.1"])
-    else
-      s.add_dependency(%q<shoulda>, ["~> 0"])
-      s.add_dependency(%q<json>, ["= 1.8.3"])
-      s.add_dependency(%q<typhoeus>, ["= 1.0.1"])
-      s.add_dependency(%q<open4>, ["= 1.3.4"])
-      s.add_dependency(%q<mime-types>, ["= 2.6.2"])
-      s.add_dependency(%q<parallel>, ["= 1.6.1"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<shoulda>.freeze, ["~> 0"])
+    s.add_runtime_dependency(%q<addressable>.freeze, ["= 2.8.0"])
+    s.add_runtime_dependency(%q<json>.freeze, ["= 2.6.1"])
+    s.add_runtime_dependency(%q<typhoeus>.freeze, ["= 1.4.0"])
+    s.add_runtime_dependency(%q<open4>.freeze, ["= 1.3.4"])
+    s.add_runtime_dependency(%q<mime-types>.freeze, ["= 3.4.1"])
+    s.add_runtime_dependency(%q<parallel>.freeze, ["= 1.21.0"])
   else
-    s.add_dependency(%q<shoulda>, ["~> 0"])
-    s.add_dependency(%q<json>, ["= 1.8.3"])
-    s.add_dependency(%q<typhoeus>, ["= 1.0.1"])
-    s.add_dependency(%q<open4>, ["= 1.3.4"])
-    s.add_dependency(%q<mime-types>, ["= 2.6.2"])
-    s.add_dependency(%q<parallel>, ["= 1.6.1"])
+    s.add_dependency(%q<shoulda>.freeze, ["~> 0"])
+    s.add_dependency(%q<addressable>.freeze, ["= 2.8.0"])
+    s.add_dependency(%q<json>.freeze, ["= 2.6.1"])
+    s.add_dependency(%q<typhoeus>.freeze, ["= 1.4.0"])
+    s.add_dependency(%q<open4>.freeze, ["= 1.3.4"])
+    s.add_dependency(%q<mime-types>.freeze, ["= 3.4.1"])
+    s.add_dependency(%q<parallel>.freeze, ["= 1.21.0"])
   end
 end
 

data/lib/filbunke/client.rb

@@ -27,7 +27,16 @@ module Filbunke
       updated_files = updates["files"] || []
       new_checkpoint = updates["checkpoint"]
       if updated_files.empty?
-        return last_checkpoint
+        if updates.key?("files")
+          return begin
+            fetch_remote_last_checkpoint
+          rescue => e
+            @logger.warn "Failed to fetch remote last_checkpoint #{@repository.name} will fall back to local last_checkpoint=#{last_checkpoint}"
+            last_checkpoint
+          end
+        else
+          return last_checkpoint
+        end
       end
       @logger.info "Updating repository: #{@repository.name}: #{updated_files.size} files. Checkpoint: #{last_checkpoint} ==> #{new_checkpoint}"
 
@@ -109,7 +118,7 @@ module Filbunke
       begin
         register_http = Net::HTTP.new(@repository.host, @repository.port)
         register_http.start do |http|
-          request = Net::HTTP::Put.new(register_path)
+          request = Net::HTTP::Put.new(Addressable::URI.encode(register_path))
           response = http.request(request)
           if response.code.to_i != 204
             raise "Failed to register updated file: #{path}"
@@ -126,7 +135,7 @@ module Filbunke
       begin
         register_http = Net::HTTP.new(@repository.host, @repository.port)
         register_http.start do |http|
-          request = Net::HTTP::Delete.new(register_path)
+          request = Net::HTTP::Delete.new(Addressable::URI.encode(register_path))
           response = http.request(request)
           if response.code.to_i != 204
             raise "Failed to register deleted file: #{path}"
@@ -142,7 +151,7 @@ module Filbunke
       touch_http = Net::HTTP.new(@repository.host, @repository.port)
       touch_http.start do |http|
         touch_path = "/#{UPDATES_ACTION}/#{@repository.name}/#{TOUCH_ACTION}"
-        request = Net::HTTP::Put.new(touch_path)
+        request = Net::HTTP::Put.new(Addressable::URI.encode(touch_path))
         response = http.request(request)
         if response.code.to_i != 204
           raise "Failed to touch repository: #{@repository.name}"
@@ -150,11 +159,11 @@ module Filbunke
       end
     end
 
-    def last_checkpoint
+    def fetch_remote_last_checkpoint
       last_checkpoint_http = Net::HTTP.new(@repository.host, @repository.port)
       last_checkpoint_http.start do |http|
         last_checkpoint_path = "/#{UPDATES_ACTION}/#{@repository.name}/#{LAST_CHECKPOINT_ACTION}"
-        request = Net::HTTP::Get.new(last_checkpoint_path)
+        request = Net::HTTP::Get.new(Addressable::URI.encode(last_checkpoint_path))
         response = http.request(request)
         if response.code.to_i != 200
           raise "Failed to get last checkpoint for repository: #{@repository.name}"
@@ -220,7 +229,7 @@ module Filbunke
           updates_path = "#{updates_path}&batch_size=#{@repository.batch_size}" if @repository.batch_size > 0
           begin
             @logger.info "Fetching updated file list from #{updates_path}"
-            request = Net::HTTP::Get.new(updates_path)
+            request = Net::HTTP::Get.new(Addressable::URI.encode(updates_path))
             response = http.request(request)
             if response.code.to_i == 200
               JSON.parse(response.body)
@@ -245,14 +254,14 @@ module Filbunke
       begin
         async_request = if @repository.user
           Typhoeus::Request.new(
-            URI.escape(file.url),
+            Addressable::URI.encode(file.url),
             :followlocation => true,
             :username => @repository.user,
             :password => @repository.pass
           )
         else
           Typhoeus::Request.new(
-            URI.escape(file.url),
+            Addressable::URI.encode(file.url),
             :followlocation => true
           )
         end

data/lib/filbunke.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'digest/md5'
 require 'typhoeus'
 require 'open4'
-require 'uri'
+require 'addressable'
 require 'logger'
 require 'parallel'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filbunke
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.7
 platform: ruby
 authors:
 - Wouter de Bie
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -27,34 +27,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +89,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.21.0
 description: Filbunke client and library
 email: technical@deltaprojects.com
 executables:
@@ -146,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Filbunke client