geminabox 0.12.4 → 0.13.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTBmZWQxYjM3NjFlODM4NmQ0N2ViMjY1MjU0ZjRiMWE4ODcyMjFmYw==
-  data.tar.gz: !binary |-
-    NTcwNGQ5YjkxMDNkMGMzOWNmMThjNTJlNmVlNDg0MjE0MGEzNTdkMg==
+SHA1:
+  metadata.gz: d0d8d2b7b2d895ef9b0017f0e6b48132fa3e6a16
+  data.tar.gz: f333f2cf2dbf72221cc0fd281f8b720def07d2a0
 SHA512:
-  metadata.gz: !binary |-
-    YWQyZjU1NWM4M2FmY2U1NDgzMzU5MTgzYWI1ZTVjYzc0ZWVjNTM4MTkyMzRk
-    NTc3NjM4N2VkNTljODAwZjk5MDQ5MTdiZjU1ZGMyNTg0ZjMzNTQ3Y2FkMjJk
-    YjE2NTI2Y2NiNzY5NWUyNzdlNGJiMTBlOWU1MDBiYzJjZDg3MzU=
-  data.tar.gz: !binary |-
-    NTUwM2EwZGVjYzc2ZTI3YjExMjI2ODI3ODZlMjc2YzIzOWUyM2IxMmIyYmMy
-    MDdkMTNmY2E5ZmRkYzNiM2YyMjliMWViYjM2NWFlMWFmMzY5NWFmOTFiY2Uz
-    ZDc1ZmU4NWY3MjM1NTY3MDg1MTcyYWM5NDY5YjgzOWM3MmZkODA=
+  metadata.gz: 9146b95e001840793b881bc3cb72dfc5103019251aa71ae1b0f5d3bd93fb59553ae2cc61478deaee5aa6615197c33149e99cc69cfac5c8c944b15b766af4accc
+  data.tar.gz: 1dc6216ac61f994bb72ce106c3717b03e8a5599330d1c9050683f2628277cbb3daa5d3038b1170e208013510133d8da2421c7bc6f9d2905cb1c1209505eda1fc

data/README.markdown

@@ -1,11 +1,12 @@
 # Gem in a Box – Really simple rubygem hosting
 [![Build Status](https://secure.travis-ci.org/geminabox/geminabox.png)](http://travis-ci.org/geminabox/geminabox)
 [![Gem Version](https://badge.fury.io/rb/geminabox.png)](http://badge.fury.io/rb/geminabox)
+[![Code Climate](https://codeclimate.com/github/geminabox/geminabox/badges/gpa.svg)](https://codeclimate.com/github/geminabox/geminabox)
 
 Geminabox lets you host your own gems, and push new gems to it just like with rubygems.org.
 The bundler dependencies API is supported out of the box.
 Authentication is left up to either the web server, or the Rack stack.
-For basic auth, try [Rack::Auth](http://rack.rubyforge.org/doc/Rack/Auth/Basic.html).
+For basic auth, try [Rack::Auth](http://www.rubydoc.info/github/rack/rack/Rack/Auth/Basic).
 
 ![screen shot](http://pics.tomlea.co.uk/bbbba6/geminabox.png)
 
@@ -48,6 +49,10 @@ Or in config.ru (before the run command), set:
 
     Geminabox.rubygems_proxy = true
 
+If you want Geminabox to carry on providing gems when rubygems.org is unavailable, add this to config.ru:
+
+    Geminabox.allow_remote_failure = true 
+
 ## HTTP adapter
 
 Geminabox uses the HTTPClient gem to manage its connections to remote resources.

data/lib/geminabox.rb

@@ -8,9 +8,13 @@ require 'rubygems/package'
 require 'rss/atom'
 require 'tempfile'
 require 'json'
+require 'tilt/erb'
 
 module Geminabox
 
+  class Error < StandardError ; end
+  class AlreadyLocked < Error ; end
+
   require_relative 'geminabox/version'
   require_relative 'geminabox/proxy'
   require_relative 'geminabox/http_adapter'
@@ -43,7 +47,10 @@ module Geminabox
       :allow_delete,
       :rubygems_proxy,
       :http_adapter,
-      :allow_remote_failure
+      :lockfile,
+      :retry_interval,
+      :allow_remote_failure,
+      :ruby_gems_url
     )
 
     def set_defaults(defaults)
@@ -73,7 +80,10 @@ module Geminabox
     rubygems_proxy:       (ENV['RUBYGEMS_PROXY'] == 'true'),
     allow_delete:         true,
     http_adapter:         HttpClientAdapter.new,
-    allow_remote_failure: false
+    lockfile:             '/tmp/geminabox.lockfile',
+    retry_interval:       60,
+    allow_remote_failure: false,
+    ruby_gems_url:        'https://rubygems.org/'
   )
     
 end

data/lib/geminabox/incoming_gem.rb

@@ -1,7 +1,7 @@
 module Geminabox
 
   class IncomingGem
-    def initialize(gem_data, root_path = Geminabox.settings.data)
+    def initialize(gem_data, root_path = Geminabox.data)
       unless gem_data.respond_to? :read
         raise ArgumentError, "Expected an instance of IO"
       end

data/lib/geminabox/indexer.rb

@@ -21,7 +21,7 @@ module Geminabox::Indexer
   end
 
   def self.updated_gemspecs(indexer)
-    specs_mtime = File.stat(indexer.dest_specs_index).mtime
+    specs_mtime = File.stat(indexer.dest_specs_index).mtime rescue Time.at(0)
     newest_mtime = Time.at 0
 
     updated_gems = indexer.gem_file_list.select do |gem|

data/lib/geminabox/proxy/hostess.rb

@@ -59,7 +59,7 @@ module Geminabox
         file = File.expand_path(File.join(Server.data, *request.path_info))
 
         unless File.exists?(file)
-          ruby_gems_url = 'http://production.cf.rubygems.org'
+          ruby_gems_url = Geminabox.ruby_gems_url
           path = File.join(ruby_gems_url, *request.path_info)
           content = Geminabox.http_adapter.get_content(path)
           GemStore.create(IncomingGem.new(StringIO.new(content)))

data/lib/geminabox/server.rb

@@ -16,7 +16,10 @@ module Geminabox
       :allow_replace,
       :gem_permissions,
       :allow_delete,
-      :rubygems_proxy
+      :lockfile,
+      :retry_interval,
+      :rubygems_proxy,
+      :ruby_gems_url
     )
 
     if Server.rubygems_proxy
@@ -53,12 +56,15 @@ module Geminabox
             Geminabox::Indexer.patch_rubygems_update_index_pre_1_8_25(indexer)
             indexer.update_index
             updated_gemspecs.each { |gem| dependency_cache.flush_key(gem.name) }
+          rescue Errno::ENOENT
+            reindex(:force_rebuild)
           rescue => e
             puts "#{e.class}:#{e.message}"
             puts e.backtrace.join("\n")
             reindex(:force_rebuild)
           end
         end
+      rescue Gem::SystemExitException
       end
 
       def indexer
@@ -100,8 +106,10 @@ module Geminabox
     end
 
     get '/reindex' do
-      self.class.reindex(:force_rebuild)
-      redirect url("/")
+      serialize_update do
+        self.class.reindex(:force_rebuild)
+        redirect url("/")
+      end
     end
 
     get '/gems/:gemname' do
@@ -115,22 +123,31 @@ module Geminabox
       unless self.class.allow_delete?
         error_response(403, 'Gem deletion is disabled - see https://github.com/cwninja/geminabox/issues/115')
       end
-      File.delete file_path if File.exists? file_path
-      self.class.reindex(:force_rebuild)
-      redirect url("/")
+
+      serialize_update do
+        File.delete file_path if File.exists? file_path
+        self.class.reindex(:force_rebuild)
+        redirect url("/")
+      end
+
     end
 
     post '/upload' do
-      unless params[:file] && params[:file][:filename] && (tmpfile = params[:file][:tempfile])
+      if params[:file] && params[:file][:filename] && (tmpfile = params[:file][:tempfile])
+        serialize_update do
+          handle_incoming_gem(Geminabox::IncomingGem.new(tmpfile))
+        end
+      else
         @error = "No file selected"
         halt [400, erb(:upload)]
       end
-      handle_incoming_gem(Geminabox::IncomingGem.new(tmpfile))
     end
 
     post '/api/v1/gems' do
       begin
-        handle_incoming_gem(Geminabox::IncomingGem.new(request.body))
+        serialize_update do
+          handle_incoming_gem(Geminabox::IncomingGem.new(request.body))
+        end
       rescue Object => o
         File.open "/tmp/debug.txt", "a" do |io|
           io.puts o, o.backtrace
@@ -140,6 +157,24 @@ module Geminabox
 
   private
 
+    def serialize_update(&block)
+      with_lock(&block)
+    rescue 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
+    end
+
     def handle_incoming_gem(gem)
       begin
         GemStore.create(gem, params[:overwrite])
@@ -155,7 +190,7 @@ module Geminabox
     end
 
     def api_request?
-      request.accept.first != "text/html"
+      request.accept.first.to_s != "text/html"
     end
 
     def error_response(code, message)

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.12.4' unless defined? VERSION
+  VERSION = '0.13.0' unless defined? VERSION
 end

data/views/atom.erb

@@ -4,6 +4,7 @@
   <title>Gem in a Box</title>
   <link href="<%= url '/atom.xml' %>" rel="self" />
   <link href="<%= url '/' %>" />
+  <author><name>Gem in a Box</name></author>
   <id><%= url '/atom.xml' %></id>
   <% @gems.by_name do |name, versions| %>
   <% newest_gem = versions.newest %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
 platform: ruby
 authors:
 - Tom Lea
@@ -10,104 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: builder
   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'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: nesty
   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'
 - !ruby/object:Gem::Dependency
   name: faraday
   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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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
-  name: pry
-  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'
 description: A sinatra based gem hosting app, with client side gem push style functionality.
@@ -122,63 +94,63 @@ extra_rdoc_files:
 files:
 - MIT-LICENSE
 - README.markdown
-- lib/rubygems_plugin.rb
-- lib/geminabox/version.rb
+- lib/geminabox.rb
+- lib/geminabox/disk_cache.rb
+- lib/geminabox/gem_list_merge.rb
+- lib/geminabox/gem_store.rb
 - lib/geminabox/gem_store_error.rb
-- lib/geminabox/incoming_gem.rb
 - lib/geminabox/gem_version.rb
+- lib/geminabox/gem_version_collection.rb
 - lib/geminabox/hostess.rb
+- lib/geminabox/http_adapter.rb
+- lib/geminabox/http_adapter/http_client_adapter.rb
+- lib/geminabox/http_adapter/template_faraday_adapter.rb
+- lib/geminabox/http_adapter_config_error.rb
+- lib/geminabox/incoming_gem.rb
 - lib/geminabox/indexer.rb
-- lib/geminabox/gem_list_merge.rb
-- lib/geminabox/rubygems_dependency.rb
 - lib/geminabox/proxy.rb
+- lib/geminabox/proxy/copier.rb
 - lib/geminabox/proxy/file_handler.rb
 - lib/geminabox/proxy/hostess.rb
-- lib/geminabox/proxy/copier.rb
 - lib/geminabox/proxy/splicer.rb
-- lib/geminabox/gem_version_collection.rb
-- lib/geminabox/http_adapter/http_client_adapter.rb
-- lib/geminabox/http_adapter/template_faraday_adapter.rb
+- lib/geminabox/rubygems_dependency.rb
 - lib/geminabox/server.rb
-- lib/geminabox/disk_cache.rb
-- lib/geminabox/http_adapter.rb
-- lib/geminabox/http_adapter_config_error.rb
-- lib/geminabox/gem_store.rb
-- lib/rubygems/commands/inabox_command.rb
+- lib/geminabox/version.rb
 - lib/geminabox_client.rb
-- lib/geminabox.rb
-- public/master.js
-- public/master.css
-- public/jquery.js
+- lib/rubygems/commands/inabox_command.rb
+- lib/rubygems_plugin.rb
 - public/favicon.ico
+- public/jquery.js
+- public/master.css
+- public/master.js
 - views/atom.erb
 - views/gem.erb
-- views/upload.erb
-- views/layout.erb
 - views/index.erb
+- views/layout.erb
+- views/upload.erb
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses:
 - MIT-LICENSE
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.markdown
 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.1.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Really simple rubygem hosting