stickler 2.1.1 → 2.1.2

data/HISTORY.asciidoc

@@ -2,6 +2,10 @@ Stickler Changelog
 ==================
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
+Version 2.1.2 - 2011-03-31
+--------------------------
+* Fix bug introduced in 2.1.1 where .gemspec urls would match but .gem urls would not
+
 Version 2.1.1 - 2011-03-31
 --------------------------
 * Fix bug where stickler would only serve ruby platform gems

data/lib/stickler/middleware/index.rb

@@ -56,6 +56,8 @@ module Stickler::Middleware
     include Stickler::Middleware::Helpers::Specs
     include Stickler::Logable
 
+    NAME_VERSION_PLATFORM_REGEX = "(.+)-([0-9.]+[0-9a-z.]*)(?:-(.+))?"
+
     # The respository of the Index is a Repository::Null
     attr_reader :repo
 
@@ -123,7 +125,7 @@ module Stickler::Middleware
     # Actually serve up the gem.  This is really only used by the child classes.
     # an Index instance will never have any gems to return.
     #
-    get %r{\A/gems/(.*?)-([0-9.]+)(-.*?)?\.gem\Z} do
+    get %r{\A/gems/#{NAME_VERSION_PLATFORM_REGEX}\.gem\Z} do
       name, version, platform = *params[:captures]
       spec = Stickler::SpecLite.new( name, version, platform )
       full_path = @repo.full_path_to_gem( spec )
@@ -140,7 +142,7 @@ module Stickler::Middleware
     #
     # To support pre-releases the a-z has been added to the version
     #
-    get %r{\A/quick/Marshal.#{Gem.marshal_version}/(.+)-([0-9.]+[0-9a-z.]*)(?:-(.+))?\.gemspec\.rz\Z} do
+    get %r{\A/quick/Marshal.#{Gem.marshal_version}/#{NAME_VERSION_PLATFORM_REGEX}\.gemspec\.rz\Z} do
       name, version, platform = *params[:captures]
       spec = Stickler::SpecLite.new( name, version, platform )
       full_path = @repo.full_path_to_specification( spec )

data/lib/stickler/version.rb

@@ -12,7 +12,7 @@ module Stickler
 
     MAJOR = 2
     MINOR = 1
-    BUILD = 1
+    BUILD = 2
 
     def self.to_ary
       [ MAJOR, MINOR, BUILD ]

data/man/stickler-passenger-config.1

@@ -0,0 +1,106 @@
+'\" t
+.\"     Title: stickler-passenger-config
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/31/2011
+.\"    Manual: \ \&
+.\"    Source: \ \&
+.\"  Language: English
+.\"
+.TH "STICKLER\-PASSENGER\" "1" "03/31/2011" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+stickler-passenger-config \- output a Phusion Passenger config for stickler
+.SH "SYNOPSIS"
+.sp
+\fBstickler\-passenger\-config\fR [\fI\-\-help\fR] [\fICOMMAND\fR] [\fICOMMAND_OPTIONS\fR] /path/to/stickler/root
+.SH "DESCRIPTION"
+.sp
+\fBstickler\-passenger\-config\fR will create a stickler web application directory, including the config\&.ru file for use with Phusion Passenger\&. It will then output the stanza to be incorporated into an Apache or Nginx configuration\&.
+.SH "COMMANDS"
+.TS
+tab(:);
+lt lt
+lt lt.
+T{
+.sp
+\fBapache2\fR
+T}:T{
+.sp
+Output an Apache config\&.
+T}
+T{
+.sp
+\fBnginx\fR
+T}:T{
+.sp
+Output an Nginx config\&.
+T}
+.TE
+.sp 1
+.SH "OPTIONS"
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+Show the help message
+.RE
+.PP
+\fB\-v, \-\-version\fR
+.RS 4
+Output the version\&.
+.RE
+.SH "EXAMPLES"
+.sp
+Output a passenger config for use with apache\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler\-passenger\-config apache2 /var/lib/stickler
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Output a pasenger a config to be integrated with an nginx config\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler\-passenger\-config nginx /var/lib/stickler
+.fi
+.if n \{\
+.RE
+.\}
+.SH "SEE ALSO"
+.sp
+\fBstickler\fR(1), \fBstickler-server\fR(1)
+.SH "AUTHOR"
+.sp
+Written by Jeremy Hinegardner <jeremy@hinegardner\&.org>
+.SH "RESOURCES"
+.sp
+GitHub project: http://www\&.github\&.com/copiousfreetime/stickler
+.SH "BUGS"
+.sp
+Please report bugs to the github issue tracker http://github\&.com/copiousfreetime/stickler/issues

data/man/stickler-server.1

@@ -0,0 +1,131 @@
+'\" t
+.\"     Title: stickler-server
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/31/2011
+.\"    Manual: \ \&
+.\"    Source: \ \&
+.\"  Language: English
+.\"
+.TH "STICKLER\-SERVER" "1" "03/31/2011" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+stickler-server \- start and stop the stickler server process
+.SH "SYNOPSIS"
+.sp
+\fBstickler\-server\fR [\fI\-\-help\fR] [\fICOMMAND\fR] [\fICOMMAND_OPTIONS\fR] /path/to/stickler/root
+.SH "DESCRIPTION"
+.sp
+stickler\-server is the daemon process that houses the repositories of proprietary gems and/or mirrors of third party gems\&.
+.SH "COMMANDS"
+.TS
+tab(:);
+lt lt
+lt lt.
+T{
+.sp
+\fBstart\fR
+T}:T{
+.sp
+Start the stickler server process
+T}
+T{
+.sp
+\fBstop\fR
+T}:T{
+.sp
+Stop the stickler server process
+T}
+.TE
+.sp 1
+.SH "OPTIONS"
+.PP
+\fB\-d, \-\-daemonize\fR
+.RS 4
+Daemonize the server
+.RE
+.PP
+\fB\-\-help\fR
+.RS 4
+Show the help message
+.RE
+.PP
+\fB\-h, \-\-host\fR=\fIHOST\fR
+.RS 4
+The host address to bind to (default: 0\&.0\&.0\&.0)
+.RE
+.PP
+\fB\-o, \-\-port\fR=\fIPORT\fR
+.RS 4
+The port to bind to (default: 6789)
+.RE
+.PP
+\fB\-p, \-\-pid\fR=\fIPID_FILE\fR
+.RS 4
+Path to wriate a pid file to after daemonizing
+.RE
+.PP
+\fB\-s, \-\-server\fR=\fISERVER\fR
+.RS 4
+The rack handler to use: thin, mongrel, webrick, etc\&.
+.RE
+.PP
+\fB\-v, \-\-version\fR
+.RS 4
+Output the version\&.
+.RE
+.SH "EXAMPLES"
+.sp
+Start the server, daemonized, using /var/lib/stickler as the root directory of all the repositories\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler\-server start \-\-daemonize /var/lib/stickler
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Stop the server that is using /var/lib/stickler as its root directory\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler\-server stop /var/lib/stickler
+.fi
+.if n \{\
+.RE
+.\}
+.SH "SEE ALSO"
+.sp
+\fBstickler\fR(1), \fBstickler-passenger-config\fR(1)
+.SH "AUTHOR"
+.sp
+Written by Jeremy Hinegardner <jeremy@hinegardner\&.org>
+.SH "RESOURCES"
+.sp
+GitHub project: http://www\&.github\&.com/copiousfreetime/stickler
+.SH "BUGS"
+.sp
+Please report bugs to the github issue tracker http://github\&.com/copiousfreetime/stickler/issues

data/man/stickler.1

@@ -0,0 +1,262 @@
+'\" t
+.\"     Title: stickler
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 03/31/2011
+.\"    Manual: \ \&
+.\"    Source: \ \&
+.\"  Language: English
+.\"
+.TH "STICKLER" "1" "03/31/2011" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+stickler \- command line program to interact with a stickler\-server
+.SH "SYNOPSIS"
+.sp
+\fBstickler\fR [\fI\-\-help\fR] [\fICOMMAND\fR] [\fICOMMAND_OPTIONS\fR] [\fIgemfile(s)\fR]
+.SH "DESCRIPTION"
+.sp
+Stickler is a tool to organize and maintain an internal gem repository of proprietary gems and/or a mirror of third party gems\&.
+.sp
+The \fBstickler\fR(1) command interacts with an instance of \fBstickler-server\fR(1) to control the publishing and mirroring of ruby gems\&.
+.SH "COMMANDS"
+.TS
+tab(:);
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt.
+T{
+.sp
+\fBpush\fR
+T}:T{
+.sp
+Push one or more gems to a gemserver\&. This works the same as gem push although there is no authorization mechanism\&.
+T}
+T{
+.sp
+\fByank\fR
+T}:T{
+.sp
+Remove a gem from the gemserver\(cqs index\&. It will still be available from direct download\&. This works the same as gem yank\&.
+T}
+T{
+.sp
+\fBmirror\fR
+T}:T{
+.sp
+Pull a specific version of a gem from an upstream gem server and store it in a \fBstickler-server\fR(1)
+T}
+T{
+.sp
+\fBconfig\fR
+T}:T{
+.sp
+Access or update the stickler client configuration\&.
+T}
+T{
+.sp
+\fBlist\fR
+T}:T{
+.sp
+List all the gems in the remote repository
+T}
+.TE
+.sp 1
+.SH "OPTIONS"
+.sp
+These are the options for all commands\&. Not all options apply to all commands\&.
+.PP
+\fB\-a, \-\-add\fR
+.RS 4
+Add the
+\-\-server
+or
+\-\-upstream
+items to the config file when using the
+config
+command\&.
+.RE
+.PP
+\fB\-d, \-\-debug\fR
+.RS 4
+Output debug information
+.RE
+.PP
+\fB\-g, \-\-gem\-version\fR=\fIVERSION\fR
+.RS 4
+The version of the gem to yank from
+\-\-server
+or to mirror from
+\-\-upstream\&.
+.RE
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+Show the help message
+.RE
+.PP
+\fB\-l, \-\-list\fR
+.RS 4
+Display the current configuration when using the
+config
+command\&.
+.RE
+.PP
+\fB\-p, \-\-platform\fR=\fIPLATFORM\fR
+.RS 4
+The platform of the gem to yank from
+\-\-server
+or to mirror from
+\-\-upstream
+(e\&.g\&. ruby, java, mswin32)
+.RE
+.PP
+\fB\-s, \-\-server\fR=\fISERVER\fR
+.RS 4
+The gem server or
+\fBstickler-server\fR(1)
+URL\&. This is used by all the commands\&.
+.RE
+.PP
+\fB\-u, \-\-upstream\fR=\fISERVER\fR
+.RS 4
+The upstream server from which to mirror a gem when using the
+mirror
+command\&.
+.RE
+.PP
+\fB\-v, \-\-version\fR
+.RS 4
+Output the version\&.
+.RE
+.SH "CONFIGURATION"
+.sp
+Stickler uses the \&.gem/stickler file to hold its configuration\&. It is a yaml file and Currently there are two options\&. These are altered using the stickler config command\&.
+.TS
+tab(:);
+lt lt
+lt lt.
+T{
+.sp
+\fBupstream\fR
+T}:T{
+.sp
+The default upstream server from which to mirror gems\&.
+T}
+T{
+.sp
+\fBserver\fR
+T}:T{
+.sp
+The default \fBstickler-server\fR(1) to interact with\&.
+T}
+.TE
+.sp 1
+.sp
+An example config file
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\-\-\-
+:server: http://stickler\&.example\&.com
+:upstream: https://rubygems\&.org
+.fi
+.if n \{\
+.RE
+.\}
+.SH "EXAMPLES"
+.sp
+Push the local my_gem\-1\&.0\&.0\&.gem file to the \fBstickler-server\fR(1) at \fBstickler\&.example\&.com\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler push \&./my_gem\-1\&.0\&.0\&.gem \-\-server http://stickler\&.example\&.com/
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Push all the gems in the pkg directory to the \fBstickler-server\fR(1) at \fBstickler\&.example\&.com\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler push \-\-server http://stickler\&.example\&.com/ \&./pkg/*\&.gem
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Yank vesion 1\&.0\&.0 of my_gem from the gem index on sticker\&.example\&.com
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler yank my_gem \-\-version 1\&.0\&.0 \-\-server http://stickler\&.example\&.com/
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Take the third_party gem, version 1\&.4\&.2 that is on \fBrubygems\&.org\fR and mirror it on \fBstickler\&.example\&.com\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler mirror third_party_gem \-\-gem\-version 0\&.4\&.2 \-\-upstream http://rubygems\&.org/ \-\-server http://stickler\&.example\&.com/
+stickler mirror \-\-help
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Set the server and upstream configration values in the \&.gem/stickler file\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+stickler config \-\-add \-\-server http://stickler\&.example\&.com \-\-upstream http://rubygems\&.org/
+.fi
+.if n \{\
+.RE
+.\}
+.SH "SEE ALSO"
+.sp
+\fBstickler-server\fR(1), \fBstickler-passenger-config\fR(1)
+.SH "AUTHOR"
+.sp
+Written by Jeremy Hinegardner <jeremy@hinegardner\&.org>
+.SH "RESOURCES"
+.sp
+GitHub project: http://www\&.github\&.com/copiousfreetime/stickler
+.SH "BUGS"
+.sp
+Please report bugs to the github issue tracker http://github\&.com/copiousfreetime/stickler/issues

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stickler
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -282,8 +282,11 @@ files:
 - lib/stickler/spec_lite.rb
 - lib/stickler/version.rb
 - man/asciidoc.conf
+- 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/gems/bar-1.0.0.gem
 - spec/data/gems/baz-3.1.4-java.gem