geminabox 0.11.0 → 0.11.1

data/README.markdown

@@ -1,5 +1,5 @@
 # Gem in a Box – Really simple rubygem hosting
-[![Build Status](https://secure.travis-ci.org/cwninja/geminabox.png)](http://travis-ci.org/cwninja/geminabox)
+[![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)
 
 Geminabox lets you host your own gems, and push new gems to it just like with rubygems.org.
@@ -38,6 +38,12 @@ RubyGems supports generating indexes for the so called legacy versions (< 1.2),
 
 ## Client Usage
 
+Since version 0.10, Geminabox supports the standard gemcutter push API:
+
+    gem push pkg/my-awesome-gem-1.0.gem --host HOST
+
+You can also use the gem plugin:
+
     gem install geminabox
 
     gem inabox pkg/my-awesome-gem-1.0.gem

data/lib/geminabox.rb

@@ -6,6 +6,8 @@ require 'rubygems/indexer'
 require 'rubygems/package'
 require 'hostess'
 require 'geminabox/version'
+require 'geminabox/gem_store'
+require 'geminabox/gem_store_error'
 require 'rss/atom'
 require 'tempfile'
 
@@ -36,6 +38,35 @@ class Geminabox < Sinatra::Base
       Gem.post_reset{ Gem::Specification.all = nil } if defined? Bundler and Gem.respond_to? :post_reset
       @post_reset_hook_applied = true
     end
+
+    def reindex(force_rebuild = false)
+      Geminabox.fixup_bundler_rubygems!
+      force_rebuild = true unless Geminabox.incremental_updates
+      if force_rebuild
+        indexer.generate_index
+        dependency_cache.flush
+      else
+        begin
+          require 'geminabox/indexer'
+          updated_gemspecs = Geminabox::Indexer.updated_gemspecs(indexer)
+          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 => e
+          puts "#{e.class}:#{e.message}"
+          puts e.backtrace.join("\n")
+          reindex(:force_rebuild)
+        end
+      end
+    end
+
+    def indexer
+      Gem::Indexer.new(Geminabox.data, :build_legacy => Geminabox.build_legacy)
+    end
+
+    def dependency_cache
+      @dependency_cache ||= Geminabox::DiskCache.new(File.join(Geminabox.data, "_cache"))
+    end
   end
 
   autoload :GemVersionCollection, "geminabox/gem_version_collection"
@@ -69,7 +100,7 @@ class Geminabox < Sinatra::Base
   end
 
   get '/reindex' do
-    reindex(:force_rebuild)
+    self.class.reindex(:force_rebuild)
     redirect url("/")
   end
 
@@ -85,7 +116,7 @@ class Geminabox < Sinatra::Base
       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
-    reindex(:force_rebuild)
+    self.class.reindex(:force_rebuild)
     redirect url("/")
   end
 
@@ -110,10 +141,11 @@ class Geminabox < Sinatra::Base
 private
 
   def handle_incoming_gem(gem)
-    prepare_data_folders
-    error_response(400, "Cannot process gem") unless gem.valid?
-    handle_replacement(gem) unless params[:overwrite] == "true"
-    write_and_index(gem)
+    begin
+      GemStore.create(gem, params[:overwrite])
+    rescue GemStoreError => error
+      error_response error.code, error.reason
+    end
 
     if api_request?
       "Gem #{gem.name} received and indexed."
@@ -140,64 +172,6 @@ HTML
     halt [code, html]
   end
 
-  def prepare_data_folders
-    if File.exists? Geminabox.data
-      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is a directory." ) unless File.directory? Geminabox.data
-      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server." ) unless File.writable? Geminabox.data
-    else
-      begin
-        FileUtils.mkdir_p(settings.data)
-      rescue Errno::EACCES, Errno::ENOENT, RuntimeError => e
-        error_response( 500, "Could not create #{File.expand_path(Geminabox.data)}.\n#{e}\n#{e.message}" )
-      end
-    end
-
-    FileUtils.mkdir_p(File.join(settings.data, "gems"))
-  end
-
-  def handle_replacement(gem)
-    if Geminabox.disallow_replace? and File.exist?(gem.dest_filename)
-      existing_file_digest = Digest::SHA1.file(gem.dest_filename).hexdigest
-
-      if existing_file_digest != gem.hexdigest
-        error_response(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
-      else
-        error_response(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to ovewrite.")
-      end
-    end
-  end
-
-  def write_and_index(gem)
-    tmpfile = gem.gem_data
-    atomic_write(gem.dest_filename) do |f|
-      while blk = tmpfile.read(65536)
-        f << blk
-      end
-    end
-    reindex
-  end
-
-  def reindex(force_rebuild = false)
-    Geminabox.fixup_bundler_rubygems!
-    force_rebuild = true unless settings.incremental_updates
-    if force_rebuild
-      indexer.generate_index
-      dependency_cache.flush
-    else
-      begin
-        require 'geminabox/indexer'
-        updated_gemspecs = Geminabox::Indexer.updated_gemspecs(indexer)
-        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 => e
-        puts "#{e.class}:#{e.message}"
-        puts e.backtrace.join("\n")
-        reindex(:force_rebuild)
-      end
-    end
-  end
-
   def indexer
     Gem::Indexer.new(settings.data, :build_legacy => settings.build_legacy)
   end
@@ -229,17 +203,6 @@ HTML
     Set.new(gems.map{|gem| gem.name[0..0].downcase})
   end
 
-  # based on http://as.rubyonrails.org/classes/File.html
-  def atomic_write(file_name)
-    temp_dir = File.join(settings.data, "_temp")
-    FileUtils.mkdir_p(temp_dir)
-    temp_file = Tempfile.new("." + File.basename(file_name), temp_dir)
-    yield temp_file
-    temp_file.close
-    File.rename(temp_file.path, file_name)
-    File.chmod(settings.gem_permissions, file_name)
-  end
-
   helpers do
     def spec_for(gem_name, version)
       spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")

data/lib/geminabox/gem_store.rb

@@ -0,0 +1,97 @@
+
+
+class GemStore
+  attr_accessor :gem, :overwrite
+
+  def self.create(gem, overwrite = false)
+    gem_store = new(gem, overwrite)
+    gem_store.save
+  end
+  
+  def initialize(gem, overwrite = false)
+    @gem = gem
+    @overwrite = overwrite && overwrite == 'true'
+  end
+
+  def save
+    ensure_gem_valid
+    prepare_data_folders
+    check_replacement_status
+    write_and_index
+  end
+
+  def prepare_data_folders
+    ensure_existing_data_folder_compatible
+    begin
+      FileUtils.mkdir_p(File.join(Geminabox.data, "gems"))
+    rescue
+      raise GemStoreError.new(
+        500,
+        "Could not create #{File.expand_path(Geminabox.data)}."
+      )
+    end
+  end
+
+  def check_replacement_status
+    if !overwrite and Geminabox.disallow_replace? and File.exist?(gem.dest_filename)
+      if existing_file_digest != gem.hexdigest
+        raise GemStoreError.new(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
+      else
+        raise GemStoreError.new(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to ovewrite.")
+      end
+    end
+  end
+
+  def ensure_gem_valid
+    raise GemStoreError.new(400, "Cannot process gem") unless gem.valid?
+  end
+
+  private
+  def ensure_existing_data_folder_compatible
+    if File.exists? Geminabox.data
+      ensure_data_folder_is_directory
+      ensure_data_folder_is_writable
+    end
+  end
+
+  def ensure_data_folder_is_directory
+    raise GemStoreError.new(
+      500,
+      "Please ensure #{File.expand_path(Geminabox.data)} is a directory."
+    ) unless File.directory? Geminabox.data
+  end
+
+  def ensure_data_folder_is_writable
+    raise GemStoreError.new(
+      500,
+      "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server."
+    ) unless File.writable? Geminabox.data
+  end
+
+  def existing_file_digest
+    Digest::SHA1.file(gem.dest_filename).hexdigest
+  end
+
+  def write_and_index
+    tmpfile = gem.gem_data
+    atomic_write(gem.dest_filename) do |f|
+      while blk = tmpfile.read(65536)
+        f << blk
+      end
+    end
+    Geminabox.reindex
+  end
+
+  # based on http://as.rubyonrails.org/classes/File.html
+  def atomic_write(file_name)
+    temp_dir = File.join(Geminabox.data, "_temp")
+    FileUtils.mkdir_p(temp_dir)
+    temp_file = Tempfile.new("." + File.basename(file_name), temp_dir)
+    temp_file.binmode
+    yield temp_file
+    temp_file.close
+    File.rename(temp_file.path, file_name)
+    File.chmod(Geminabox.gem_permissions, file_name)
+  end
+
+end

data/lib/geminabox/gem_store_error.rb

@@ -0,0 +1,12 @@
+require 'nesty'
+
+class GemStoreError < StandardError
+  attr_reader :code, :reason
+
+  include Nesty::NestedError
+
+  def initialize(code, reason)
+    @code = code.to_s
+    @reason = reason
+  end
+end

data/lib/geminabox/version.rb

@@ -1 +1 @@
-GeminaboxVersion = '0.11.0' unless defined? GeminaboxVersion
+GeminaboxVersion = '0.11.1' unless defined? GeminaboxVersion

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
+  prerelease: 
 platform: ruby
 authors:
 - Tom Lea
@@ -9,25 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,13 +55,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.7
+- !ruby/object:Gem::Dependency
+  name: nesty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -91,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,6 +127,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,6 +135,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,6 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-mechanize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +151,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,6 +159,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,6 +167,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -147,29 +182,30 @@ extra_rdoc_files:
 - README.markdown
 files:
 - README.markdown
-- lib/geminabox/disk_cache.rb
-- lib/geminabox/gem_version.rb
-- lib/geminabox/gem_version_collection.rb
+- lib/rubygems_plugin.rb
+- lib/hostess.rb
+- lib/geminabox/version.rb
+- lib/geminabox/gem_store_error.rb
 - lib/geminabox/incoming_gem.rb
+- lib/geminabox/gem_version.rb
 - lib/geminabox/indexer.rb
-- lib/geminabox/version.rb
-- lib/geminabox.rb
-- lib/geminabox_client.rb
-- lib/hostess.rb
+- lib/geminabox/gem_version_collection.rb
+- lib/geminabox/disk_cache.rb
+- lib/geminabox/gem_store.rb
 - lib/rubygems/commands/inabox_command.rb
-- lib/rubygems_plugin.rb
-- public/favicon.ico
-- public/jquery.js
-- public/master.css
+- lib/geminabox_client.rb
+- lib/geminabox.rb
 - public/master.js
+- public/master.css
+- public/jquery.js
+- public/favicon.ico
 - views/atom.erb
 - views/gem.erb
-- views/index.erb
-- views/layout.erb
 - views/upload.erb
+- views/layout.erb
+- views/index.erb
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -177,19 +213,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Really simple rubygem hosting
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2QyZTI0YzVmMDBkZmRjNzAxOTcyNGU5Mzc1ZWE5MzQxZGYyMDUwMw==
-  data.tar.gz: !binary |-
-    YmFkNzRmNDAyMGI5NzMyMWI2OThjYTQyMGIyZGI0NDM4ZDY0YzQxNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Yjc5MTkzOWYxZDA2NWZlNWM2MDQxODQ0MWM3ODIyMWU3ZjY1ZTE1Y2VmMDNk
-    OTAyNGU2ZTc0NTQwN2FiNWI4OGVkYjliYjM2MjNmMTNjOTI0MDE4OTcxYjY0
-    NDc4MmM3NGI1MDU0MDBmYWZkNmQ2MTYxNGZmMzA3ODhlZTljOTE=
-  data.tar.gz: !binary |-
-    NDQ5YTkzZjIzMWFlZWQ2YjQ4MTE4MWRlODFiNThiNDcwOTM2YTUzYzkyY2Rh
-    OWUxNzgxOTFiNjI1MGRhMmI1NzY5OWUyMDkyYjA0NzJmNTFjMWQ3ZWM1ZDY5
-    NjZjYzA5OGU5ZTU5OWZhMTMxYWNkOGIwMTY0Yjk4Y2U4N2FlNmY=