stickler 2.1.2 → 2.1.3

data/.gitignore

@@ -17,3 +17,7 @@ man/*.1
 *.gemspec
 work/
 *.css
+Gemfile*
+.rvmrc
+spec/data/mirror
+spec/data/gemcutter

data/HISTORY.asciidoc

@@ -2,6 +2,12 @@ Stickler Changelog
 ==================
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
+Version 2.1.3 - 2011-07-24
+--------------------------
+* Do not feed ARGV strings directly into Gem::Version (copiousfreetime/stickler#4)
+* In web page, display gems in sort order, not lexical order (copiousfreetime/stickler#16)
+* Make sure Rack body's respond to #each (copiousfreetime/stickler#17)
+
 Version 2.1.2 - 2011-03-31
 --------------------------
 * Fix bug introduced in 2.1.1 where .gemspec urls would match but .gem urls would not

data/README.asciidoc

@@ -132,6 +132,13 @@ View which manual?
 >
 ---------------------------------
 
+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
 -------

data/Rakefile

@@ -1,7 +1,9 @@
 begin
+  USING_BONES_VERSION = '3.7.0'
   require 'bones'
 rescue LoadError
-  abort '### Please install the "bones" gem ###'
+  load 'tasks/contribute.rake'
+  Rake.application.invoke_task( :help )
 end
 
 task :default => 'spec:run'
@@ -36,16 +38,24 @@ Primarily, you would want to use Stickler if:
 3. You want both (1) and (2) in the same server.
 _
 
+  # I'm explicitly controlling the version of bones.
+
 
   depend_on 'sinatra'    , '~> 1.2.1'
   depend_on 'addressable', '~> 2.2.4'
-  depend_on 'excon'      , '~> 0.5.8'
+  depend_on 'excon'      , '~> 0.6.5'
   depend_on 'trollop'    , '~> 1.16.2'
   depend_on 'logging'    , '~> 1.5.0'
 
-  depend_on 'bones'       , '~> 3.6.5', :development => true
-  depend_on 'rack-test'   , '~> 0.5.7', :development => true
+  depend_on 'rake'        , '~> 0.9.2'
+  depend_on 'bones'       , "~> #{USING_BONES_VERSION}", :development => true
+  depend_on 'rack-test'   , '~> 0.6.0', :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
+  depend_on 'rspec'       , '~> 2.6.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

data/lib/stickler/client.rb

@@ -12,8 +12,11 @@ module Stickler
       ::Stickler::Client::ConfigFile.new
     end
 
+    # Create a new client
+    #
+    # Takes an argv like array as a parameter.
     def initialize( argv = ARGV )
-      @argv          = argv
+      @argv = argv.collect { |e| e.dup }
     end
 
     def parser

data/lib/stickler/middleware/compression.rb

@@ -24,6 +24,7 @@ module Stickler::Middleware
           stream = Gem.deflate( body.first )
         end
       end
+      stream = [ stream.to_s ] unless stream.respond_to?( :each )
       return [ status, headers, stream ]
     end
   end

data/lib/stickler/server/views/index.erb

@@ -22,7 +22,7 @@
            <li <%= 'class="stripe"' if 1 == (idx % 2 )%> >
             <div class="gem">
               <div class="name"><h3><%= spec_group.first.name %></h3></div>
-              <div class="version"><strong>Version(s):</strong><br /><%= spec_group.sort_by{ |spec| spec.full_name }.collect{ |spec| "<a href=\"/gems/#{spec.file_name}\">#{spec.version_platform}</a>" }.reverse.join(" ") %></strong></div>
+              <div class="version"><strong>Version(s):</strong><br /><%= spec_group.sort.collect{ |spec| "<a href=\"/gems/#{spec.file_name}\">#{spec.version_platform}</a>" }.reverse.join(" ") %></strong></div>
             </div>
           </li>
           <% end %>

data/lib/stickler/server/views/layout.erb

@@ -35,7 +35,6 @@
 
 <div class="container">
   <%= yield %>
-</div>
 </div> <!--! end of #container -->
 
 </body>

data/lib/stickler/version.rb

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

data/spec/spec_lite_spec.rb

@@ -86,4 +86,13 @@ describe Stickler::SpecLite do
     spec = Stickler::SpecLite.new( 'prerelease', '1.2.3' )
     spec.should_not be_prerelease
   end
+
+  it "needs to be version sortable" do
+    a = Stickler::SpecLite.new( "foo", "1.0.3" )
+    b = Stickler::SpecLite.new( "foo", "1.0.22" )
+    c = Stickler::SpecLite.new( "foo", "1.0.17" )
+
+    [ b, a, c ].sort.should == [ a, c, b ]
+
+  end
 end

data/tasks/bundler.rake

@@ -0,0 +1,13 @@
+namespace :bundle do
+
+  file 'Gemfile' => [ 'gem:spec' ] do
+    File.open( 'Gemfile', 'w+' ) do |f|
+      f.puts 'source "http://rubygems.org"'
+      f.puts 'gemspec'
+    end
+  end
+
+  desc "Create a bundler Gemfile"
+  task :gemfile => 'Gemfile'
+
+end

data/tasks/contribute.rake

@@ -0,0 +1,36 @@
+desc "Instructions on how to contribute to stickler"
+task :help do
+  abort <<-_banner
+-----------------------------------------------------------------------
+  I see you are wanting to do some development on stickler. You will 
+  need to install the 'bones' gem first.
+
+     % gem install bones -v #{USING_BONES_VERSION}
+
+  The easiest way to start after that is with the 
+  'install:dependencies' task:
+
+     % rake gem:install_dependencies
+
+  If you use bundler, then you will need to first create the Gemfile 
+  and then run 'bundle install':
+
+     % rake bundle:gemfile
+     % bundle install
+
+  Now you are ready to work on stickler.  Please submit bugs and pull 
+  requests to:
+
+    https://github.com/copiousfreetime/stickler
+
+  Thanks!
+
+     -jeremy
+-----------------------------------------------------------------------
+_banner
+end
+
+desc "(Alias for 'help') Instructions on how to contribute to stickler"
+task 'how_to_contribute' => :help
+desc "(Alias for 'help') Instructions on how to contribute to stickler"
+task '==> I WANT TO CONTRIBUTE <==' => :help

metadata

@@ -1,217 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stickler
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 2.1.3
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 2
-  version: 2.1.2
 platform: ruby
-authors: 
+authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-31 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2158143400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2158143400
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &2158142480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 2
-        - 4
+      - !ruby/object:Gem::Version
         version: 2.2.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2158142480
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: &2158141660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 5
-        - 8
-        version: 0.5.8
+      - !ruby/object:Gem::Version
+        version: 0.6.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2158141660
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &2158140940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 83
-        segments: 
-        - 1
-        - 16
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: logging
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2158140940
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: &2158140300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bones
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2158140300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2158139480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158139480
+- !ruby/object:Gem::Dependency
+  name: bones
+  requirement: &2158138500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 6
-        - 5
-        version: 3.6.5
+      - !ruby/object:Gem::Version
+        version: 3.7.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2158138500
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2158137600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
-        version: 0.5.7
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bones-extras
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2158137600
+- !ruby/object:Gem::Dependency
+  name: bones-extras
+  requirement: &2158136260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2158136260
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &2158135360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2158135360
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2158134380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: bones
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 6
-        - 5
-        version: 3.6.5
-  type: :development
-  version_requirements: *id011
-description: |
-  Stickler is a tool to organize and maintain an internal gem repository.
-  Primarily, you would want to use Stickler if:
-  
-  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.
-
+  version_requirements: *2158134380
+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
+  like to have a local mirror of third party gems from either \n   http://rubygems.org
+  or some other gem server.\n3. You want both (1) and (2) in the same server.\n"
 email: jeremy@hinegardner.org
-executables: 
+executables:
 - stickler
 - stickler-passenger-config
 - stickler-server
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - bin/stickler
 - bin/stickler-passenger-config
 - bin/stickler-server
@@ -224,9 +156,9 @@ extra_rdoc_files:
 - lib/stickler/server/public/js/modernizr-1.5.min.js
 - lib/stickler/server/views/index.erb
 - lib/stickler/server/views/layout.erb
-files: 
-- .bnsignore
+files:
 - .gitignore
+- .rvmrc
 - HISTORY.asciidoc
 - LICENSE
 - README.asciidoc
@@ -288,6 +220,8 @@ files:
 - 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/foo-1.0.0.gem
@@ -310,45 +244,37 @@ files:
 - spec/spec_helper.rb
 - spec/spec_lite_spec.rb
 - tasks/asciidoc.rake
+- tasks/bundler.rake
+- tasks/contribute.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: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.asciidoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: stickler
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Stickler is a tool to organize and maintain an internal gem repository.
 test_files: []
-

data/.bnsignore

@@ -1,14 +0,0 @@
-*~
-pkg
-log
-doc
-coverage
-*.swp
-*.swo
-.*.swp
-announcement.txt
-spec/tmp
-version.txt
-*.pid
-tmp
-*.html