stickler 2.0.2 → 2.1.0

data/.gitignore

@@ -15,3 +15,4 @@ tmp
 man/*.xml
 man/*.1
 *.gemspec
+work/

data/HISTORY.asciidoc

@@ -2,19 +2,28 @@ Stickler Changelog
 ==================
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
-Version 2.0.1
--------------
+Version 2.1.0 - 2011-03-25
+--------------------------
+* Added 'list' client command
+* Added support for prerelease gems
+* Internal refactoring of how internal repositories are managed
+* Refactored testing and updated to rspec2
+* Switched underlying HTTP client to Excon
+* Change to ISC License
+
+Version 2.0.1 - 2010-09-19
+--------------------------
 * Complete rewrite using Rack and Sinatra
 
-Version 0.1.2
--------------
+Version 0.1.2 - 2009-02-19
+--------------------------
 * fix compatibility with gems 1.3.1
 
-Version 0.1.1
--------------
+Version 0.1.1 - 2008-10-12
+--------------------------
 * remove unnecessary require 'progressbar' 
 
-Version 0.1.0
--------------
+Version 0.1.0 - 2008-10-10
+--------------------------
 * http://copiousfreetime.org/articles/2008/10/09/managing-a-gem-repository-with-stickler.html[Managing a Gem Repository with Stickler]
 * Initial public release

data/LICENSE

@@ -1,54 +1,13 @@
-Stickler is copyrighted free software by Jeremy Hinegardner 
-<jeremy at hinegardner dot org>.  You can redistribute it and/or modify it under
-either the terms of the GPL (see COPYING file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
+Copyright (c) 2008-2010, Jeremy Hinegadner
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

data/README.asciidoc

@@ -83,12 +83,39 @@ Pushing gem(s) to http://localhost:6789/ ...
   /Users/jeremy/tmp/gems/stickler-2.0.0.gem -> OK http://localhost:6789/gems/stickler-2.0.0.gem
 ------------------------------------------------------------------
 
-.Mirror a gem
+.Mirror a gem from upstream
 ------------------------------------------------------------------
 % stickler mirror --gem-version 1.4.3 logging
 Asking http://localhost:6789/ to mirror logging-1.4.3 from rubygems.org : OK -> http://localhost:6789/gems/logging-1.4.3.gem
+% stickler mirror --gem-version 1.16.2 trollop
+Asking http://localhost:6789/ to mirror trollop-1.16.2 from rubygems.org : OK -> http://localhost:6789/gems/trollop-1.16.2.gem
 ------------------------------------------------------------------
 
+.Look at all the gems installed in your stickler server
+Open your browser to http://localhost:6789
+-------------------------------
+% launchy http://localhost:6789
+-------------------------------
+
+.Install a gem from your new stickler gem server
+------------------------------------------------------
+% gem install hitimes --source http://localhost:6789/
+------------------------------------------------------
+
+.Configure your servers to globally use your internal stickler gem server
+-----------------------------
+% cat /etc/gemrc
+---
+:benchmark: false
+:verbose: false
+:update_sources: true
+:bulk_threshold: 1000
+:backtrace: false
+:sources:
+- http://stickler.example.com
+gem: --no-rdoc --no-ri
+-----------------------------
+
 
 See Also
 --------
@@ -114,10 +141,7 @@ Credits
 License
 -------
 Copyright (C) 2008-2010 Jeremy Hinegardner
-
-All rights reserved. Licensed under the same terms as Ruby.  No warranty is
-provided.  See LICENSE and COPYING for details.
-
+ISC License, See LICENSE for details
 
 Appendix
 --------

data/Rakefile

@@ -21,9 +21,8 @@ Bones {
   readme_file    'README.asciidoc'
   ignore_file    '.bnsignore'
   history_file   'HISTORY.asciidoc'
-  rubyforge.name 'copiousfreetime'
 
-  spec.opts << "--color" << "--format specdoc"
+  spec.opts << "--color" << "--format documentation"
 
   summary 'Stickler is a tool to organize and maintain an internal gem repository.'
   description <<_
@@ -38,13 +37,15 @@ Primarily, you would want to use Stickler if:
 _
 
 
-  depend_on 'sinatra', '~> 1.0.0'
-  depend_on 'addressable', '~> 2.1.2'
-  depend_on 'resourceful', '~> 1.0.1'
-  depend_on 'trollop', '~> 1.16.2'
-  depend_on 'logging', '~> 1.4.3'
+  depend_on 'sinatra'    , '~> 1.2.1'
+  depend_on 'addressable', '~> 2.2.4'
+  depend_on 'excon'      , '~> 0.5.8'
+  depend_on 'trollop'    , '~> 1.16.2'
+  depend_on 'logging'    , '~> 1.5.0'
 
-  depend_on 'bones'       , '~> 3.4.6', :development => true
-  depend_on 'rack-test'   , '~> 0.5.4', :development => true
-  depend_on 'bones-extras', '~> 1.2.4', :development => true
+  depend_on 'bones'       , '~> 3.6.5', :development => true
+  depend_on 'rack-test'   , '~> 0.5.7', :development => true
+  depend_on 'bones-extras', '~> 1.3.0', :development => true
+  depend_on 'builder'     , '~> 3.0.0', :development => true
+  depend_on 'rspec'       , '~> 2.5.0', :development => true
 }

data/TODO.asciidoc

@@ -0,0 +1,6 @@
+* Add in a full transparent proxy for automatically pullilng gems from an
+  upstream gem server if the local gem server does not have the gem in question
+* There appears to be something different about evaling the specification off
+  disk, and the loading the specification from the yaml in the .gem file.  They
+  are different.  It appears that @original_platform is not set when the Ruby
+  specification is eval'd but it is when the yaml is loaded.

data/bin/stickler

@@ -3,7 +3,7 @@
 require 'stickler'
 require 'stickler/client'
 
-SUB_COMMANDS = %w[ push yank mirror config ]
+SUB_COMMANDS = %w[ push yank mirror config list ].sort
 exec_name = File.basename( $0 )
 
 #----------------------------------------------------------------------
@@ -20,9 +20,10 @@ Stickler server interaction
   Examples:
     #{exec_name} push ./my_gem-1.0.0.gem --server http://stickler.example.com/
     #{exec_name} yank my_gem --version 1.0.0 --server http://stickler.example.com/
-    #{exec_name} mirror third_party --version 0.4.2 --upstream http://rubygems.org/ --server http://stickler.example.com/
+    #{exec_name} mirror third_party_gem --gem-version 0.4.2 --upstream http://rubygems.org/ --server http://stickler.example.com/
     #{exec_name} mirror --help
     #{exec_name} config --server http://stickler.example.com --upstream http://rubygems.org/
+    #{exec_name} list --server http://stickler.example.com
 
   Options:
 _
@@ -46,5 +47,7 @@ when "mirror"
   ::Stickler::Client::Mirror.new( ARGV ).run
 when "config"
   ::Stickler::Client::Config.new( ARGV ).run
+when "list"
+  ::Stickler::Client::List.new( ARGV ).run
 end
 

data/examples/fetch-a-gem

@@ -0,0 +1,6 @@
+require 'stickler'
+
+repo = Stickler::Repository::Remote.new( "https://rubygems.org" )
+spec = Stickler::SpecLite.new( "hitimes", "1.1.1" )
+g = repo.get( spec )
+puts "Retrieved #{g.size} bytes"

data/examples/gemcutter_repo.ru

@@ -13,7 +13,7 @@ $:.unshift File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
 require 'stickler/middleware/gemcutter'
 require 'stickler/middleware/compression'
 
-gem_dir = File.join( File.expand_path( File.dirname( __FILE__ ) ), "..", "spec", "tmp" )
+gem_dir = File.expand_path( "../spec/tmp", File.dirname( __FILE__ ) )
 
 use ::Stickler::Middleware::Compression
 use ::Stickler::Middleware::Gemcutter, :repo_root => gem_dir

data/lib/stickler.rb

@@ -3,8 +3,8 @@ end
 
 require 'stickler/error'
 require 'stickler/paths'
-require 'stickler/middleware'
 require 'stickler/repository'
+require 'stickler/middleware'
 require 'stickler/spec_lite'
 require 'stickler/version'
 require 'stickler/server'

data/lib/stickler/client.rb

@@ -45,3 +45,4 @@ require 'stickler/client/push'
 require 'stickler/client/yank'
 require 'stickler/client/mirror'
 require 'stickler/client/config'
+require 'stickler/client/list'

data/lib/stickler/client/list.rb

@@ -0,0 +1,30 @@
+module Stickler
+  class Client
+    class List < Stickler::Client
+      def self.banner
+<<-_
+List the gems in the stickler server with repository information.
+
+Usage: stickler list
+
+  Options:
+_
+      end
+
+      def run
+        opts = parse( self.argv )
+        repo = remote_repo_for( opts )
+        gems = Hash.new { |h,k| h[k] = Array.new }
+
+        repo.specs_list.each do |name, version, platform|
+          spec = Stickler::SpecLite.new( name, version, platform )
+          gems[name] << spec
+        end
+
+        gems.keys.sort.each do |name|
+          puts "#{name} (#{gems[name].collect { |s| s.version_platform }.join( ", " )})"
+        end
+      end
+   end
+  end
+end

data/lib/stickler/client/mirror.rb

@@ -45,15 +45,15 @@ _
         $stdout.write "Asking #{repo.uri} to mirror #{spec.full_name} from #{upstream_host} : "
         $stdout.flush
 
-        uri = [ repo.uri.join( upstream_host ), opts[:gem_name], opts[:gem_version], opts[:platform] ].join("/")
-        resource = repo.http.resource( uri )
+        uri  = [ repo.uri.join( upstream_host ), opts[:gem_name], opts[:gem_version], opts[:platform] ].join("/")
+        resp = Excon.post( uri, :expects => [200] )
 
-        resp = resource.post
         $stdout.puts "OK -> #{repo.uri.join(resp.headers['Location'])}"
-      rescue Resourceful::UnsuccessfulHttpRequestError => he
-        resp = he.http_response
+      rescue Excon::Errors::Error => he
+        resp = he.response
         $stdout.puts "ERROR -> #{resp.body}"
       rescue StandardError => e
+        puts e.backtrace.join("\n")
         $stdout.puts "ERROR -> #{e.message}"
      end
     end

data/lib/stickler/client/push.rb

@@ -31,7 +31,7 @@ _
 
         width = opts[:gemfiles].collect { |g| g.length }.sort.last
 
-        puts "Pushing gem(s) to #{repo.uri} ..."
+        $stdout.puts "Pushing gem(s) to #{repo.uri} ..."
         opts[:gemfiles].each do |gemfile|
           begin
             $stdout.write "  #{gemfile.ljust( width )} -> "

data/lib/stickler/middleware/gemcutter.rb

@@ -4,7 +4,7 @@ require 'stickler/middleware/local'
 require 'stickler/repository/local'
 
 module Stickler::Middleware
-  # 
+  #
   # A rack middleware for implementing the gemcutter api
   #
   # == Options
@@ -46,7 +46,7 @@ module Stickler::Middleware
       spec = Stickler::SpecLite.new( params[:gem_name], params[:version] )
       if s = @repo.yank( spec ) then
         logger.info( "Yanked #{spec.full_name}" )
-        return "Yanked #{s.to_s}"
+        return "Yanked #{spec.full_name}"
       else
         logger.warn( "Did not Yank #{spec.full_name}" )
         error( 503, "Did not Yank #{spec.to_s}" )

data/lib/stickler/middleware/helpers.rb

@@ -1,4 +1,5 @@
 require 'stickler/middleware'
+require 'stickler/repository/local'
 module Stickler::Middleware
   module Helpers
     #
@@ -34,15 +35,44 @@ module Stickler::Middleware
       # The specs by repository
       #
       def specs_by_repo
-        env['stickler.specs'] ||= Hash.new{ |h,k| h[k] = Array.new }
+        Stickler::Repository::Local.repos
       end
 
       #
-      # return the flattened array of all the values in
-      # <tt>#specs_by_repo</tt>
+      # return the list of all the specs in all the repos
       #
       def specs
-        [ specs_by_repo.values ].flatten.sort
+        collect_specs_via( :specs )
+      end
+
+      #
+      # return the list of all the latest_specs in all the repos
+      #
+      def latest_specs
+        collect_specs_via( :latest_specs )
+      end
+
+      #
+      # return the list of all the pre-release specs
+      #
+      def prerelease_specs
+        collect_specs_via( :prerelease_specs )
+      end
+
+      #
+      # return just the list of the releeased specs in all the repos
+      #
+      def released_specs
+        collect_specs_via( :released_specs )
+      end
+
+      #
+      # Collect all the specs via a call on each Repository
+      #
+      def collect_specs_via( method )
+        specs_by_repo.values.collect do |idx|
+          idx.send( method )
+        end.flatten.sort
       end
 
       #
@@ -69,48 +99,13 @@ module Stickler::Middleware
       #
       # Given a list of specs, this will group them by name
       #
-      def specs_grouped_by_name( list )
+      def specs_grouped_by_name( spec_list )
         by_name = Hash.new{ |h,k| h[k] = Array.new }
-        list.each do |spec|
+        spec_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.
-      #
-      def append_spec( key, spec_or_array_of_specs )
-        if Array === spec_or_array_of_specs then
-          specs_by_repo[key].concat(  spec_or_array_of_specs )
-        else
-          specs_by_repo[key] << spec_or_array_of_specs
-        end
-      end
-
-      #
-      # Automatically append the specs from the included class into the specs
-      # environment variable.
-      #
-      # The Class that includes this module and wants to use +append_specs+
-      # MUST have a +repo+ method. The +repo+ method must +respond_to+ both
-      # +root_dir+ and +specs+.
-      #
-      def append_specs
-        append_spec( self.repo.root_dir, self.repo.specs )
-      end
-
-      #
-      # Automatically append the latest_specs from the included class into the
-      # specs environment variable.
-      #
-      # The Class that includes this module and wants to use +append_specs+ MUST
-      # have a +repo+ method. The +repo+ method must +respond_to+ both
-      # +root_dir+ and +specs+.
-      #
-      def append_latest_specs
-        append_spec( self.repo.root_dir, self.repo.latest_specs )
-      end
-    end
+   end
   end
 end