stickler 2.2.3 → 2.2.4

data/HISTORY.asciidoc

@@ -3,10 +3,11 @@ Stickler Changelog
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
 
-Version 2.2.3 - 2012-02-26
+Version 2.2.4 - 2012-02-26
 --------------------------
 * Fixed authentication failing on mirror command (copiousfreetime/stickler/#12)
 * Fixed 'list' command not working when no flags where given
+* Fixed latest_specs not having all platforms in it (copiousfreetime/stickler/#21)
 
 Version 2.2.2 - 2012-02-13
 --------------------------

data/lib/stickler/repository/index.rb

@@ -46,12 +46,13 @@ module Stickler::Repository
       latest = {}
       specs.each do |s|
         next if s.prerelease?
-        if old_spec = latest[s.name] then
+        key = "#{s.name}.#{s.platform}"
+        if old_spec = latest[key] then
           if old_spec.version < s.version then
-            latest[s.name] = s
+            latest[key] = s
           end
         else
-          latest[s.name] = s
+          latest[key] = s
         end
       end
       latest.values

data/lib/stickler/version.rb

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

data/spec/index_spec_helpers.rb

@@ -64,7 +64,10 @@ module IndexSpecHelpers
     end
 
     got  = Marshal.load( response_un )
+    got.sort! if got.kind_of?( Array )
+
     need = Marshal.load( expected_un )
+    need.sort! if need.kind_of?( Array )
     got.should == need
   end
 end

data/spec/middleware/local_spec.rb

@@ -37,7 +37,8 @@ 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"
+      "/quick/Marshal.#{Gem.marshal_version}/baz-3.1.4-java.gemspec.rz",
+      "/quick/Marshal.#{Gem.marshal_version}/baz-3.1.4.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 baz-3.1.4-java foo-1.0.0 ]
+    @index.latest_specs.collect { |s| s.full_name }.sort.should == %w[ bar-1.0.0 baz-3.1.4 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 == 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 ]
+    @index.released_specs.size.should == 4
+    @index.released_specs.collect { |s| s.full_name }.sort.should == %w[ bar-1.0.0 baz-3.1.4 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 == 4
+    @repo.specs.size.should == 5
   end
 
   it "two instances with the same repo dir are the same object" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stickler
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70269982138640 !ruby/object:Gem::Requirement
+  requirement: &70161735418480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70269982138640
+  version_requirements: *70161735418480
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70269982137620 !ruby/object:Gem::Requirement
+  requirement: &70161735417740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70269982137620
+  version_requirements: *70161735417740
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70269982136040 !ruby/object:Gem::Requirement
+  requirement: &70161735395620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70269982136040
+  version_requirements: *70161735395620
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70269982134860 !ruby/object:Gem::Requirement
+  requirement: &70161735367080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70269982134860
+  version_requirements: *70161735367080
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &70269982133520 !ruby/object:Gem::Requirement
+  requirement: &70161735361060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70269982133520
+  version_requirements: *70161735361060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70269982132600 !ruby/object:Gem::Requirement
+  requirement: &70161735346760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70269982132600
+  version_requirements: *70161735346760
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &70269982131600 !ruby/object:Gem::Requirement
+  requirement: &70161735322040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *70269982131600
+  version_requirements: *70161735322040
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70269982126400 !ruby/object:Gem::Requirement
+  requirement: &70161735196080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70269982126400
+  version_requirements: *70161735196080
 - !ruby/object:Gem::Dependency
   name: bones-extras
-  requirement: &70269982125260 !ruby/object:Gem::Requirement
+  requirement: &70161734972200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70269982125260
+  version_requirements: *70161734972200
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70269982124340 !ruby/object:Gem::Requirement
+  requirement: &70161734965080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70269982124340
+  version_requirements: *70161734965080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70269982123460 !ruby/object:Gem::Requirement
+  requirement: &70161734955780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70269982123460
+  version_requirements: *70161734955780
 description: ! "Stickler is a tool to organize and maintain an internal gem repository.\nPrimarily,
   you would want to use Stickler if:\n\n1. You have proprietary gems that you want
   to have available via a gem server so \n   you may +gem install+ them.\n2. You would
@@ -218,17 +218,22 @@ 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/gemcutter/gems/foo-1.0.0.gem
 - spec/data/gemcutter/specifications/foo-1.0.0.gemspec
 - 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/data/specifications/bar-1.0.0.gemspec
 - spec/data/specifications/baz-3.1.4-java.gemspec
+- spec/data/specifications/baz-3.1.4.gemspec
 - spec/data/specifications/foo-1.0.0.gemspec
 - spec/data/specifications/foo-2.0.0a.gemspec
 - spec/index_spec_helpers.rb