geminabox 0.5.2 → 0.6.0

data/README.markdown

@@ -1,12 +1,18 @@
-# Gem in a Box
+# Gem in a Box – Really simple rubygem hosting
+## 
 
-![screen shot](http://pics.tomlea.co.uk/55c320/geminabox.png)
+Geminabox let's 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 it 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).
+
+
+
+
+![screen shot](http://pics.tomlea.co.uk/bbbba6/geminabox.png)
 
-## Really simple rubygem hosting
 
-Gem in a box is a simple [sinatra][sinatra] app to allow you to host your own in-house gems.
 
-It has no security, or authentication so you should handle this yourself.
 
 ## Server Setup
 
@@ -17,7 +23,7 @@ Create a config.ru as follows:
     require "rubygems"
     require "geminabox"
 
-    Geminabox.data = "/var/geminabox-data" # …or wherever
+    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).

data/lib/geminabox.rb

@@ -1,10 +1,9 @@
 require 'rubygems'
-require "digest/md5"
-require "builder"
+require 'digest/md5'
+require 'builder'
 require 'sinatra/base'
 require 'rubygems/builder'
-require "rubygems/indexer"
-
+require 'rubygems/indexer'
 require 'hostess'
 
 class Geminabox < Sinatra::Base
@@ -43,6 +42,20 @@ class Geminabox < Sinatra::Base
     erb :atom, :layout => false
   end
 
+  get '/api/v1/dependencies' do
+    query_gems = params[:gems].split(',')
+    deps = load_gems.gems.select {|gem| query_gems.include?(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
+    Marshal.dump(deps)
+  end
+
   get '/upload' do
     erb :upload
   end
@@ -59,27 +72,37 @@ class Geminabox < Sinatra::Base
   end
 
   post '/upload' do
-    return "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server." unless File.writable? Geminabox.data
+    if File.exists? Geminabox.data
+      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server." ) unless File.writable? Geminabox.data
+      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is a directory." ) unless File.directory? 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
+
     unless params[:file] && (tmpfile = params[:file][:tempfile]) && (name = params[:file][:filename])
       @error = "No file selected"
-      return erb(:upload)
+      halt [400, erb(:upload)]
     end
 
-    tmpfile.binmode
+    FileUtils.mkdir_p(File.join(settings.data, "gems"))
 
-    Dir.mkdir(File.join(settings.data, "gems")) unless File.directory? File.join(settings.data, "gems")
-
-    dest_filename = File.join(settings.data, "gems", File.basename(name))
+    tmpfile.binmode
 
+    gem_name = File.basename(name)
+    dest_filename = File.join(settings.data, "gems", gem_name)
 
     if Geminabox.disallow_replace? and File.exist?(dest_filename)
       existing_file_digest = Digest::SHA1.file(dest_filename).hexdigest
       tmpfile_digest = Digest::SHA1.file(tmpfile.path).hexdigest
 
       if existing_file_digest != tmpfile_digest
-        return error_response(409, "Gem already exists, you must delete the existing version first.")
+        error_response(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
       else
-        return [200, "Ignoring upload, you uploaded the same thing previously."]
+        error_response(200, "Ignoring upload, you uploaded the same thing previously.")
       end
     end
 
@@ -89,12 +112,22 @@ class Geminabox < Sinatra::Base
       end
     end
     reindex
-    redirect url("/")
+
+    if api_request?
+      "Gem #{gem_name} received and indexed."
+    else
+      redirect url("/")
+    end
   end
 
 private
 
+  def api_request?
+    request.accept.first == "text/plain"
+  end
+
   def error_response(code, message)
+    halt [code, message] if api_request?
     html = <<HTML
 <html>
   <head><title>Error - #{code}</title></head>
@@ -104,7 +137,7 @@ private
   </body>
 </html>
 HTML
-    [code, html]
+    halt [code, html]
   end
 
   def reindex(force_rebuild = false)
@@ -132,13 +165,14 @@ HTML
   end
 
   def load_gems
-    %w(specs prerelease_specs).inject(GemVersionCollection.new){|gems, specs_file_type|
-      specs_file_path = File.join(settings.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
-      if File.exists?(specs_file_path)
-        gems |= Geminabox::GemVersionCollection.new(Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path))))
-      end
-      gems
-    }
+    @loaded_gems ||=
+      %w(specs prerelease_specs).inject(GemVersionCollection.new){|gems, specs_file_type|
+        specs_file_path = File.join(settings.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
+        if File.exists?(specs_file_path)
+          gems |= Geminabox::GemVersionCollection.new(Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path))))
+        end
+        gems
+      }
   end
 
   def index_gems(gems)

data/lib/geminabox_client.rb

@@ -0,0 +1,58 @@
+require 'uri'
+require 'httpclient'
+
+class GeminaboxClient
+  attr_reader :url, :http_client
+
+  def initialize(url)
+    extract_username_and_password_from_url!(url)
+    @http_client = HTTPClient.new
+    @http_client.set_auth(url_for(:upload), @username, @password) if @username or @password
+    @http_client.www_auth.basic_auth.challenge(url_for(:upload)) # Workaround: https://github.com/nahi/httpclient/issues/63
+    @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  end
+
+  def extract_username_and_password_from_url!(url)
+    uri = URI.parse(url.to_s)
+    @username, @password = uri.user, uri.password
+    uri.user = uri.password = nil
+    uri.path = uri.path + "/" unless uri.path.end_with?("/")
+    @url = uri.to_s
+  end
+
+  def url_for(path)
+    url + path.to_s
+  end
+
+  def push(gemfile)
+    response = http_client.post(url_for(:upload), {'file' => File.open(gemfile, "rb")}, {'Accept' => 'text/plain'})
+
+    if response.status < 400
+      response.body
+    else
+      raise GeminaboxClient::Error, "Error (#{response.code} received)\n\n#{response.body}"
+    end
+  end
+
+end
+
+class GeminaboxClient::Error < RuntimeError
+end
+
+module GeminaboxClient::GemLocator
+  def find_gem(dir)
+    gemname = File.split(dir).last
+    glob_matcher = "{pkg/,}#{gemname}-*.gem"
+    latest_gem_for(gemname, Dir.glob(glob_matcher)) or raise Gem::CommandLineError, NO_GEM_PROVIDED_ERROR_MESSAGE
+  end
+
+  def latest_gem_for(gemname, files)
+    regexp_matcher = %r{(?:pkg/)#{gemname}-(#{Gem::Version::VERSION_PATTERN})\.gem}
+    sorter = lambda{|v| Gem::Version.new(regexp_matcher.match(v)[1]) }
+    files.grep(regexp_matcher).max_by(&sorter)
+  end
+
+  extend self
+
+  NO_GEM_PROVIDED_ERROR_MESSAGE = "Couldn't find a gem in pkg, please specify a gem name on the command line (e.g. gem inabox GEMNAME)"
+end

data/lib/rubygems/commands/inabox_command.rb

@@ -1,5 +1,4 @@
-require 'uri'
-require 'yaml'
+require 'rubygems/command'
 
 class Gem::Commands::InaboxCommand < Gem::Command
   def description
@@ -26,70 +25,40 @@ class Gem::Commands::InaboxCommand < Gem::Command
     end
   end
 
+  def last_minute_requires!
+    require 'yaml'
+    require File.expand_path("../../../geminabox_client.rb", __FILE__)
+  end
+
   def execute
+    last_minute_requires!
     return configure if options[:configure]
-    setup
-    send_gem
-  end
+    configure unless geminabox_host
 
-  def setup
     if options[:args].size == 0
-      @gemfiles = [find_gem]
+      say "You didn't specify a gem, looking for one in . and in ./pkg/..."
+      gemfiles = [GeminaboxClient::GemLocator.find_gem(Dir.pwd)]
     else
-      @gemfiles = get_all_gem_names
+      gemfiles = get_all_gem_names
     end
-    configure unless geminabox_host
-  end
 
-  def find_gem
-    say "You didn't specify a gem, looking for one in pkg..."
-    path, directory = File.split(Dir.pwd)
-    possible_gems = Dir.glob("pkg/#{directory}-*.gem")
-    raise Gem::CommandLineError, "Couldn't find a gem in pkg, please specify a gem name on the command line (e.g. gem inabox GEMNAME)" unless possible_gems.any?
-    name_regexp = Regexp.new("^pkg/#{directory}-")
-    possible_gems.sort_by{ |a| Gem::Version.new(a.sub(name_regexp,'')) }.last
+    send_gems(gemfiles)
   end
 
-  def send_gem
-    # sanitize printed URL if a password is present
-    url = URI.join(geminabox_host, "upload")
-
-    url_for_presentation = url.clone
-    url_for_presentation.password = '***' if url_for_presentation.password
-
+  def send_gems(gemfiles)
+    client = GeminaboxClient.new(geminabox_host)
 
-    @gemfiles.each do |gemfile|
-      say "Pushing #{File.basename(gemfile)} to #{url_for_presentation}..."
-
-      File.open(gemfile, "rb") do |file|
-        request_body, request_headers = Multipart::MultipartPost.new.prepare_query("file" => file)
-
-        proxy.start(url.host, url.port) {|con|
-          req = Net::HTTP::Post.new(url.path, request_headers)
-          req.basic_auth(url.user, url.password) if url.user
-          handle_response(con.request(req, request_body))
-        }
+    gemfiles.each do |gemfile|
+      say "Pushing #{File.basename(gemfile)} to #{client.url}..."
+      begin
+        say client.push(gemfile)
+      rescue GeminaboxClient::Error => e
+        alert_error e.message
+        terminate_interaction(1)
       end
     end
   end
 
-  def proxy
-    if proxy_info = ENV['http_proxy'] || ENV['HTTP_PROXY'] and uri = URI.parse(proxy_info)
-      Net::HTTP::Proxy(uri.host, uri.port, uri.user, uri.password)
-    else
-      Net::HTTP
-    end
-  end
-
-  def handle_response(response)
-    case response
-    when Net::HTTPSuccess, Net::HTTPRedirection
-      puts response.body
-    else
-      response.error!
-    end
-  end
-
   def config_path
     File.join(Gem.user_home, '.gem', 'geminabox')
   end
@@ -115,51 +84,4 @@ class Gem::Commands::InaboxCommand < Gem::Command
     end
   end
 
-  module Multipart
-    require 'net/http'
-    require 'cgi'
-
-    class Param
-      attr_accessor :k, :v
-      def initialize( k, v )
-        @k = k
-        @v = v
-      end
-
-      def to_multipart
-        return "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n#{v}\r\n"
-      end
-    end
-
-    class FileParam
-      attr_accessor :k, :filename, :content
-      def initialize( k, filename, content )
-        @k = k
-        @filename = filename
-        @content = content
-      end
-
-      def to_multipart
-        return "Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{filename}\"\r\n" + "Content-Transfer-Encoding: binary\r\n" + "Content-Type: application/octet-stream\r\n\r\n" + content + "\r\n"
-      end
-    end
-
-    class MultipartPost
-      BOUNDARY = 'tarsiers-rule0000'
-      HEADER = {"Content-type" => "multipart/form-data, boundary=" + BOUNDARY + " "}
-
-      def prepare_query(params)
-        fp = []
-        params.each {|k,v|
-          if v.respond_to?(:read)
-            fp.push(FileParam.new(k, v.path, v.read))
-          else
-            fp.push(Param.new(k,v))
-          end
-        }
-        query = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("") + "--" + BOUNDARY + "--"
-        return query, HEADER
-      end
-    end
-  end
 end

data/lib/rubygems_plugin.rb

@@ -1,7 +1 @@
-require 'rubygems/command_manager'
-
-require 'rubygems/command'
-require 'rubygems/dependency'
-require 'rubygems/version_option'
-
 Gem::CommandManager.instance.register_command :inabox

data/views/index.erb

@@ -24,7 +24,7 @@
 
         <div class="details">
           <p>
-            <% if spec = spec_for(name, versions.first.number) %>
+            <% if spec = spec_for(name, versions.newest.number) %>
               <%= spec.description %>
               <br/>
               <span class="author">– <%= spec.authors.map do |author|

data/views/layout.erb

@@ -9,7 +9,11 @@
     <div id="content">
       <h1>Gem in a Box</h1>
       <p>
+      <small>If you did not need any credentials to get to this page</small>
         <pre><code>gem sources -a <%= url "/" %></code></pre>
+      <small>If you needed some credentials to get to this page</small>
+        <pre><code>gem sources -a <%= url.to_s.gsub('://','://username:password@') %></code></pre>
+      <small>and then ...</small>
         <pre><code>gem install geminabox<br />gem inabox [gemfile]</code></pre>
       </p>
       <%= yield %>

metadata

@@ -1,77 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geminabox
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Tom Lea
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-03-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
+  requirement: &70215540161800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+  version_requirements: *70215540161800
+- !ruby/object:Gem::Dependency
   name: builder
+  requirement: &70215540161340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70215540161340
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &70215540160880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70215540160880
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &70215540160460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70215540160460
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70215540160040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: *70215540160040
 description: A sinatra based gem hosting app, with client side gem push style functionality.
 email: contrib@tomlea.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - lib/geminabox/gem_version.rb
 - lib/geminabox/gem_version_collection.rb
 - lib/geminabox.rb
+- lib/geminabox_client.rb
 - lib/hostess.rb
 - lib/rubygems/commands/inabox_command.rb
 - lib/rubygems_plugin.rb
@@ -85,37 +91,34 @@ files:
 - views/upload.erb
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3189528604600378611
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3189528604600378611
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Really simple rubygem hosting
 test_files: []
-