geminabox 0.13.7 → 0.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1cc2305f829d0ff68bf003b811a607d82855e7
-  data.tar.gz: 7ec369626b576f2691ccf9cf3693def204371326
+  metadata.gz: 3eaa4ca96116f65f67fbd223581a5172bc96cc19
+  data.tar.gz: da0a1c599120be2e2ed36e157202df0e8ebacf24
 SHA512:
-  metadata.gz: 30452dbbb9099d7e306f4f67dd61ce38a8dd8c7a2df955735eaae20547dcd1d2834a55e753e666f68db2f54256d14d27a75cbd6917dc22f5f67768e47aca570d
-  data.tar.gz: b347f233d5ee2b9fd09fcda61a7d6950617bcc9e793aad27391f1a18964eaeb4a9099e2b9c32165adef0e02b407200e9b8a5c56ee84c67a2ba752d056e962d2d
+  metadata.gz: d101371f803f98e6571bccf297758d8516dc22a2077f3c0875b344141ce9490c3282f9e130afc6eb858486314cfa3a426c6ad9b9f8da6dbd434227a4ce6a8226
+  data.tar.gz: c9fd1589eacc2d1f81c461dc10cfce27ffda756295c01a54879cb8dc2f847ca353a274920ad03eaf86d8acb149ec228c0578cccadd1f0ac84e2098fc8ff1b87e

data/lib/geminabox.rb

@@ -14,7 +14,6 @@ require 'rack/protection'
 module Geminabox
 
   class Error < StandardError ; end
-  class AlreadyLocked < Error ; end
 
   require_relative 'geminabox/version'
   require_relative 'geminabox/proxy'

data/lib/geminabox/server.rb

@@ -1,3 +1,5 @@
+require 'reentrant_flock'
+
 module Geminabox
 
   class Server < Sinatra::Base
@@ -65,11 +67,11 @@ module Geminabox
             indexer.update_index
             updated_gemspecs.each { |gem| dependency_cache.flush_key(gem.name) }
           rescue Errno::ENOENT
-            reindex(:force_rebuild)
+            with_rlock { reindex(:force_rebuild) }
           rescue => e
             puts "#{e.class}:#{e.message}"
             puts e.backtrace.join("\n")
-            reindex(:force_rebuild)
+            with_rlock { reindex(:force_rebuild) }
           end
         end
       rescue Gem::SystemExitException
@@ -82,8 +84,22 @@ module Geminabox
       def dependency_cache
         @dependency_cache ||= Geminabox::DiskCache.new(File.join(data, "_cache"))
       end
-    end
 
+      def with_rlock(&block)
+        file_class.open(settings.lockfile, File::RDWR | File::CREAT) do |f|
+          ReentrantFlock.synchronize(f, File::LOCK_EX | File::LOCK_NB, &block)
+        end
+      end
+
+      # This method provides a test hook, as stubbing File is painful...
+      def file_class
+        @file_class ||= File
+      end
+
+      def file_class=(klass)
+        @file_class = klass
+      end
+    end
 
 
     before do
@@ -185,21 +201,13 @@ module Geminabox
   private
 
     def serialize_update(&block)
-      with_lock(&block)
-    rescue AlreadyLocked
+      with_rlock(&block)
+    rescue ReentrantFlock::AlreadyLocked
       halt 503, { 'Retry-After' => settings.retry_interval }, 'Repository lock is held by another process'
     end
 
-    def with_lock
-      file_class.open(settings.lockfile, File::RDWR | File::CREAT) do |f|
-        raise AlreadyLocked unless f.flock(File::LOCK_EX | File::LOCK_NB)
-        yield
-      end
-    end
-
-    # This method provides a test hook, as stubbing File is painful...
-    def file_class
-      File
+    def with_rlock(&block)
+      self.class.with_rlock(&block)
     end
 
     def handle_incoming_gem(gem)

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.13.7' unless defined? VERSION
+  VERSION = '0.13.8' unless defined? VERSION
 end

data/lib/geminabox_client.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'cgi'
 require 'geminabox'
 
 class GeminaboxClient
@@ -12,7 +13,8 @@ class GeminaboxClient
 
   def extract_username_and_password_from_url!(url)
     uri = URI.parse(url.to_s)
-    @username, @password = uri.user, uri.password
+    @username = CGI.unescape(uri.user) if uri.user
+    @password = CGI.unescape(uri.password) if uri.password
     uri.user = uri.password = nil
     uri.path = uri.path + "/" unless uri.path.end_with?("/")
     @url = uri.to_s
@@ -39,7 +41,9 @@ end
 
 module GeminaboxClient::GemLocator
   def find_gem(dir)
-    gemname = File.split(dir).last
+    gemspec_path = Dir.glob(File.join(dir, "*.gemspec")).first
+    gemspec = Gem::Specification::load(gemspec_path)
+    gemname = gemspec.name
     glob_matcher = "{pkg/,}#{gemname}-*.gem"
     latest_gem_for(gemname, Dir.glob(glob_matcher)) or raise Gem::CommandLineError, NO_GEM_PROVIDED_ERROR_MESSAGE
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.13.8
 platform: ruby
 authors:
 - Tom Lea
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -83,6 +83,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reentrant_flock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A sinatra based gem hosting app, with client side gem push style functionality.
 email:
 - contrib@tomlea.co.uk