stickler 2.2.4 → 2.3.0

data/CONTRIBUTING.md

@@ -0,0 +1,48 @@
+# Hi there!
+
+I see you are interested in contributing. That is wonderful. I love
+contributions.
+
+I guarantee that there are bugs in this software. And I guarantee that there is
+a feature you want that is not in here yet. As such, any and all bugs reports
+are gratefully accepted, bugfixes even more so. Helping out with bugs is the
+easiest way to contribute.
+
+
+## The Quick Version
+
+* Have a [GitHub Account][].
+* Search the [GitHub Issues][] and see if your issue already present. If so
+  add your comments, :thumbsup:, etc.
+* Issue not there? Not a problem, open up a [new issue][].
+    * **Bug reports** please be as detailed as possible. Include:
+        * full ruby engine and version: `ruby -e 'puts RUBY_DESCRIPTION'`
+        * operating system and version
+        * version of stickler `ruby -rubygems -e "require 'stickler'; puts Stickler::VERSION"`
+        * as much detail about the bug as possible so I can replicate it. Feel free
+          to link in a [gist][]
+    * **New Feature**
+        * What the new feature should do.
+        * What benefit the new feature brings to the project.
+* Fork the [repo][].
+* Create a new branch for your issue: `git checkout -b issue/my-issue`
+* Lovingly craft your contribution:
+    * `rake develop` to get started, or if you prefer bundler `rake develop:using_bundler && bundle`.
+    * `rake test` to run tests
+* Make sure that `rake test` passes. It's important, I said it twice.
+* Add yourself to the contributors section below.
+* Submit your [pull request][].
+
+# Contributors
+
+* [Jeremy Hinegardner][https://github.com/copiousfreetime]
+* [Kevin Barnes][https://github.com/vinbarnes]
+* [Philip Roberts][https://github.com/latentflip]
+* [Alan Gardner][https://github.com/urfolomeus]
+
+[GitHub Account]: https://github.com/signup/free "GitHub Signup"
+[GitHub Issues]:  https://github.com/copiousfreetime/stickler/issues "Stickler Issues"
+[new issue]:      https://github.com/copiousfreetime/stickler/issues/new "New Stickler Issue"
+[gist]:           https://gist.github.com/ "New Gist"
+[repo]:           https://github.com/copiousfreetime/stickler "Stickler Repo"
+[pull request]:   https://help.github.com/articles/using-pull-requests "Using Pull Requests"

data/{HISTORY.asciidoc → HISTORY.md}

@@ -1,7 +1,13 @@
 Stickler Changelog
 ==================
-Jeremy Hinegardner <jeremy@hinegardner.org>
+Jeremy Hinegardner <jeremy@copiousfreetime.org>
 
+Version 2.3.0 - 2013-03-09
+--------------------------
+* Expose deleting a gem via the stickler commandline (copiousfreetime/stickler/#10)
+* Update dependencies for Excon so http proxy works (copiousfreetime/stickler/#24)
+* Implement unyank for local and remote repositories (copiousfreetime/stickler/#26)
+* Updated dependencies to latest versions
 
 Version 2.2.4 - 2012-02-26
 --------------------------
@@ -55,5 +61,5 @@ Version 0.1.1 - 2008-10-12
 
 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]
+* [Managing a Gem Repository with Stickler](http://copiousfreetime.org/articles/2008/10/09/managing-a-gem-repository-with-stickler.html)
 * Initial public release

data/Manifest.txt

@@ -0,0 +1,86 @@
+CONTRIBUTING.md
+HISTORY.md
+LICENSE
+Manifest.txt
+README.rdoc
+Rakefile
+bin/stickler
+bin/stickler-passenger-config
+bin/stickler-server
+examples/auth_repo.ru
+examples/config.ru
+examples/fetch-a-gem
+examples/gemcutter_repo.ru
+examples/index_repo.ru
+examples/local_repo.ru
+examples/mirror_repo.ru
+examples/not_found.ru
+lib/stickler.rb
+lib/stickler/client.rb
+lib/stickler/client/config.rb
+lib/stickler/client/config_file.rb
+lib/stickler/client/delete.rb
+lib/stickler/client/list.rb
+lib/stickler/client/mirror.rb
+lib/stickler/client/push.rb
+lib/stickler/client/unyank.rb
+lib/stickler/client/yank.rb
+lib/stickler/error.rb
+lib/stickler/logable.rb
+lib/stickler/middleware.rb
+lib/stickler/middleware/compression.rb
+lib/stickler/middleware/gemcutter.rb
+lib/stickler/middleware/helpers.rb
+lib/stickler/middleware/index.rb
+lib/stickler/middleware/local.rb
+lib/stickler/middleware/mirror.rb
+lib/stickler/middleware/not_found.rb
+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
+lib/stickler/repository/null.rb
+lib/stickler/repository/remote.rb
+lib/stickler/repository/remote_mirror.rb
+lib/stickler/repository/rubygems_authenticator.rb
+lib/stickler/server.rb
+lib/stickler/server/public/css/blueprint/LICENSE
+lib/stickler/server/public/css/blueprint/ie.css
+lib/stickler/server/public/css/blueprint/screen.css
+lib/stickler/server/public/css/style.css
+lib/stickler/server/public/images/apple-touch-icon.png
+lib/stickler/server/public/images/favicon.ico
+lib/stickler/server/public/js/modernizr-1.5.min.js
+lib/stickler/server/views/index.erb
+lib/stickler/server/views/layout.erb
+lib/stickler/spec_lite.rb
+man/stickler-passenger-config.1
+man/stickler-passenger-config.1.ronn
+man/stickler-server.1
+man/stickler-server.1.ronn
+man/stickler.1
+man/stickler.1.ronn
+spec/data/gemcutter/gems/foo-1.0.0.gem
+spec/data/gems/bar-1.0.0.gem
+spec/data/gems/baz-3.1.4-java.gem
+spec/data/gems/baz-3.1.4.gem
+spec/data/gems/foo-1.0.0.gem
+spec/data/gems/foo-2.0.0a.gem
+spec/index_spec_helpers.rb
+spec/middleware/local_spec.rb
+spec/middleware/not_found_spec.rb
+spec/paths_spec.rb
+spec/repository/api_behavior.rb
+spec/repository/api_spec.rb
+spec/repository/index_spec.rb
+spec/repository/local_spec.rb
+spec/repository/null_spec.rb
+spec/repository/remote_spec.rb
+spec/spec.opts
+spec/spec_helper.rb
+spec/spec_lite_spec.rb
+tasks/default.rake
+tasks/this.rb

data/{README.asciidoc → README.rdoc}

@@ -1,10 +1,10 @@
-Stickler
-========
-Jeremy Hinegardner <jeremy@hinegardner.org>
+= Stickler
 
+* Jeremy Hinegardner <jeremy@hinegardner.org>
+* http://github.com/copiousfreetime/qup
+
+== DESCRIPTION
 
-Overview
---------
 Stickler is a tool to organize and maintain an internal gem repository.
 Primarily, you would want to use Stickler if:
 
@@ -15,19 +15,17 @@ Primarily, you would want to use Stickler if:
 3. You want both (1) and (2) in the same server.
 
 
-Installation
-------------
+== INSTALLATION
+
 Installing stickler may be done via the standard gem installation
 
---------------------
-gem install stickler
---------------------
+    gem install stickler
 
 Or downloaded from http://github.com/copiousfreetime/stickler/downloads
 
 
-Usage
------
+== USAGE
+
 Stickler is broken up into a few commandline programs.
 
 .Command line programs
@@ -132,27 +130,27 @@ View which manual?
 >
 ---------------------------------
 
-Development
------------
+== DEVELOPMENT
+
 If you want to do development on stickler, I suggest using
 https://rvm.beginrescueend.com/[RVM] and creating a gemset for stickler.
 
 Then run 'rake how_to_contribute'
 
 
-Credits
--------
+== CREDITS
+
 * http://rubyforge.org/projects/rubygems/[The Rubygems Team]
 
 
-License
--------
+== LICENSE
+
 Copyright (C) 2008-2010 Jeremy Hinegardner
 ISC License, See LICENSE for details
 
 
-Appendix
---------
+== APPENDIX
+
 * http://github.com/copiousfreetime/stickler[Github Project]
 * link:HISTORY.html[History]
 * http://www.copiousfreetime.org/projects/stickler/

data/Rakefile

@@ -1,61 +1,27 @@
-begin
-  USING_BONES_VERSION = '3.7.3'
-  require 'bones'
-rescue LoadError
-  load 'tasks/contribute.rake'
-  Rake.application.invoke_task( :help )
-end
-
-task :default => 'spec:run'
-task 'gem:release' => 'spec:run'
-
-$: << "lib"
-require 'stickler/version'
-
-Bones {
-  name 'stickler'
-  authors 'Jeremy Hinegardner'
-  email   'jeremy@hinegardner.org'
-  url     'http://www.copiousfreetime.org/projects/stickler'
-  version Stickler::VERSION
-
-  ruby_opts      %w[-w -rubygems]
-  readme_file    'README.asciidoc'
-  ignore_file    '.bnsignore'
-  history_file   'HISTORY.asciidoc'
-
-  spec.opts << "--color" << "--format documentation"
-
-  summary 'Stickler is a tool to organize and maintain an internal gem repository.'
-  description <<_
-Stickler is a tool to organize and maintain an internal gem repository.
-Primarily, you would want to use Stickler if:
+# vim: syntax=ruby
+load 'tasks/this.rb'
+
+This.name     = "stickler"
+This.author   = "Jeremy Hinegardner"
+This.email    = "jeremy@copiousfreetime.org"
+This.homepage = "http://github.com/copiousfreetime/#{ This.name }"
+
+
+This.ruby_gemspec do |spec|
+  spec.add_runtime_dependency( 'sinatra'    , '~> 1.3.5'  )
+  spec.add_runtime_dependency( 'addressable', '~> 2.3.3'  )
+  spec.add_runtime_dependency( 'excon'      , '~> 0.20.0'  )
+  spec.add_runtime_dependency( 'trollop'    , '~> 2.0' )
+  spec.add_runtime_dependency( 'logging'    , '~> 1.8.1'  )
+
+  # The Development Dependencies
+  spec.add_development_dependency( 'rake'        , '~> 10.0.3'  )
+  spec.add_development_dependency( 'rack-test'   , '~> 0.6.2'   )
+  spec.add_development_dependency( 'builder'     , '~> 3.2.0'   )
+  spec.add_development_dependency( 'rspec'       , '~> 2.13.0'   )
+  spec.add_development_dependency( 'rdoc'        , '~> 4.0'    )
+  spec.add_development_dependency( 'ronn'        , '~> 0.7.3'   )
 
-1. You have proprietary gems that you want to have available via a gem server so 
-   you may +gem install+ them.
-2. You would like to have a local mirror of third party gems from either 
-   http://rubygems.org or some other gem server.
-3. You want both (1) and (2) in the same server.
-_
-
-  # I'm explicitly controlling the version of bones.
-
-
-  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.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.8.0', :development => true
-}
-
-# Sorry Tim, I need to manage my own bones version
-::Bones.config.gem._spec.dependencies.delete_if do |d|
-  d.name == 'bones' and d.requirement.to_s =~ /^>=/
 end
+
+load 'tasks/default.rake'

data/bin/stickler

@@ -3,7 +3,7 @@
 require 'stickler'
 require 'stickler/client'
 
-SUB_COMMANDS = %w[ push yank mirror config list ].sort
+SUB_COMMANDS = %w[ push yank mirror config list delete unyank ].sort
 exec_name = File.basename( $0 )
 
 #----------------------------------------------------------------------
@@ -19,11 +19,13 @@ 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} yank my_gem --gem-version 1.0.0 --server http://stickler.example.com/
+    #{exec_name} unyank my_gem --gem-version 1.0.0 --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
+    #{exec_name} delete my_gem --gem-version 1.2.3 --server #http://stickler.example.com/
 
   Options:
 _
@@ -35,7 +37,8 @@ end
 # sub command processing
 #----------------------------------------------------------------------
 cmd = ARGV.shift
-Trollop::die "unknown sub command #{cmd.inspect}" unless SUB_COMMANDS.include?( cmd )
+Trollop::die "No sub command given" unless cmd
+Trollop::die "Unknown sub command #{cmd.inspect}" unless SUB_COMMANDS.include?( cmd )
 
 
 case cmd
@@ -43,6 +46,10 @@ when "push"
   ::Stickler::Client::Push.new( ARGV ).run
 when "yank"
   ::Stickler::Client::Yank.new( ARGV ).run
+when "unyank"
+  ::Stickler::Client::Unyank.new( ARGV ).run
+when "delete"
+  ::Stickler::Client::Delete.new( ARGV ).run
 when "mirror"
   ::Stickler::Client::Mirror.new( ARGV ).run
 when "config"

data/examples/gemcutter_repo.ru

@@ -10,8 +10,7 @@
 #-----------------------------------------------------------------------
 $:.unshift File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
 
-require 'stickler/middleware/gemcutter'
-require 'stickler/middleware/compression'
+require 'stickler'
 
 gem_dir = File.expand_path( "../spec/tmp", File.dirname( __FILE__ ) )
 

data/lib/stickler.rb

@@ -1,10 +1,14 @@
 module Stickler
+  # The Current Version of the library
+  VERSION = "2.3.0"
 end
+require 'sinatra/base'
 
+require 'stickler/logable'
 require 'stickler/error'
 require 'stickler/paths'
+require 'stickler/spec_lite'
+
 require 'stickler/repository'
 require 'stickler/middleware'
-require 'stickler/spec_lite'
-require 'stickler/version'
 require 'stickler/server'

data/lib/stickler/client.rb

@@ -1,5 +1,4 @@
 require 'trollop'
-require 'rubygems'
 require 'stickler/client/config_file'
 
 module Stickler
@@ -43,8 +42,10 @@ module Stickler
   end
 end
 
-require 'stickler/client/push'
-require 'stickler/client/yank'
-require 'stickler/client/mirror'
 require 'stickler/client/config'
+require 'stickler/client/delete'
 require 'stickler/client/list'
+require 'stickler/client/mirror'
+require 'stickler/client/push'
+require 'stickler/client/unyank'
+require 'stickler/client/yank'

data/lib/stickler/client/delete.rb

@@ -0,0 +1,50 @@
+module Stickler
+  class Client
+    class Delete < Stickler::Client
+      def self.banner
+<<-_
+Completely Remove a gem from the gemserver's index.
+
+Usage: stickler delete [options] --gem-version x.y.z gem
+
+  Options:
+_
+      end
+
+      def parser
+        unless @parser then
+          @parser = super
+          @parser.opt( :gem_version,  "The version of the gem to delete (required)",  :type => :string, :required => true )
+          @parser.opt( :platform, "The platform of the gem to delete ", :type => :string, :default => ::Gem::Platform::RUBY )
+        end
+        return @parser
+      end
+
+      def parse( argv )
+        gem_name = nil
+        opts = super( argv ) do |p|
+          raise Trollop::CommandlineError, "At least one gem is required to delete" if p.leftovers.empty?
+          gem_name = p.leftovers.shift
+        end
+        opts[:gem_name] = gem_name
+        return opts
+      end
+
+      def run
+        opts = parse( self.argv )
+        repo = remote_repo_for( opts )
+        spec = Stickler::SpecLite.new( opts[:gem_name], opts[:gem_version], opts[:platform] )
+
+        $stdout.write "Deleting gem #{spec.full_name} from #{repo.uri} : "
+        $stdout.flush
+        if spec = repo.delete( spec ) then
+          $stdout.puts "OK"
+        else
+          $stdout.puts "FAILURE"
+        end
+     rescue Stickler::Repository::Error => e
+        $stdout.puts "ERROR: #{e.message}"
+     end
+    end
+  end
+end