stickler 2.1.4 → 2.2.2

data/HISTORY.asciidoc

@@ -2,6 +2,12 @@ Stickler Changelog
 ==================
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
+
+Version 2.2.2 - 2012-02-13
+--------------------------
+* Updated dependencies to latest versions
+* Added supoort for HTTP Basic Auth in the client
+
 Version 2.1.4 - 2011-09-09
 --------------------------
 * Update dependencies to newest version

data/Rakefile

@@ -1,5 +1,5 @@
 begin
-  USING_BONES_VERSION = '3.7.1'
+  USING_BONES_VERSION = '3.7.3'
   require 'bones'
 rescue LoadError
   load 'tasks/contribute.rake'
@@ -19,7 +19,7 @@ Bones {
   url     'http://www.copiousfreetime.org/projects/stickler'
   version Stickler::VERSION
 
-  ruby_opts      %w[-W0 -rubygems]
+  ruby_opts      %w[-w -rubygems]
   readme_file    'README.asciidoc'
   ignore_file    '.bnsignore'
   history_file   'HISTORY.asciidoc'
@@ -41,18 +41,18 @@ _
   # I'm explicitly controlling the version of bones.
 
 
-  depend_on 'sinatra'    , '~> 1.2.6'
-  depend_on 'addressable', '~> 2.2.4'
-  depend_on 'excon'      , '~> 0.6.6'
+  depend_on 'sinatra'    , '~> 1.3.2'
+  depend_on 'addressable', '~> 2.2.6'
+  depend_on 'excon'      , '~> 0.9.5'
   depend_on 'trollop'    , '~> 1.16.2'
-  depend_on 'logging'    , '~> 1.6.1'
+  depend_on 'logging'    , '~> 1.6.2'
 
-  depend_on 'rake'        , '~> 0.9.2'
+  depend_on 'rake'        , '~> 0.9.2.2', :development => true
   depend_on 'bones'       , "~> #{USING_BONES_VERSION}", :development => true
   depend_on 'rack-test'   , '~> 0.6.1', :development => true
   depend_on 'bones-extras', '~> 1.3.0', :development => true
   depend_on 'builder'     , '~> 3.0.0', :development => true
-  depend_on 'rspec'       , '~> 2.6.0', :development => true
+  depend_on 'rspec'       , '~> 2.8.0', :development => true
 }
 
 # Sorry Tim, I need to manage my own bones version

data/examples/auth_repo.ru

@@ -0,0 +1,15 @@
+#-----------------------------------------------------------------------
+# Example rackup file for an entire stickler stack with authorization
+#
+# -*- vim: set ft=ruby: -*-
+#-----------------------------------------------------------------------
+$:.unshift File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
+
+require 'stickler'
+
+tmp = File.expand_path( File.join( File.dirname( __FILE__ ), "..", "spec", "data" ) )
+
+use Rack::Auth::Basic, 'Secure Stickler' do |u,p|
+  (u == "stickler") and (p == "secret")
+end
+run Stickler::Server.new( tmp ).app

data/lib/stickler/middleware/index.rb

@@ -63,9 +63,9 @@ module Stickler::Middleware
 
     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
+    set :views,         File.join( server_path, "views" )
+    set :public_folder, File.join( server_path, "public" )
+    set :static,        true
 
     def initialize( app, opts = {} )
       @app           = app

data/lib/stickler/repository/basic_authenticator.rb

@@ -0,0 +1,22 @@
+require 'addressable/uri'
+
+module Stickler::Repository
+  #
+  # Generate the authentication for basic auth request
+  #
+  class BasicAuthenticator
+    def self.handles?( uri )
+      %w[ http https ].include?( uri.scheme ) and uri.user and uri.password
+    end
+
+    def initialize( uri )
+      @user     = uri.user
+      @password = uri.password
+      @cred     = ["#{@user}:#{@password}"].pack('m').tr("\n", '')
+    end
+
+    def credentials
+      "Basic #{@cred}"
+    end
+  end
+end

data/lib/stickler/repository/local.rb

@@ -30,7 +30,7 @@ module Stickler::Repository
 
     # the directory containing the .gem files
     attr_reader :gems_dir
-   
+
     # the directory containing the .gemspec files
     attr_reader :specifications_dir
 

data/lib/stickler/repository/mirror.rb

@@ -22,8 +22,8 @@ module Stickler::Repository
       @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, 
+    def_delegators :@local_repo, :uri, :gems_uri, :uri_for_gem, :search_for,
+                                 :push, :delete, :get, :open,
                                  :specs, :latest_specs, :root_dir,
                                  :last_modified_time, :full_path_to_gem,
                                  :full_path_to_specification

data/lib/stickler/repository/remote.rb

@@ -3,6 +3,7 @@ require 'stickler/repository'
 require 'stickler/version'
 require 'stickler/repository/api'
 require 'stickler/repository/rubygems_authenticator'
+require 'stickler/repository/basic_authenticator'
 require 'stringio'
 
 module ::Stickler::Repository
@@ -16,8 +17,8 @@ module ::Stickler::Repository
     attr_reader :authenticator
 
     def initialize( repo_uri, options = {}   )
-      @authenticator = options[:authenticator] || Stickler::Repository::RubygemsAuthenticator.new
       @uri           = Addressable::URI.parse( ensure_http( ensure_trailing_slash( repo_uri ) ) )
+      @authenticator = load_authenticator( @uri )
       @specs_list    = nil
     end
 
@@ -139,6 +140,17 @@ module ::Stickler::Repository
       return uri
     end
 
+    def authenticator_class( uri )
+      [ RubygemsAuthenticator, BasicAuthenticator ].find { |a| a.handles?( uri ) }
+    end
+
+    def load_authenticator( uri )
+      if klass = authenticator_class( uri ) then
+        return klass.new( uri )
+      end
+      return nil
+    end
+
     def full_uri_to_gem( spec )
       gems_uri.join( spec.file_name )
     end
@@ -200,7 +212,7 @@ module ::Stickler::Repository
     def download_resource( resource )
       resource_request( resource, :method => :get, :expects => [200] ).body
     rescue Excon::Errors::Error => e
-      puts e.inspect
+      $stderr.puts e.inspect
       return false
     end
 
@@ -234,19 +246,20 @@ module ::Stickler::Repository
       begin
         resource.connection[:headers]['User-Agent'] = "Stickler Client v#{Stickler::VERSION}"
         resource.connection[:headers].delete('Authorization')
-        if authenticator.handles?( resource.connection[:scheme], resource.connection[:host] ) then
+        if authenticator then
           resource.connection[:headers]['Authorization'] = authenticator.credentials
         end
         trys += 1
-        #puts "Making request #{resource.connection.inspect} with extra params #{params.inspect}"
         resource.request( params )
+      rescue Excon::Errors::Unauthorized => unauth
+        uri = "#{unauth.request[:scheme]}://#{unauth.request[:host]}:#{unauth.request[:port]}#{unauth.request[:path]}"
+        raise Stickler::Repository::Error, "Not authorized to access #{uri}. Authorization needed for: #{unauth.response.headers['WWW-Authenticate']}"
       rescue Excon::Errors::MovedPermanently, Excon::Errors::Found,
              Excon::Errors::SeeOther, Excon::Errors::TemporaryRedirect => redirect
         # follow a redirect, it is only allowable to follow redirects from a GET or
         # HEAD request.  Only follow a few times though.
         raise redirect unless [ :get, :head ].include?( redirect.request[:method] )
         raise redirect if trys > 5
-        #puts "Redirecting to #{redirect.response.headers['Location']}"
         resource = Excon::Connection.new( redirect.response.headers['Location'],
                                           { :headers => resource.connection[:headers],
                                             :query   => resource.connection[:headers],

data/lib/stickler/repository/rubygems_authenticator.rb

@@ -11,6 +11,15 @@ module Stickler::Repository
       @rubygems_uri ||= Addressable::URI.parse( "https://rubygems.org" )
     end
 
+    def self.handles?( uri )
+      return ( uri.scheme == rubygems_uri.scheme ) &&
+             ( uri.host   == rubygems_uri.host )
+    end
+
+    def initialize( uri )
+      # do nothing
+    end
+
     def credentials
       Gem.configuration.rubygems_api_key
     end
@@ -19,9 +28,5 @@ module Stickler::Repository
       self.class.rubygems_uri
     end
 
-    def handles?( scheme, host )
-      return ( scheme == rubygems_uri.scheme ) &&
-             ( host   == rubygems_uri.host )
-    end
   end
 end

data/lib/stickler/version.rb

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

data/spec/index_spec_helpers.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'rack/test'
 require 'rubygems/user_interaction'
 require 'rubygems/indexer'

data/spec/repository/remote_spec.rb

@@ -3,6 +3,41 @@ require File.expand_path( File.join( File.dirname(__FILE__), "api_behavior.rb" )
 
 require 'stickler/repository/remote'
 
+class SticklerTestServer
+  def initialize( spec_dir, ru_file )
+    @spec_dir = spec_dir
+    @repo_uri = "http://localhost:6789/"
+    @tmp_dir  = File.join( @spec_dir, "tmp" )
+    FileUtils.mkdir_p( @tmp_dir )
+
+    @pid_file = File.join( @tmp_dir , "rack.pid" )
+    @ru_file  = File.expand_path( File.join( @spec_dir, "..", "examples", ru_file ) )
+    @cmd = "rackup --port 6789 --pid #{@pid_file} --daemonize #{@ru_file}"
+  end
+
+  def start
+    system @cmd
+    tries = 0
+    loop do
+      begin
+        Excon.get( @repo_uri + "specs.#{Gem.marshal_version}.gz" )
+        #puts "rackup started with pid #{IO.read( @pid_file )}"
+        break
+      rescue => e
+        tries += 1
+        sleep tries * 0.1
+      end
+    end
+  end
+
+  def stop
+    pid = IO.read( @pid_file ).to_i
+    Process.kill( 'KILL', pid )
+    #FileUtils.rm_rf( @tmp_dir, :verbose => true )
+    FileUtils.rm_rf( @tmp_dir )
+  end
+end
+
 describe Stickler::Repository::Remote do
   before do
     @repo_uri = "http://localhost:6789/"
@@ -13,36 +48,41 @@ describe Stickler::Repository::Remote do
 
   describe "Using a live server" do
     before do
-      @tmp_dir  = File.join( @spec_dir, "tmp" )
-      FileUtils.mkdir_p( @tmp_dir )
-
-      @pid_file = File.join( @tmp_dir , "rack.pid" )
-      @ru_file  = File.expand_path( File.join( @spec_dir, "..", "examples", "gemcutter_repo.ru" ) )
-      cmd = "rackup --port 6789 --pid #{@pid_file} --daemonize #{@ru_file}"
-      #puts cmd
-      system cmd
-
-      tries = 0
-      loop do
-        begin
-          Excon.get( @repo_uri + "specs.#{Gem.marshal_version}.gz" )
-          #puts "rackup started with pid #{IO.read( @pid_file )}"
-          break
-        rescue => e
-          tries += 1
-          sleep tries * 0.1
-        end
-      end
+      @server = SticklerTestServer.new( @spec_dir, "gemcutter_repo.ru" )
+      @server.start
     end
 
     after do
-      pid = IO.read( @pid_file ).to_i
-      Process.kill( 'KILL', pid )
-      #FileUtils.rm_rf( @tmp_dir, :verbose => true )
-      FileUtils.rm_rf( @tmp_dir )
+      @server.stop
     end
 
     it_should_behave_like 'implements Repository::Api'
   end
+
+  describe "Using a live authenticated server" do
+    before do
+      @server = SticklerTestServer.new( @spec_dir, "auth_repo.ru" )
+      @server.start
+      @foo_gem_local_path = File.join( @gems_dir, "foo-1.0.0.gem" )
+      @foo_spec           = Stickler::SpecLite.new( 'foo', '1.0.0' )
+      @foo_digest         = Digest::SHA1.hexdigest( IO.read( @foo_gem_local_path ) )
+    end
+
+    after do
+      @server.stop
+    end
+
+    it "should raise an an authentication denied error" do
+      repo = ::Stickler::Repository::Remote.new( "http://localhost:6789/")
+      lambda { repo.get( @foo_spec ) }.should raise_error( ::Stickler::Repository::Error, /Not authorized/ )
+    end
+
+    it "should connect with proper authentication" do
+      repo = ::Stickler::Repository::Remote.new( "http://stickler:secret@localhost:6789/")
+      data = repo.get( @foo_spec )
+      sha1 = Digest::SHA1.hexdigest( data )
+      sha1.should == @foo_digest
+    end
+  end
 end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 2
-  - 1
-  - 4
-  version: 2.1.4
+  - 2
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2012-02-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
+        - 3
         - 2
-        - 6
-        version: 1.2.6
+        version: 1.3.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 2
         - 2
-        - 4
-        version: 2.2.4
+        - 6
+        version: 2.2.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 49
         segments: 
         - 0
-        - 6
-        - 6
-        version: 0.6.6
+        - 9
+        - 5
+        version: 0.9.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 1
         - 6
-        - 1
-        version: 1.6.1
+        - 2
+        version: 1.6.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,13 +105,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 11
         segments: 
         - 0
         - 9
         - 2
-        version: 0.9.2
-  type: :runtime
+        - 2
+        version: 0.9.2.2
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -121,12 +122,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 29
         segments: 
         - 3
         - 7
-        - 1
-        version: 3.7.1
+        - 3
+        version: 3.7.3
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -185,12 +186,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 47
         segments: 
         - 2
-        - 6
+        - 8
         - 0
-        version: 2.6.0
+        version: 2.8.0
   type: :development
   version_requirements: *id011
 description: |
@@ -225,16 +226,16 @@ extra_rdoc_files:
 - lib/stickler/server/views/layout.erb
 files: 
 - .gitignore
+- .rvmrc
 - HISTORY.asciidoc
 - LICENSE
 - README.asciidoc
 - Rakefile
 - TODO.asciidoc
-- asciidoc-output/docbook-xsl.css
-- asciidoc-output/man/docbook-xsl.css
 - bin/stickler
 - bin/stickler-passenger-config
 - bin/stickler-server
+- examples/auth_repo.ru
 - examples/config.ru
 - examples/fetch-a-gem
 - examples/gemcutter_repo.ru
@@ -263,6 +264,7 @@ files:
 - lib/stickler/paths.rb
 - lib/stickler/repository.rb
 - lib/stickler/repository/api.rb
+- lib/stickler/repository/basic_authenticator.rb
 - lib/stickler/repository/index.rb
 - lib/stickler/repository/local.rb
 - lib/stickler/repository/mirror.rb
@@ -282,12 +284,8 @@ files:
 - lib/stickler/spec_lite.rb
 - lib/stickler/version.rb
 - man/asciidoc.conf
-- man/docbook-xsl.css
-- man/stickler-passenger-config.1
 - man/stickler-passenger-config.asciidoc
-- man/stickler-server.1
 - man/stickler-server.asciidoc
-- man/stickler.1
 - man/stickler.asciidoc
 - spec/data/gemcutter/gems/foo-1.0.0.gem
 - spec/data/gemcutter/specifications/foo-1.0.0.gemspec
@@ -316,10 +314,6 @@ files:
 - tasks/bundler.rake
 - tasks/contribute.rake
 - tasks/man.rake
-- work/mirror/gems/hitimes-1.1.1.gem
-- work/mirror/gems/rails-3.0.3.gem
-- work/mirror/specifications/hitimes-1.1.1.gemspec
-- work/mirror/specifications/rails-3.0.3.gemspec
 homepage: http://www.copiousfreetime.org/projects/stickler
 licenses: []
 
@@ -350,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: stickler
-rubygems_version: 1.8.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Stickler is a tool to organize and maintain an internal gem repository.