stickler 2.0.2 → 2.1.0

data/lib/stickler/repository/rubygems_authenticator.rb

@@ -19,14 +19,9 @@ module Stickler::Repository
       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
+    def handles?( scheme, host )
+      return ( scheme == rubygems_uri.scheme ) &&
+             ( host   == rubygems_uri.host )
     end
   end
 end

data/lib/stickler/server.rb

@@ -20,7 +20,7 @@ module Stickler
 
     def app
       root = self.stickler_root
-      Rack::Builder.new do
+      Rack::Builder.app do
         use Rack::CommonLogger
         use Stickler::Middleware::Compression
         use Stickler::Middleware::Gemcutter, :serve_indexes => false, :repo_root => File.join( root, "gemcutter" )

data/lib/stickler/spec_lite.rb

@@ -14,10 +14,12 @@ module Stickler
     attr_reader :name
     attr_reader :version
     attr_reader :platform
+    attr_reader :platform_string
 
     def initialize( name, version, platform = Gem::Platform::RUBY )
       @name = name
       @version = Gem::Version.new( version )
+      @platform_string = platform.to_s
       @platform = Gem::Platform.new( platform )
     end
 
@@ -42,19 +44,23 @@ module Stickler
       if platform == Gem::Platform::RUBY or platform.nil? then
         version.to_s
       else
-        "#{version}-#{platform}"
+        "#{version}-#{platform_string}"
       end
     end
 
+    def prerelease?
+      version.prerelease?
+    end
+
     def to_a
-      [ name, version.to_s, platform.to_s ]
+      [ name, version.to_s, platform_string ]
     end
 
     # 
     # Convert to the array format used by rubygems itself
     #
     def to_rubygems_a
-      [ name, version, platform.to_s ]
+      [ name, version, platform_string ]
     end
 
     #
@@ -64,11 +70,8 @@ module Stickler
       return 0 if other.object_id == self.object_id
       other = coerce( other )
 
-      [ :name, :version, :platform ].each do |method|
+      [ :name, :version, :platform_string ].each do |method|
         us, them = self.send( method ), other.send( method )
-        if us.instance_of?( Gem::Platform ) || them.instance_of?( Gem::Platform ) then
-          us, them  = us.to_s, them.to_s
-        end
         result = us.<=>( them )
         return result unless 0 == result
       end
@@ -84,7 +87,7 @@ module Stickler
       return (other and 
               self.name == other.name and
               self.version.to_s == other.version.to_s and
-              self.platform == other.platform )
+              self.platform_string == other.platform_string )
     end
 
     private
@@ -94,8 +97,8 @@ module Stickler
         other
       elsif other.respond_to?( :name ) and 
             other.respond_to?( :version ) and 
-            other.respond_to?( :platform ) then
-        SpecLite.new( other.name, other.version, other.platform )
+            other.respond_to?( :platform_string ) then
+        SpecLite.new( other.name, other.version, other.platform_string )
       else
         return false
       end

data/lib/stickler/version.rb

@@ -11,8 +11,8 @@ module Stickler
   module Version
 
     MAJOR = 2
-    MINOR = 0
-    BUILD = 2
+    MINOR = 1
+    BUILD = 0
 
     def self.to_ary
       [ MAJOR, MINOR, BUILD ]

data/man/stickler.asciidoc

@@ -35,6 +35,8 @@ store it in a linkstick:stickler-server[1]
 
 *config*:: Access or update the stickler client configuration.
 
+*list*:: List all the gems in the remote repository
+
 
 OPTIONS
 -------
@@ -116,7 +118,7 @@ Take the +third_party+ gem, version +1.4.2+ that is on *rubygems.org* and mirror
 on *stickler.example.com*
 
 -----------------------------------------------------------------------------------------------------------------
-stickler mirror third_party --version 0.4.2 --upstream http://rubygems.org/ --server http://stickler.example.com/
+stickler mirror third_party_gem --gem-version 0.4.2 --upstream http://rubygems.org/ --server http://stickler.example.com/
 stickler mirror --help 
 -----------------------------------------------------------------------------------------------------------------
 

data/spec/index_spec_helpers.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require 'rack/test'
+require 'rubygems/user_interaction'
+require 'rubygems/indexer'
+
+module IndexSpecHelpers
+  include Rack::Test::Methods
+
+  def define_directories
+    # pristine spec data location
+    @idx_spec_dir        = File.expand_path( File.dirname( __FILE__ ) )
+    @idx_spec_datadir    = File.join( @idx_spec_dir, "data" )
+
+    # scratch location
+    @scratch_dir     = File.join( @idx_spec_dir, "scratch" )
+    @scratch_datadir = File.join( @scratch_dir, 'data' )
+    @scratch_specdir = File.join( @scratch_datadir, "specifications" )
+    @scratch_gemsdir = File.join( @scratch_datadir, "gems" )
+  end
+
+  # put in the before clause for setup
+  def mirror_spec_gemdir
+    define_directories
+    FileUtils.mkdir_p( @scratch_dir )
+    FileUtils.cp_r( @idx_spec_datadir, @scratch_dir )
+  end
+
+  # Do a legacy index of the scratch location
+  def make_legacy_index
+    indexer = Gem::Indexer.new( @scratch_datadir, :build_legacy => true, :build_modern => false )
+    with_quieter_rubygems { indexer.generate_index }
+  end
+
+  # Do a modern index of the scratch location
+  def make_modern_index
+    indexer = Gem::Indexer.new( @scratch_datadir, :build_legacy => false, :build_modern => true )
+    with_quieter_rubygems { indexer.generate_index }
+  end
+
+  # put in the after clause for cleanup
+  def destroy_scratch_dir
+    FileUtils.rm_rf( @scratch_dir )
+  end
+
+  def with_quieter_rubygems( &block )
+    previous = Gem.configuration.verbose
+    Gem.configuration.verbose = nil
+    yield
+    Gem.configuration.verbose = previous
+  end
+
+  def validate_contents( got, expected, content_type)
+    case content_type
+    when 'application/x-gzip'
+      response_un = Gem.gunzip( got      )
+      expected_un = Gem.gunzip( expected )
+    when 'application/x-deflate'
+      response_un = Gem.inflate( got      )
+      expected_un = Gem.inflate( expected )
+    when 'application/octet-stream'
+      response_un = got
+      expected_un = expected
+    else
+      fail "Unkonwn content type #{content_type} with data #{got}"
+    end
+
+    got  = Marshal.load( response_un )
+    need = Marshal.load( expected_un )
+    got.should == need
+  end
+end

data/spec/middleware/local_spec.rb

@@ -1,13 +1,15 @@
-require File.expand_path( File.join( File.dirname(__FILE__), "..", "spec_helper.rb" ) )
-require File.expand_path( File.join( File.dirname(__FILE__), "modern_gem_server_behavior.rb" ) )
-require File.expand_path( File.join( File.dirname(__FILE__), "legacy_gem_server_behavior.rb" ) )
+require File.expand_path( "../spec_helper",File.dirname(__FILE__) )
 
 require 'stickler/middleware/local'
 require 'stickler/middleware/compression'
 
-describe ::Stickler::Middleware::Local do
+describe Stickler::Middleware::Local do
+
+  include IndexSpecHelpers
+  include Rack::Test::Methods
+
   def app
-    repo_root = @sinatra_gem_dir 
+    repo_root = @idx_spec_datadir
     ::Rack::Builder.new do
       use ::Stickler::Middleware::Compression
       use ::Stickler::Middleware::Local, :repo_root => repo_root
@@ -15,11 +17,57 @@ describe ::Stickler::Middleware::Local do
     end
   end
 
-  before do
-    @sinatra_gem_dir = @webrick_gem_dir = @gem_root
+  describe "When serving a modern index" do
+    before( :all ) do 
+      mirror_spec_gemdir
+      make_modern_index
+    end
+
+    after( :all ) do
+      destroy_scratch_dir
+    end
+
+    [
+      "/specs.#{Gem.marshal_version}",
+      "/specs.#{Gem.marshal_version}.gz",
+      "/latest_specs.#{Gem.marshal_version}",
+      "/latest_specs.#{Gem.marshal_version}.gz",
+      "/prerelease_specs.#{Gem.marshal_version}",
+      "/prerelease_specs.#{Gem.marshal_version}.gz",
+      "/quick/Marshal.#{Gem.marshal_version}/foo-1.0.0.gemspec.rz",
+      "/quick/Marshal.#{Gem.marshal_version}/bar-1.0.0.gemspec.rz",
+      "/quick/Marshal.#{Gem.marshal_version}/foo-2.0.0a.gemspec.rz",
+    ].each do |path|
+      it "should return the same bytes as Gem::Indexer for '#{path}'" do
+        response = get( path )
+        validate_contents( response.body,
+                           IO.read( File.join(@scratch_datadir, path) ),
+                           response.content_type )
+      end
+    end
   end
 
-  it_should_behave_like "modern gem server indexes"
-#  it_should_behave_like "legacy gem server indexes"
+  describe "When serving a legacy index" do
+     before( :all ) do 
+      mirror_spec_gemdir
+      make_legacy_index
+    end
+
+    after( :all ) do
+      destroy_scratch_dir
+    end
 
-end    
+    [
+      "/Marshal.#{Gem.marshal_version}",
+      "/Marshal.#{Gem.marshal_version}.Z",
+    ].each do |path|
+      it "should return the same bytes as Gem::Indexer for '#{path}'" do
+        pending
+        response = get( path )
+        validate_contents( response.body,
+                           IO.read( File.join(@scratch_datadir, path) ),
+                           response.content_type )
+      end
+    end
+  end
+end

data/spec/middleware/not_found_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path( File.join( File.dirname(__FILE__), "..", "spec_helper.
 require 'stickler/middleware/not_found'
 
 describe ::Stickler::Middleware::NotFound do
+  include Rack::Test::Methods
   def app
     ::Stickler::Middleware::NotFound.new
   end

data/spec/repository/index_spec.rb

@@ -28,5 +28,20 @@ describe ::Stickler::Repository::Index do
     FileUtils.rm( File.join( @index_me, "foo-1.0.0.gemspec" ) )
     @index.specs.size.should == ( @specifications.size - 1 )
   end
+
+  it "knows just the latest specs" do
+    @index.latest_specs.size.should == (@specifications.size - 1)
+    @index.latest_specs.collect { |s| s.full_name }.sort.should == %w[ bar-1.0.0 foo-1.0.0 ]
+  end
+
+  it "knows the pre-release specs" do
+    @index.prerelease_specs.size.should == 1
+    @index.prerelease_specs.first.full_name.should == "foo-2.0.0a"
+  end
+
+  it "knows the released specs" do
+    @index.released_specs.size.should == 2
+    @index.released_specs.collect { |s| s.full_name }.sort.should == %w[ bar-1.0.0 foo-1.0.0 ]
+  end
 end
 

data/spec/repository/local_spec.rb

@@ -5,13 +5,15 @@ require 'stickler/repository/local'
 
 describe ::Stickler::Repository::Local do
 
-  before do
-    @repo_dir = File.join( @spec_dir, "tmp" )
-    @repo = ::Stickler::Repository::Local.new( @repo_dir )
+  before( :each ) do
+    @repos_dir = File.join( @spec_dir, "repos" )
+    @repo_dir  = File.join( @repos_dir, "1" )
+    @repo      = ::Stickler::Repository::Local.new( @repo_dir )
   end
 
   after( :each ) do
-    FileUtils.rm_rf( @repo_dir )
+    ::Stickler::Repository::Local.purge
+    FileUtils.rm_rf( @repos_dir )
   end
 
   %w[ gems specifications ].each do |sub_dir|
@@ -27,7 +29,20 @@ describe ::Stickler::Repository::Local do
     Dir.glob( File.join( @gems_dir, "*.gem" ) ).each do |gem|
       @repo.push( gem )
     end
-    @repo.specs.size.should == 2
+    @repo.specs.size.should == 3
+  end
+
+  it "two instances with the same repo dir are the same object" do
+    repo2 = ::Stickler::Repository::Local.new( File.join(@repos_dir, '1') )
+    repo2.object_id.should == @repo.object_id
+    ::Stickler::Repository::Local.repos.size.should == 1
+  end
+
+
+  it "keeps track of all the repository instances" do
+    repo2 = ::Stickler::Repository::Local.new( File.join(@repos_dir, "2" ) )
+    repo3 = ::Stickler::Repository::Local.new( File.join(@repos_dir, "3" ) )
+    ::Stickler::Repository::Local.repos.size.should == 3
   end
 
   it_should_behave_like 'includes Repository::Api'

data/spec/repository/remote_spec.rb

@@ -6,7 +6,7 @@ require 'stickler/repository/remote'
 describe Stickler::Repository::Remote do
   before do
     @repo_uri = "http://localhost:6789/"
-    @repo     = ::Stickler::Repository::Remote.new( @repo_uri )
+    @repo     = ::Stickler::Repository::Remote.new( @repo_uri, :debug => true )
   end
 
   it_should_behave_like 'includes Repository::Api'
@@ -23,10 +23,9 @@ describe Stickler::Repository::Remote do
       system cmd
 
       tries = 0
-      @acc      = ::Resourceful::HttpAccessor.new
       loop do
         begin
-          @acc.resource( @repo_uri + "specs.#{Gem.marshal_version}.gz" ).get
+          Excon.get( @repo_uri + "specs.#{Gem.marshal_version}.gz" )
           #puts "rackup started with pid #{IO.read( @pid_file )}"
           break
         rescue => e

data/spec/spec.opts

@@ -1,2 +1,2 @@
---format specdoc
+--format documentation
 --colour

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
-require 'spec'
-require 'rack/test'
+require 'rspec'
+require 'index_spec_helpers'
 
-Spec::Runner.configure do |config|
-  config.include Rack::Test::Methods
+require 'stickler/repository/local'
+
+RSpec.configure do |config|
 
   config.before( :each ) do
     @spec_dir           = File.expand_path( File.dirname( __FILE__ ) )
@@ -11,7 +12,8 @@ Spec::Runner.configure do |config|
     @gems_dir           = File.join( @gem_root, "gems" )
   end
 
+  config.after( :each ) do
+    ::Stickler::Repository::Local.purge
+  end
 
 end
-
-

data/spec/spec_lite_spec.rb

@@ -6,7 +6,8 @@ describe Stickler::SpecLite do
   before do
     @specs = {
       :ruby => Stickler::SpecLite.new( 'foo', '0.4.2' ),
-      :win  => Stickler::SpecLite.new( 'bar', '1.0.1', "x86-mswin32" )
+      :win  => Stickler::SpecLite.new( 'bar', '1.0.1', "x86-mswin32" ),
+      :java => Stickler::SpecLite.new( 'jfoo', '0.4.2', 'jruby' )
     }
   end
 
@@ -18,6 +19,8 @@ describe Stickler::SpecLite do
     [:ruby, 'spec_file_name'] => "foo-0.4.2.gemspec" ,
     [:win , 'file_name']      => "bar-1.0.1-x86-mswin32.gem",
     [:win , 'spec_file_name'] => "bar-1.0.1-x86-mswin32.gemspec",
+    [:java, 'file_name']      => 'jfoo-0.4.2-jruby.gem',
+    [:java, 'spec_file_name'] => 'jfoo-0.4.2-jruby.gemspec',
   }.each do |params, result|
     platform, method = *params
     it "on a #{platform} gem ##{method} is #{result}" do
@@ -29,22 +32,22 @@ describe Stickler::SpecLite do
     @specs[:win].to_a.should == [ 'bar', '1.0.1', 'x86-mswin32' ]
   end
 
-  it "returns false when compared to something that does not resond to :name, :version or :platform" do
+  it "returns false when compared to something that does not resond to :name, :version or :platform_string" do
     x = @specs[:ruby] =~ Object.new
     x.should == false
   end
 
-  it "can compare against anything that responds to :name, :version and :platform" do
+  it "can compare against anything that responds to :name, :version and :platform_string" do
     class OSpec
       attr_accessor :name
       attr_accessor :version
-      attr_accessor :platform
+      attr_accessor :platform_string
     end
 
     o = OSpec.new
     o.name = @specs[:ruby].name
     o.version = @specs[:ruby].version
-    o.platform = @specs[:ruby].platform
+    o.platform_string = @specs[:ruby].platform_string
     r = @specs[:ruby] =~ o
     r.should == true
   end
@@ -71,6 +74,16 @@ describe Stickler::SpecLite do
     list = @specs.values
     alib = Stickler::SpecLite.new( 'alib', '4.2' )
     list << alib
-    list.sort.should == [ alib, @specs[:win], @specs[:ruby] ]
+    list.sort.should == [ alib, @specs[:win], @specs[:ruby], @specs[:java] ]
+  end
+
+  it "knows when it is a prerelease specification" do
+    spec = Stickler::SpecLite.new( 'prerelease', '1.2.3a' )
+    spec.should be_prerelease
+  end
+
+  it "knows when it is not a prerelease specification" do
+    spec = Stickler::SpecLite.new( 'prerelease', '1.2.3' )
+    spec.should_not be_prerelease
   end
 end