geminabox 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759a92d17a3e229f2c7e974618f3eb970a7d8f4c
-  data.tar.gz: c9263bebaca15a36bf4c2f21ea85a29d1a453abc
+  metadata.gz: 06c1719b0b3d8508755171751405a9e44a65b3d8
+  data.tar.gz: 2a843634e631cd122dfead4d0ff7f9b28c114934
 SHA512:
-  metadata.gz: cf565347feda26ff82b1f1c81f6988ca9d50f2d9b12e6ad6b2c5b578e024bfd3839b127cfb31cea50b8129f53271da703cc2a49b15696b2c93edb026e7dce44a
-  data.tar.gz: 5669bd9b4976883e3c8f23ef7232f573a946ebbc90e9e76d646bca53363a126fde6e8a01c410d26118a267453f8c8c65acf512b802802a8803923162e101f568
+  metadata.gz: 26576e1a5defefbbe0eef931d707a459fdfd4a172dc243828bd1dcc3bc6e9bf80ab491fd1a415c7720c5030c0c7ba010f6d3fa2864efd94ffab2fbd64d0c7169
+  data.tar.gz: efd5805d53e8265f3e0929d257e160d3aa5a2c731d7d80f8e14e9b1814e5023b8c5107a8af938eff52e6c8e398c493cfb13a41e141e8b93dca6814a741f8be8d

data/lib/geminabox/proxy/copier.rb

@@ -22,7 +22,9 @@ module Geminabox
 
       def get_remote
         begin
-          File.open(proxy_path, 'w'){|f| f.write(remote_content)}
+          if rc = remote_content
+            File.open(proxy_path, 'w'){|f| f.write(rc) }
+          end
         rescue
           File.unlink(proxy_path) if File.exists?(proxy_path)
           raise $!

data/lib/geminabox/proxy/file_handler.rb

@@ -45,11 +45,12 @@ module Geminabox
       def remote_content
         Geminabox.http_adapter.get_content(remote_url).force_encoding(encoding)
       rescue
+        return nil if Geminabox.allow_remote_failure
         raise GemStoreError.new(500, "Unable to get content from #{remote_url}")
       end
 
       def remote_url
-        "http://rubygems.org/#{file_name}"
+        URI.join(Geminabox.ruby_gems_url, file_name)
       end
 
       def local_content

data/lib/geminabox/proxy/splicer.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'fileutils'
 
 module Geminabox
   module Proxy
@@ -11,16 +12,15 @@ module Geminabox
       end
 
       def create
-        data = new_content
-        return nil if data.nil?
-        begin
-          tmp = Tempfile.new('geminabox')
-          File.open(tmp, 'w'){|f| f.write(data)}
-        rescue
-          return nil
+        if data = new_content
+          f = Tempfile.create('geminabox')
+          begin
+            f.write(data)
+          ensure
+            f.close rescue nil
+          end
+          FileUtils.mv f.path, splice_path
         end
-
-        FileUtils.mv tmp, splice_path
       end
 
       def new_content
@@ -57,7 +57,11 @@ module Geminabox
 
       private
       def merge_gziped_content
-        package(unpackage(local_content) | unpackage(remote_content))
+        if rc = remote_content
+          package(unpackage(local_content) | unpackage(rc))
+        else
+          local_content
+        end
       end
 
       def unpackage(content)

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.13.3' unless defined? VERSION
+  VERSION = '0.13.4' unless defined? VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Tom Lea
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra