stickler 2.1.0 → 2.1.1

data/.gitignore

@@ -16,3 +16,4 @@ man/*.xml
 man/*.1
 *.gemspec
 work/
+*.css

data/HISTORY.asciidoc

@@ -2,6 +2,10 @@ Stickler Changelog
 ==================
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
+Version 2.1.1 - 2011-03-31
+--------------------------
+* Fix bug where stickler would only serve ruby platform gems
+
 Version 2.1.0 - 2011-03-25
 --------------------------
 * Added 'list' client command

data/README.asciidoc

@@ -143,8 +143,9 @@ License
 Copyright (C) 2008-2010 Jeremy Hinegardner
 ISC License, See LICENSE for details
 
+
 Appendix
 --------
 * http://github.com/copiousfreetime/stickler[Github Project]
+* link:HISTORY.html[History]
 * http://www.copiousfreetime.org/projects/stickler/
-

data/lib/stickler/client/mirror.rb

@@ -46,7 +46,7 @@ _
         $stdout.flush
 
         uri  = [ repo.uri.join( upstream_host ), opts[:gem_name], opts[:gem_version], opts[:platform] ].join("/")
-        resp = Excon.post( uri, :expects => [200] )
+        resp = Excon.post( uri, :expects => [200, 201] )
 
         $stdout.puts "OK -> #{repo.uri.join(resp.headers['Location'])}"
       rescue Excon::Errors::Error => he

data/lib/stickler/middleware/index.rb

@@ -140,7 +140,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}/(.+)-([0-9.]+[0-9a-z.]*)(?:-(.+))?\.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 = 0
+    BUILD = 1
 
     def self.to_ary
       [ MAJOR, MINOR, BUILD ]

data/spec/middleware/local_spec.rb

@@ -37,6 +37,7 @@ describe Stickler::Middleware::Local do
       "/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",
+      "/quick/Marshal.#{Gem.marshal_version}/baz-3.1.4-java.gemspec.rz"
     ].each do |path|
       it "should return the same bytes as Gem::Indexer for '#{path}'" do
         response = get( path )

data/spec/repository/index_spec.rb

@@ -31,7 +31,7 @@ describe ::Stickler::Repository::Index do
 
   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 ]
+    @index.latest_specs.collect { |s| s.full_name }.sort.should == %w[ bar-1.0.0 baz-3.1.4-java foo-1.0.0 ]
   end
 
   it "knows the pre-release specs" do
@@ -40,8 +40,8 @@ describe ::Stickler::Repository::Index do
   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 ]
+    @index.released_specs.size.should == 3
+    @index.released_specs.collect { |s| s.full_name }.sort.should == %w[ bar-1.0.0 baz-3.1.4-java foo-1.0.0 ]
   end
 end
 

data/spec/repository/local_spec.rb

@@ -29,7 +29,7 @@ describe ::Stickler::Repository::Local do
     Dir.glob( File.join( @gems_dir, "*.gem" ) ).each do |gem|
       @repo.push( gem )
     end
-    @repo.specs.size.should == 3
+    @repo.specs.size.should == 4
   end
 
   it "two instances with the same repo dir are the same object" do

data/tasks/asciidoc.rake

@@ -0,0 +1,32 @@
+namespace :asciidoc do
+
+  rule '.html' => '.asciidoc' do |t|
+    sh "a2x --no-xmllint --format xhtml #{t.source}"
+  end
+
+  src  = FileList["*.asciidoc", "man/*.asciidoc"]
+  html = src.collect{ |f| f.ext( "html" ) }
+
+  desc "Create html pages"
+  task :create => html
+
+  task :clobber_asciidoc do
+    rm_f FileList["man/*.{html,xml,css}", "*.{html,xml,css}"]
+    rm_rf FileList["asciidoc-output"]
+  end
+
+  desc "Deploy the asciidoc"
+  task :deploy => html do
+    FileUtils.cp "README.html", "index.html"
+    %w[ . man ].each do |d|
+      dest_d = File.expand_path( "asciidoc-output/#{d}" )
+      FileUtils.mkdir dest_d unless File.directory?( dest_d )
+      FileUtils.cp FileList["#{d}/*.{css,html}"], dest_d
+    end
+    sh "rsync -ravz asciidoc-output/* #{ENV['DEST_DIR']}" if ENV['DEST_DIR']
+  end
+end
+
+desc "Alias to asciidoc:create"
+task :asciidoc => "asciidoc:create"
+task :clobber => %w[ asciidoc:clobber_asciidoc]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stickler
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -06:00
+date: 2011-03-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -282,16 +282,15 @@ 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
 - spec/data/gems/foo-1.0.0.gem
 - spec/data/gems/foo-2.0.0a.gem
 - spec/data/specifications/bar-1.0.0.gemspec
+- spec/data/specifications/baz-3.1.4-java.gemspec
 - spec/data/specifications/foo-1.0.0.gemspec
 - spec/data/specifications/foo-2.0.0a.gemspec
 - spec/index_spec_helpers.rb
@@ -307,7 +306,12 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_lite_spec.rb
+- tasks/asciidoc.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
 has_rdoc: true
 homepage: http://www.copiousfreetime.org/projects/stickler
 licenses: []