filbunke 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: bdf27520bab96738e5a12465ccd526ee4d3d837a
-  data.tar.gz: dbb247721d46a2b8aafe2d5942120850b304fd3a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWZhNTI3YWExNDIzZWI2OTNjN2I2Y2JlZGY1M2IwY2Y2M2ZiNGMwZQ==
+  data.tar.gz: !binary |-
+    MmUyZWUyNjllY2RiNjFhZmRhYTAyNDNiYzI0MTg5MjcyODNmMDY5Mg==
 SHA512:
-  metadata.gz: 6754b1ac1376a1f491d7159fe09ab95b474637b144d2ab09fdbea87fd724234e2cf9ee5d535a6678cfbcca585dd681f186df7c193cceb6e0480d3f154536825c
-  data.tar.gz: 17084f8cc91464c6a9a2d1a47f5b2df0c732bc338bbd877f2795af9e16d44c80c1aea2d0d38304adee1bd5e8c06dce0d8503518f720da45253e4dea1123c3ee9
+  metadata.gz: !binary |-
+    M2YxNjMxZjBkYThjYWIwMzg3ZmM2NGU2ODQyNWUyYjVkZGY0OGJhNjFiOTdh
+    OTU1Njk2NTAwMmVjNzFiMDUxOTA1OTM5NmUxY2JmODMwZGQ3MTljNTI4OTky
+    ODUwMmNmNzhiZDhmMTljYTM5YWZhZmEzOTJlMjY0NzhhMTYxNzE=
+  data.tar.gz: !binary |-
+    NjhkNWYzNmM5YjI1YTQ1MDI1OTBlZGVhODQ4NGJlNTZiODUxNDkzN2QzNTg2
+    Mjg3YzFhZWZjZjAwNDYyMTY3NzA5YjhjZWZhZDBhYzEwNWE0NmE5OWMwNWU3
+    MmI3ZjM1NjVkNjUxMmQwMDAxYTNkMzQ4ZTljZDI3OWI2ZmE2ZjY=

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.2

data/filbunke.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: filbunke 2.1.0 ruby lib
+# stub: filbunke 2.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "filbunke"
-  s.version = "2.1.0"
+  s.version = "2.1.2"
 
   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-05"
+  s.date = "2016-03-11"
   s.description = "Filbunke client and library"
   s.email = "technical@deltaprojects.com"
   s.executables = ["filbunked"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     "test/test_filbunke.rb"
   ]
   s.homepage = "https://rubygems.org/gems/filbunke"
-  s.rubygems_version = "2.4.5.1"
+  s.rubygems_version = "2.2.2"
   s.summary = "Filbunke client"
 
   if s.respond_to? :specification_version then

data/lib/filbunke/client.rb

@@ -25,9 +25,9 @@ module Filbunke
     def with_updated_files(last_checkpoint)
       updates = get_updated_file_list(last_checkpoint)
       updated_files = updates["files"] || []
-      new_checkpoint = updates["checkpoint"] || 0
+      new_checkpoint = updates["checkpoint"]
       if updated_files.empty?
-        return new_checkpoint
+        return last_checkpoint
       end
       @logger.info "Updating repository: #{@repository.name}: #{updated_files.size} files. Checkpoint: #{last_checkpoint} ==> #{new_checkpoint}"
 
@@ -240,6 +240,8 @@ module Filbunke
     end
 
     def update_http_file!(file, local_file_path)
+      downloaded_file = nil
+      tmp_filename = "#{local_file_path}-#{(0...8).map { (65 + rand(26)).chr }.join}.tmp"
       begin
         async_request = if @repository.user
           Typhoeus::Request.new(
@@ -255,13 +257,12 @@ module Filbunke
           )
         end
 
-        downloaded_file = nil
         async_request.on_headers do |response|
           if response.code != 200
             raise "Downloading file #{response.effective_url} failed with status code #{response.code} --- #{response.inspect}"
           end
           ::FileUtils.mkdir_p(::File.dirname(local_file_path))
-          downloaded_file = ::File.new("#{local_file_path}.tmp", "wb")
+          downloaded_file = ::File.new(tmp_filename, "wb")
           @logger.debug("Updating file #{local_file_path}")
         end
 
@@ -273,10 +274,12 @@ module Filbunke
         async_request.on_complete do |response|
           unless downloaded_file.nil?
             downloaded_file.close unless downloaded_file.closed?
-            if response.code == 200
-              ::FileUtils.mv "#{local_file_path}.tmp", local_file_path
-            else
-              ::FileUtils.rm "#{local_file_path}.tmp" if ::File.exist? "#{local_file_path}.tmp"
+            if ::File.exist? tmp_filename
+              if response.code == 200
+                ::FileUtils.mv tmp_filename, local_file_path
+              else
+                ::FileUtils.rm tmp_filename 
+              end
             end
           end
           true
@@ -289,7 +292,7 @@ module Filbunke
         @logger.error "Failed to update file #{file.url}: #{msg}"
         unless downloaded_file.nil?
           downloaded_file.close unless downloaded_file.closed?
-          ::FileUtils.rm "#{local_file_path}.tmp" if ::File.exist? "#{local_file_path}.tmp"
+          ::FileUtils.rm tmp_filename if ::File.exist? tmp_filename
         end
         false
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filbunke
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Wouter de Bie
@@ -11,20 +11,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -104,9 +104,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
+- .gitignore
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -137,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Filbunke client