stickler 2.0.0a → 2.0.1

data/lib/stickler/middleware/helpers.rb

@@ -45,6 +45,38 @@ module Stickler::Middleware
         [ specs_by_repo.values ].flatten.sort
       end
 
+      #
+      # return the specs as a hash of lists, keyedy by gemname
+      #
+      def specs_by_name
+        specs_grouped_by_name( specs )
+      end
+
+      #
+      # Return all the specs as a hash of specs_by_name.  The keys
+      # in this case are the first character of the gem name
+      #
+      def specs_by_first_upcase_char
+        by_char = Hash.new{ |h,k| h[k] = Array.new }
+        specs.each do |spec|
+          by_char[spec.name[0...1].upcase] << spec
+        end
+
+        by_char.keys.each { |k| by_char[k] = specs_grouped_by_name(by_char[k]) }
+        return by_char
+      end
+
+      #
+      # Given a list of specs, this will group them by name
+      #
+      def specs_grouped_by_name( list )
+        by_name = Hash.new{ |h,k| h[k] = Array.new }
+        list.each do |spec|
+          by_name[spec.name.downcase] << spec
+        end
+        return by_name
+      end
+
       #
       # Append spec or array of specs to the current list of specs for this key.
       #

data/lib/stickler/middleware/index.rb

@@ -2,6 +2,9 @@ require 'sinatra'
 require 'stickler/middleware'
 require 'stickler/middleware/helpers'
 require 'stickler/repository/null'
+require 'stickler/spec_lite'
+require 'stickler/logable'
+require 'stickler/paths'
 
 module Stickler::Middleware
   # Index is a Rack middleware that passes all requests through except for those
@@ -45,10 +48,17 @@ module Stickler::Middleware
   class Index < ::Sinatra::Base
     include Stickler::Middleware::Helpers::Compression
     include Stickler::Middleware::Helpers::Specs
+    include Stickler::Logable
 
     # The respository of the Index is a Repository::Null
     attr_reader :repo
 
+    server_path = Stickler::Paths.lib_path( "stickler", "server" )
+
+    set :views,  File.join( server_path, "views" )
+    set :public, File.join( server_path, "public" )
+    set :static, true
+
     def initialize( app, opts = {} )
       @app           = app
       @repo          = ::Stickler::Repository::Null.new
@@ -62,10 +72,11 @@ module Stickler::Middleware
     end
 
     get '/' do
+      append_specs
       if @serve_indexes then 
         erb :index
       else
-        not_found
+        pass
       end
     end
 
@@ -106,9 +117,24 @@ module Stickler::Middleware
       name, version, platform = *params[:captures]
       spec = Stickler::SpecLite.new( name, version, platform )
       full_path = @repo.full_path_to_gem( spec )
-      if full_path then
-        content_type 'application/x-tar'
-        send_file( full_path )
+      if full_path and File.exist?( full_path )then
+        send_file( full_path, :type => "application/x-tar" )
+      else
+        pass
+      end
+    end
+
+    #
+    # Serve up a gemspec.  This is really only used by the child classes.
+    # an Index instance will never have any gemspecs to return
+    #
+    get %r{\A/quick/Marshal.#{Gem.marshal_version}/(.*?)-([0-9.]+)(-.*?)?\.gemspec\.rz\Z} do
+      name, version, platform, with_compression = *params[:captures]
+      spec = Stickler::SpecLite.new( name, version, platform )
+      full_path = @repo.full_path_to_specification( spec )
+      if full_path and File.exist?( full_path ) then
+        self.compression = :deflate # always compressed
+        marshal( eval( IO.read( full_path ) ) )
       else
         pass
       end

data/lib/stickler/middleware/mirror.rb

@@ -36,14 +36,20 @@ module Stickler::Middleware
 
       begin
         if spec = @repo.mirror( host , spec ) then
+          logger.info("Mirrored #{spec.file_name}")
           status 201
           response["Location"] = "/gems/#{spec.file_name}"
           nil
         else
+          logger.info( "Unable to find #{spec.full_name} at #{host}" )
           not_found "Unable to find gem [#{spec.full_name}] at source #{host}"
         end
-      rescue ::Stickler::Repository::Mirror::Error => e
-        error( 409, e.message )
+      rescue ::Stickler::Repository::Mirror::ConflictError => ce
+        logger.error( ce.message )
+        error( 409, ce.message )
+      rescue ::Stickler::Repository::Mirror::NotFoundError => nfe
+        logger.error( nfe.message )
+        not_found nfe.message
       end
     end
 
@@ -57,4 +63,3 @@ module Stickler::Middleware
   end
 end
 
-

data/lib/stickler/middleware/not_found.rb

@@ -1,10 +1,12 @@
 require 'stickler/middleware'
 module Stickler::Middleware
   #
-  # Idea completely taken from rack-contrib
+  # Idea completely taken from rack-contrib, it can function as a middleware
+  # also, and in that case, completely swallows all requests and returns the
+  # 4040 page.
   #
   class NotFound
-    def initialize
+    def initialize( app = nil )
       @body = <<-_
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

data/lib/stickler/paths.rb

@@ -0,0 +1,53 @@
+#--
+# Copyright (c) 2010 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+#
+module Stickler
+  #
+  # Access to various paths inside the project programatically
+  #
+  module Paths
+    #
+    # :call-seq:
+    #    Stickler::Paths.root_dir -> String
+    #
+    # Returns The full expanded path of the parent directory of +lib+
+    # going up the path from the current file.  A trailing File::SEPARATOR
+    # is guaranteed.
+    #
+    def self.root_dir
+      @root_dir ||=(
+        path_parts = ::File.expand_path(__FILE__).split(::File::SEPARATOR)
+        lib_index  = path_parts.rindex("lib")
+        @root_dir = path_parts[0...lib_index].join(::File::SEPARATOR) + ::File::SEPARATOR
+      )
+    end
+
+    #
+    # :call-seq:
+    #   Stickler::Paths.lib_path( *args ) -> String
+    #
+    # Returns The full expanded path of the +lib+ directory below
+    # _root_dir_.  All parameters passed in are joined onto the
+    # result. A trailing File::SEPARATOR is guaranteed if
+    # _args_ are *not* present.
+    #
+    def self.lib_path(*args)
+      self.sub_path("lib", *args)
+    end
+
+    #
+    # :call-seq:
+    #   Stickler::Paths.sub_path( sub, *args ) -> String
+    #
+    # Returns the full expanded path of the +sub+ directory below _root_dir.  All
+    # _arg_ parameters passed in are joined onto the result.  A trailing
+    # File::SEPARATOR is guaranteed if _args_ are *not* present.
+    #
+    def self.sub_path(sub,*args)
+      sp = ::File.join(root_dir, sub) + File::SEPARATOR
+      sp = ::File.join(sp, *args) if args
+    end
+  end
+end

data/lib/stickler/repository/local.rb

@@ -179,6 +179,18 @@ module Stickler::Repository
       File.join( gems_dir, spec.file_name )
     end
 
+    def full_path_to_specification( spec )
+      File.join( specifications_dir, spec.spec_file_name )
+    end
+
+    def gem_file_exist?( spec )
+      File.exist?( full_path_to_gem( spec ) )
+    end
+
+    def specification_file_exist?( spec )
+      File.exist?( full_path_to_specification( spec ) )
+    end
+
 
     private
 
@@ -188,10 +200,6 @@ module Stickler::Repository
       end
     end
 
-    def full_path_to_specification( spec )
-      File.join( specifications_dir, spec.spec_file_name )
-    end
-
     def install( spec, io )
       install_gem( spec, io )
       install_specification( spec )
@@ -231,14 +239,6 @@ module Stickler::Repository
       return true  if File.unlink( path ) > 0
     end
 
-    def gem_file_exist?( spec )
-      File.exist?( full_path_to_gem( spec ) )
-    end
-
-    def specification_file_exist?( spec )
-      File.exist?( full_path_to_specification( spec ) )
-    end
-
     def specification_from_gem_file( path )
       format = Gem::Format.from_file_by_path( path )
       return format.spec

data/lib/stickler/repository/mirror.rb

@@ -11,17 +11,22 @@ module Stickler::Repository
   # and store in the Local instance
   #
   class Mirror
-    class Error < ::Stickler::Repository::Error ; end
+    class ConflictError < ::Stickler::Repository::Error ; end
+    class NotFoundError < ::Stickler::Repository::Error ; end
 
     extend Forwardable
 
+    include Stickler::Logable
+
     def initialize( root_dir )
-      @root_dir = root_dir
-      @local_repo = ::Stickler::Repository::Local.new( @root_dir )
+      @local_repo = ::Stickler::Repository::Local.new( root_dir )
       @remote_repos = {}
     end
     def_delegators :@local_repo, :uri, :gems_uri, :uri_for_gem, :search_for, 
-                                 :push, :delete, :get, :open
+                                 :push, :delete, :get, :open, 
+                                 :specs, :latest_specs, :root_dir,
+                                 :last_modified_time, :full_path_to_gem,
+                                 :full_path_to_specification
 
     #
     # :call-seq:
@@ -32,17 +37,19 @@ module Stickler::Repository
     #
     def mirror( host, spec )
       specs = @local_repo.search_for( spec )
-      raise Error, "gem #{spec.full_name} already exists" unless specs.empty?
+      raise ConflictError, "gem #{spec.full_name} already exists" unless specs.empty?
 
       repo = remote_repo_for( host )
       repo.open( spec ) do |io|
         @local_repo.add( io )
       end
+      raise NotFoundError, "Unable to find gem #{spec.full_name} on #{host}" unless @local_repo.gem_file_exist?( spec )
+      logger.info( "Downloaded #{spec.full_name} from #{host} and adding to repo" )
       return spec 
     end
 
     def remote_repo_for( host )
-      @remote_repos[host] ||= ::Stickler::Repository::Remote.new( host )
+      @remote_repos[host] ||= ::Stickler::Repository::Remote.new( host, :debug => true )
     end
   end
 end

data/lib/stickler/repository/null.rb

@@ -32,6 +32,7 @@ module Stickler::Repository
     alias :open :nilish
     alias :uri_for_gem :nilish
     alias :full_path_to_gem :nilish
+    alias :full_path_to_specification :nilish
 
     def last_modified_time
       Time.now

data/lib/stickler/repository/remote.rb

@@ -1,6 +1,7 @@
 require 'resourceful'
 require 'stickler/repository'
 require 'stickler/repository/api'
+require 'stickler/repository/rubygems_authenticator'
 require 'stringio'
 
 module ::Stickler::Repository
@@ -13,10 +14,15 @@ module ::Stickler::Repository
     # the http client
     attr_reader :http
 
-    def initialize( repo_uri )
+    def initialize( repo_uri, options = {}   )
+      options[:authenticator] ||= Stickler::Repository::RubygemsAuthenticator.new
+      options[:cache_manager] ||= Resourceful::InMemoryCacheManager.new
+      if options.delete(:debug) then
+        options[:logger]      ||= Resourceful::StdOutLogger.new
+      end
+
       @uri        = Addressable::URI.parse( ensure_http( ensure_trailing_slash( repo_uri ) ) )
-      @http       = Resourceful::HttpAccessor.new( :cache_manager => Resourceful::InMemoryCacheManager.new )
-#                                                   :logger => Resourceful::StdOutLogger.new )
+      @http       = Resourceful::HttpAccessor.new( options )
       @specs_list = nil
     end
 
@@ -164,7 +170,7 @@ module ::Stickler::Repository
     end
 
     def push_resource
-      @push_resource ||= @http.resource( push_uri, { 'Content-Type', 'application/octet-stream' } )
+      @push_resource ||= @http.resource( push_uri, { 'Content-Type' => 'application/octet-stream' } )
     end
 
     def yank_uri

data/lib/stickler/repository/rubygems_authenticator.rb

@@ -0,0 +1,32 @@
+require 'addressable/uri'
+
+module Stickler::Repository
+  #
+  # When talking to rubygems itself, the rubygems_api key is required.
+  # This authenticator is injected automatically if the host you are
+  # talking to matches the rubygems host
+  #
+  class RubygemsAuthenticator
+    def self.rubygems_uri
+      @rubygems_uri ||= Addressable::URI.parse( "https://rubygems.org" )
+    end
+
+    def credentials
+      Gem.configuration.rubygems_api_key
+    end
+
+    def rubygems_uri
+      self.class.rubygems_uri
+    end
+
+    def can_handle?( request )
+      request_uri  = Addressable::URI.parse(request.uri)
+      return (request_uri.host   == rubygems_uri.host  ) && 
+             (request_uri.scheme == rubygems_uri.scheme)
+    end
+
+    def add_credentials_to(request)
+      request.header['Authorization'] = credentials
+    end
+  end
+end

data/lib/stickler/server.rb

@@ -0,0 +1,34 @@
+require 'stickler/error'
+require 'stickler/middleware/compression'
+require 'stickler/middleware/gemcutter'
+require 'stickler/middleware/mirror'
+require 'stickler/middleware/index'
+require 'stickler/middleware/not_found'
+require 'rack/commonlogger'
+
+module Stickler
+  class Server
+
+    # The directory holding all the repositories
+    attr_reader :stickler_root
+
+    def initialize( stickler_root )
+      @stickler_root = File.expand_path( stickler_root )
+      raise ::Stickler::Error, "Stickler root directory '#{@stickler_root}' must already exist" unless File.directory?( @stickler_root )
+      raise ::Stickler::Error, "Stickler root directory '#{@stickler_root}' must be writable" unless File.writable?( @stickler_root )
+    end
+
+    def app
+      root = self.stickler_root
+      Rack::Builder.new do
+        use Rack::CommonLogger
+        use Stickler::Middleware::Compression
+        use Stickler::Middleware::Gemcutter, :serve_indexes => false, :repo_root => File.join( root, "gemcutter" )
+        use Stickler::Middleware::Mirror,    :serve_indexes => false, :repo_root => File.join( root, "mirror" )
+        use Stickler::Middleware::Index,     :serve_indexes => true
+        use Stickler::Middleware::NotFound
+        run Sinatra::Base
+      end
+    end
+ end
+end

data/lib/stickler/server/public/css/blueprint/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2007 - 2010 blueprintcss.org
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/lib/stickler/server/public/css/blueprint/ie.css

@@ -0,0 +1,35 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+textarea {overflow:auto;}
+input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline label {position:relative;top:-0.25em;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+button, input.button {position:relative;top:0.25em;}