stickler 2.2.2 → 2.2.3

data/.bnsignore

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

data/HISTORY.asciidoc

@@ -3,6 +3,11 @@ Stickler Changelog
 Jeremy Hinegardner <jeremy@hinegardner.org>
 
 
+Version 2.2.3 - 2012-02-26
+--------------------------
+* Fixed authentication failing on mirror command (copiousfreetime/stickler/#12)
+* Fixed 'list' command not working when no flags where given
+
 Version 2.2.2 - 2012-02-13
 --------------------------
 * Updated dependencies to latest versions

data/lib/stickler.rb

@@ -8,5 +8,3 @@ require 'stickler/middleware'
 require 'stickler/spec_lite'
 require 'stickler/version'
 require 'stickler/server'
-
-

data/lib/stickler/client.rb

@@ -30,7 +30,6 @@ module Stickler
 
     def parse( argv )
       opts = Trollop::with_standard_exception_handling( parser ) do
-        raise Trollop::HelpNeeded if argv.empty? # show help screen
         o = parser.parse( argv )
         yield parser if block_given?
         return o

data/lib/stickler/client/mirror.rb

@@ -1,3 +1,4 @@
+require 'stickler/repository/remote_mirror'
 module Stickler
   class Client
     class Mirror < Stickler::Client
@@ -36,6 +37,10 @@ _
         opts[:server] || Client.config.server
       end
 
+      def remote_repo_for( opts )
+        Stickler::Repository::RemoteMirror.new( opts[:server], :debug => opts[:debug] )
+      end
+
       def run
         opts = parse( self.argv )
         repo = remote_repo_for( opts )
@@ -45,13 +50,11 @@ _
         $stdout.write "Asking #{repo.uri} to mirror #{spec.full_name} from #{upstream_host} : "
         $stdout.flush
 
-        uri  = [ repo.uri.join( upstream_host ), opts[:gem_name], opts[:gem_version], opts[:platform] ].join("/")
-        resp = Excon.post( uri, :expects => [200, 201] )
+        resp = repo.mirror( spec, upstream_host )
 
         $stdout.puts "OK -> #{repo.uri.join(resp.headers['Location'])}"
-      rescue Excon::Errors::Error => he
-        resp = he.response
-        $stdout.puts "ERROR -> #{resp.body}"
+      rescue Stickler::Repository::Error => e
+        $stdout.puts "ERROR: #{e.message}"
       rescue StandardError => e
         puts e.backtrace.join("\n")
         $stdout.puts "ERROR -> #{e.message}"

data/lib/stickler/repository/api.rb

@@ -1,4 +1,3 @@
-require 'stickler/repository'
 require 'stickler/spec_lite'
 
 module Stickler::Repository

data/lib/stickler/repository/local.rb

@@ -1,7 +1,6 @@
 require 'stickler/spec_lite'
 require 'stickler/logable'
 require 'stickler/repository'
-require 'stickler/repository/api'
 require 'stickler/repository/index'
 require 'addressable/uri'
 require 'tempfile'

data/lib/stickler/repository/mirror.rb

@@ -1,4 +1,3 @@
-require 'stickler/repository'
 require 'stickler/repository/remote'
 require 'stickler/repository/local'
 require 'forwardable'

data/lib/stickler/repository/null.rb

@@ -1,5 +1,4 @@
 require 'stickler/repository'
-
 module Stickler::Repository
   #
   # A null repository.  It is in most respecs like a Repository::Local that has

data/lib/stickler/repository/remote.rb

@@ -1,6 +1,6 @@
 require 'excon'
-require 'stickler/repository'
 require 'stickler/version'
+require 'stickler/repository'
 require 'stickler/repository/api'
 require 'stickler/repository/rubygems_authenticator'
 require 'stickler/repository/basic_authenticator'

data/lib/stickler/repository/remote_mirror.rb

@@ -0,0 +1,31 @@
+require 'stickler/repository/remote'
+module ::Stickler::Repository
+  #
+  # A Repository::Api implementation that retrieves all is data from an HTTP
+  # based remote location.  It utilizes the Modern gem server api and the gem
+  # cutter api (push/yank/unyank).  The legacy gem server api is not utilized.
+  #
+  # This also supports the single extra method #mirror which tells the remote
+  # mirror repostory to mirro the given gem from an upstream server.
+  #
+  class RemoteMirror < Remote
+    # Tell the remote repoistory to mirror the given gem from an upstream
+    # repository
+    def mirror( spec, upstream_host )
+      raise Stickler::Repository::Error, "gem #{spec.full_name} already exists in remote repository" if remote_gem_file_exist?( spec )
+      resp = resource_request( mirror_resource( spec, upstream_host ) )
+    end
+
+    private
+
+    def mirror_uri( spec, upstream_host )
+      [ uri.join( upstream_host ), spec.name, spec.version.to_s, spec.platform].join("/")
+    end
+
+    def mirror_resource( spec, upstream_host )
+      muri   = mirror_uri( spec, upstream_host )
+      params = { :method => :post, :expects => [200, 201] }
+      Excon.new( muri.to_s, params )
+    end
+  end
+end

data/lib/stickler/version.rb

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

metadata

@@ -1,217 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stickler
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 2.2.3
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 2
-  version: 2.2.2
 platform: ruby
-authors: 
+authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70269982138640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982138640
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70269982137620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 2
-        - 6
+      - !ruby/object:Gem::Version
         version: 2.2.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982137620
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: &70269982136040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 9
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.9.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982136040
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &70269982134860 !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: *70269982134860
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: &70269982133520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982133520
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70269982132600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: bones
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982132600
+- !ruby/object:Gem::Dependency
+  name: bones
+  requirement: &70269982131600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 3
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 3.7.3
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982131600
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70269982126400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: bones-extras
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982126400
+- !ruby/object:Gem::Dependency
+  name: bones-extras
+  requirement: &70269982125260 !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: *id009
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982125260
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70269982124340 !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: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70269982124340
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70269982123460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
   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.
-
+  prerelease: false
+  version_requirements: *70269982123460
+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,7 +156,8 @@ 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: 
+files:
+- .bnsignore
 - .gitignore
 - .rvmrc
 - HISTORY.asciidoc
@@ -270,6 +203,7 @@ files:
 - 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
@@ -316,37 +250,28 @@ files:
 - tasks/man.rake
 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.8.15
 signing_key: 
 specification_version: 3
 summary: Stickler is a tool to organize and maintain an internal gem repository.
 test_files: []
-