geminabox 0.10.1 → 0.11.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/README.markdown

@@ -1,19 +1,20 @@
 # Gem in a Box – Really simple rubygem hosting
-##
+[![Build Status](https://secure.travis-ci.org/cwninja/geminabox.png)](http://travis-ci.org/cwninja/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.
 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).
 
-
-[![Build Status](https://secure.travis-ci.org/cwninja/geminabox.png)](http://travis-ci.org/cwninja/geminabox)
-
-
 ![screen shot](http://pics.tomlea.co.uk/bbbba6/geminabox.png)
 
+## System Requirements
 
+    Tested on Mac OS X 10.8.2
+    Ruby 1.9.3-392
 
+    Tests fail on Ruby 2.0.0-p0
 
 ## Server Setup
 
@@ -27,7 +28,7 @@ Create a config.ru as follows:
     Geminabox.data = "/var/geminabox-data" # ... or wherever
     run Geminabox
 
-And finally, hook up the config.ru as you normally would ([passenger][passenger], [thin][thin], [unicorn][unicorn], whatever floats your boat).
+Start your gem server with 'rackup' to run WEBrick or hook up the config.ru as you normally would ([passenger][passenger], [thin][thin], [unicorn][unicorn], whatever floats your boat).
 
 ## Legacy RubyGems index
 
@@ -43,14 +44,42 @@ RubyGems supports generating indexes for the so called legacy versions (< 1.2),
 
 Configure Gem in a box (interactive prompt to specify where to upload to):
 
-    geminabox -c
+    gem inabox -c
 
 Change the host to upload to:
 
-    geminabox -g HOST
+    gem inabox -g HOST
 
 Simples!
 
+## Command Line Help
+
+    Usage: gem inabox GEM [options]
+
+      Options:
+        -c, --configure                  Configure GemInABox
+        -g, --host HOST                  Host to upload to.
+        -o, --overwrite                  Overwrite Gem.
+
+
+      Common Options:
+        -h, --help                       Get help on this command
+        -V, --[no-]verbose               Set the verbose level of output
+        -q, --quiet                      Silence commands
+            --config-file FILE           Use this config file instead of default
+            --backtrace                  Show stack backtrace on errors
+            --debug                      Turn on Ruby debugging
+
+
+      Arguments:
+        GEM       built gem to push up
+
+      Summary:
+        Push a gem up to your GemInABox
+
+      Description:
+        Push a gem up to your GemInABox
+
 ## Licence
 
 Fork it, mod it, choose it, use it, make it better. All under the [do what the fuck you want to + beer/pizza public license][WTFBPPL].

data/lib/geminabox.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'digest/md5'
 require 'builder'
 require 'sinatra/base'
-require 'rubygems/builder'
 require 'rubygems/indexer'
 require 'rubygems/package'
 require 'hostess'
@@ -20,6 +19,7 @@ class Geminabox < Sinatra::Base
   set :views, File.join(File.dirname(__FILE__), *%w[.. views])
   set :allow_replace, false
   set :gem_permissions, 0644
+  set :allow_delete, true
   use Hostess
 
   class << self
@@ -27,6 +27,10 @@ class Geminabox < Sinatra::Base
       ! allow_replace
     end
 
+    def allow_delete?
+      allow_delete
+    end
+
     def fixup_bundler_rubygems!
       return if @post_reset_hook_applied
       Gem.post_reset{ Gem::Specification.all = nil } if defined? Bundler and Gem.respond_to? :post_reset
@@ -54,23 +58,8 @@ class Geminabox < Sinatra::Base
     erb :atom, :layout => false
   end
 
-  # Return a list of versions of gem 'gem_name' with the dependencies of each version.
-  def gem_dependencies(gem_name)
-    dependency_cache.marshal_cache(gem_name) do
-      load_gems.select {|gem| gem_name == gem.name }.map do |gem|
-        spec = spec_for(gem.name, gem.number)
-        {
-          :name => gem.name,
-          :number => gem.number.version,
-          :platform => gem.platform,
-          :dependencies => spec.dependencies.select {|dep| dep.type == :runtime}.map {|dep| [dep.name, dep.requirement.to_s] }
-        }
-      end
-    end
-  end
-
   get '/api/v1/dependencies' do
-    query_gems = params[:gems].split(',')
+    query_gems = params[:gems].to_s.split(',')
     deps = query_gems.inject([]){|memo, query_gem| memo + gem_dependencies(query_gem) }
     Marshal.dump(deps)
   end
@@ -92,6 +81,9 @@ class Geminabox < Sinatra::Base
   end
 
   delete '/gems/*.gem' do
+    unless Geminabox.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
     reindex(:force_rebuild)
     redirect url("/")
@@ -120,7 +112,7 @@ private
   def handle_incoming_gem(gem)
     prepare_data_folders
     error_response(400, "Cannot process gem") unless gem.valid?
-    handle_replacement(gem)
+    handle_replacement(gem) unless params[:overwrite] == "true"
     write_and_index(gem)
 
     if api_request?
@@ -170,7 +162,7 @@ HTML
       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.")
+        error_response(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to ovewrite.")
       end
     end
   end
@@ -253,5 +245,30 @@ HTML
       spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")
       Marshal.load(Gem.inflate(File.read(spec_file))) if File.exists? spec_file
     end
+
+    # Return a list of versions of gem 'gem_name' with the dependencies of each version.
+    def gem_dependencies(gem_name)
+      dependency_cache.marshal_cache(gem_name) do
+        load_gems.
+          select { |gem| gem_name == gem.name }.
+          map    { |gem| [gem, spec_for(gem.name, gem.number)] }.
+          reject { |(_, spec)| spec.nil? }.
+          map do |(gem, spec)|
+            {
+              :name => gem.name,
+              :number => gem.number.version,
+              :platform => gem.platform,
+              :dependencies => runtime_dependencies(spec)
+            }
+          end
+      end
+    end
+
+    def runtime_dependencies(spec)
+      spec.
+        dependencies.
+        select { |dep| dep.type == :runtime }.
+        map    { |dep| [dep.name, dep.requirement.to_s] }
+    end
   end
 end

data/lib/geminabox/incoming_gem.rb

@@ -33,16 +33,26 @@ class Geminabox::IncomingGem
   end
 
   def spec
-    unless @spec
+    @spec ||= extract_spec
+  end
+
+  def extract_spec
+    if Gem::Package.respond_to? :open
       Gem::Package.open(gem_data, "r", nil) do |pkg|
-        @spec = pkg.metadata
+        return pkg.metadata
       end
+    else
+      Gem::Package.new(@tempfile.path).spec
     end
-    @spec
   end
 
   def name
-    "#{spec.name}-#{spec.version}.gem"
+    unless @name
+      filename = %W[#{spec.name} #{spec.version}]
+      filename.push(spec.platform) if spec.platform && spec.platform != "ruby"
+      @name = filename.join("-") + ".gem"
+    end
+    @name
   end
 
   def dest_filename

data/lib/geminabox/version.rb

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

data/lib/geminabox_client.rb

@@ -26,8 +26,8 @@ class GeminaboxClient
     url + path.to_s
   end
 
-  def push(gemfile)
-    response = http_client.post(url_for(:upload), {'file' => File.open(gemfile, "rb")}, {'Accept' => 'text/plain'})
+  def push(gemfile, options = {})
+    response = http_client.post(url_for(:upload), { 'file' => File.open(gemfile, "rb"), 'overwrite' => !!options[:overwrite] }, { 'Accept' => 'text/plain' })
 
     if response.status < 300
       response.body

data/lib/rubygems/commands/inabox_command.rb

@@ -23,6 +23,10 @@ class Gem::Commands::InaboxCommand < Gem::Command
     add_option('-g', '--host HOST', "Host to upload to.") do |value, options|
       options[:host] = value
     end
+
+    add_option('-o', '--overwrite', "Overwrite Gem.") do |value, options|
+      options[:overwrite] = true
+    end
   end
 
   def last_minute_requires!
@@ -51,7 +55,7 @@ class Gem::Commands::InaboxCommand < Gem::Command
     gemfiles.each do |gemfile|
       say "Pushing #{File.basename(gemfile)} to #{client.url}..."
       begin
-        say client.push(gemfile)
+        say client.push(gemfile, options)
       rescue GeminaboxClient::Error => e
         alert_error e.message
         terminate_interaction(1)

metadata

@@ -1,159 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geminabox
-version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 1
-  version: 0.10.1
+version: !ruby/object:Gem::Version
+  version: 0.11.0
 platform: ruby
-authors: 
+authors:
 - Tom Lea
+- Jack Foy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: builder
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: httpclient
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 2
-        - 7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.7
   type: :runtime
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.7
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rack-test
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: capybara
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: capybara-mechanize
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id009
   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
+email:
+- contrib@tomlea.co.uk
+- jack@foys.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - lib/geminabox/disk_cache.rb
 - lib/geminabox/gem_version.rb
@@ -177,37 +169,27 @@ files:
 - views/upload.erb
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Really simple rubygem hosting
 test_files: []
-