iudex-worker 1.1.0-java → 1.2.b.0-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 1.2.b.0 (2012-3-4)
+* Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec (dev)
+* Fix agent http tests by checking deeper than package name loaded via
+  bundler/gemspecs
+
 === 1.1.0 (2011-11-13)
 * Update to iudex-core, -da, -rome, -html, -simhash ~> 1.1.0
 * Changes for VisitManager, VisitCounter, RedirectHandler, Revisitor

data/README.rdoc

@@ -10,7 +10,7 @@ processing.
 
 == License
 
-Copyright (c) 2008-2011 David Kellum
+Copyright (c) 2008-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You may

data/Rakefile

@@ -1,44 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-require 'iudex-worker/base'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-t = RJack::TarPit.new( 'iudex-worker', Iudex::Worker::VERSION, :java_platform )
-
-t.specify do |h|
-  h.developer( "David Kellum", "dek-oss@gravitext.com" )
-
-  h.extra_deps += [ [ 'iudex-core',     '~> 1.1.0' ],
-                    [ 'rjack-logback',  '~> 1.0'   ],
-                    [ 'iudex-da',       '~> 1.1.0' ],
-                    [ 'iudex-rome',     '~> 1.1.0' ],
-                    [ 'iudex-html',     '~> 1.1.0' ],
-                    [ 'iudex-simhash',  '~> 1.1.0' ],
-                    [ 'iudex-char-detector', '~> 1.1.0' ] ]
-
-  h.testlib = :minitest
-  h.extra_dev_deps += [ [ 'minitest',   '~> 2.3' ],
-                        [ 'iudex-httpclient-3',     '~> 1.1.0' ],
-                        [ 'iudex-jetty-httpclient', '~> 1.1.0' ],
-                        [ 'iudex-async-httpclient', '~> 1.1.0' ] ]
-end
-
-task :chk_hist_vers do
-  t.test_line_match( 'History.rdoc', /^==/, / #{t.version} / )
-end
-task :chk_init_v do
-  t.test_line_match( 'init/iudex-worker', /^gem.+#{t.name}/, /= #{t.version}/ )
-end
-task :chk_hist_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :chk_hist_vers, :chk_init_v                 ]
-task :tag  => [ :chk_hist_vers, :chk_init_v, :chk_hist_date ]
-task :push => [                              :chk_hist_date ]
-
-t.define_tasks
+RJack::TarPit.new( 'iudex-worker' ).define_tasks

data/bin/iudex-worker-fg

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/init/iudex-worker

@@ -7,7 +7,7 @@
 #. hashdot.vm.options += -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -24,7 +24,7 @@
 
 require 'rubygems'
 
-gem( "iudex-worker", "= 1.1.0" )
+gem( "iudex-worker", "= 1.2.b.0" )
 
 module IudexInitScript
 

data/lib/iudex-worker/agent.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -49,17 +49,17 @@ module Iudex
       end
 
       def http_client( executor )
-        if defined?( JettyHTTPClient )
+        if defined?( JettyHTTPClient.create_client )
           @log.info "Setting up JettyHTTPClient"
           JettyHTTPClient.create_client.tap do |c|
             c.executor = executor
             c.start
           end
-        elsif defined?( AsyncHTTPClient )
+        elsif defined?( AsyncHTTPClient.create_client )
           @log.info "Setting up AsyncHTTPClient"
           AsyncHTTPClient.create_client( :executor_service => executor )
         else
-          gem     'iudex-httpclient-3', '~> 1.1.0'
+          gem     'iudex-httpclient-3', '~> 1.2.b'
           require 'iudex-httpclient-3'
           @log.info "Setting up HTTPClient3"
           @http_manager = HTTPClient3.create_manager

data/lib/iudex-worker/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,6 +16,6 @@
 
 module Iudex
   module Worker
-    VERSION = '1.1.0'
+    VERSION = '1.2.b.0'
   end
 end

data/lib/iudex-worker/fetch_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/iudex-worker/filter_chain_factory.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/iudex-worker/prioritizer.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/iudex-worker.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/test/setup.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -14,21 +14,31 @@
 # permissions and limitations under the License.
 #++
 
-#### General test setup: LOAD_PATH, logging, console output ####
-
-ldir = File.join( File.dirname( __FILE__ ), "..", "lib" )
-$LOAD_PATH.unshift( ldir ) unless $LOAD_PATH.include?( ldir )
+#### General test setup, logging, console output ####
 
 require 'rubygems'
-require 'rjack-logback'
-RJack::Logback.config_console( :stderr => true, :mdc => "uhash" )
+require 'bundler/setup'
 
 require 'minitest/unit'
 require 'minitest/autorun'
 
-# Make test output logging compatible: no partial lines.
-class TestOut
-  def print( *a ); $stdout.puts( *a ); end
-  def puts( *a );  $stdout.puts( *a ); end
+require 'rjack-logback'
+
+module TestSetup
+  include RJack
+  Logback.config_console( :stderr => true, :thread => true )
+
+  if ( ARGV & %w[ -v --verbose --debug ] ).empty?
+    # Make test output logging compatible: no partial lines.
+    class TestOut
+      def print( *a ); $stdout.puts( *a ); end
+      def puts( *a );  $stdout.puts( *a ); end
+    end
+    MiniTest::Unit.output = TestOut.new
+  else
+    Logback.root.level = Logback::DEBUG
+  end
+
+  ARGV.delete( '--debug' )
+
 end
-MiniTest::Unit.output = TestOut.new

data/test/test_agent.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/test/test_filter_chain_factory.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/test/test_prioritizer.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: iudex-worker
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  prerelease: 4
+  version: 1.2.b.0
 platform: java
 authors: 
   - David Kellum
@@ -10,144 +10,141 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-13 00:00:00 Z
+date: 2012-03-05 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: iudex-core
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rjack-logback
+            version: 1.2.b
+    requirement: *id001
     prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "1.0"
     type: :runtime
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: iudex-da
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id002
+    prerelease: false
     type: :runtime
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: iudex-rome
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id003
+    prerelease: false
     type: :runtime
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: iudex-html
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id004
+    prerelease: false
     type: :runtime
-    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: iudex-simhash
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id005
+    prerelease: false
     type: :runtime
-    version_requirements: *id006
   - !ruby/object:Gem::Dependency 
     name: iudex-char-detector
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.2.b
+    requirement: *id006
     prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: rjack-logback
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: "1.0"
+    requirement: *id007
+    prerelease: false
     type: :runtime
-    version_requirements: *id007
   - !ruby/object:Gem::Dependency 
     name: minitest
-    prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    version_requirements: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.3"
+    requirement: *id008
+    prerelease: false
     type: :development
-    version_requirements: *id008
   - !ruby/object:Gem::Dependency 
     name: iudex-httpclient-3
-    prerelease: false
-    requirement: &id009 !ruby/object:Gem::Requirement 
+    version_requirements: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id009
+    prerelease: false
     type: :development
-    version_requirements: *id009
   - !ruby/object:Gem::Dependency 
     name: iudex-jetty-httpclient
-    prerelease: false
-    requirement: &id010 !ruby/object:Gem::Requirement 
+    version_requirements: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id010
+    prerelease: false
     type: :development
-    version_requirements: *id010
   - !ruby/object:Gem::Dependency 
     name: iudex-async-httpclient
-    prerelease: false
-    requirement: &id011 !ruby/object:Gem::Requirement 
+    version_requirements: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.b
+    requirement: *id011
+    prerelease: false
     type: :development
-    version_requirements: *id011
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    prerelease: false
-    requirement: &id012 !ruby/object:Gem::Requirement 
+    version_requirements: &id012 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: "2.0"
+    requirement: *id012
+    prerelease: false
     type: :development
-    version_requirements: *id012
-description: |-
-  Iudex is a general purpose web crawler and feed processor in
-  ruby/java. The iudex-worker gem provides a worker deamon for feed/page
-  processing.
+description: Iudex is a general purpose web crawler and feed processor in ruby/java. The iudex-worker gem provides a worker deamon for feed/page processing.
 email: 
   - dek-oss@gravitext.com
 executables: 
@@ -155,7 +152,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -178,7 +174,6 @@ files:
   - test/test_agent.rb
   - test/test_filter_chain_factory.rb
   - test/test_prioritizer.rb
-  - .gemtest
 homepage: http://github.com/dekellum/iudex
 licenses: []
 
@@ -193,21 +188,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
-rubyforge_project: iudex-worker
-rubygems_version: 1.8.9
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Iudex is a general purpose web crawler and feed processor in ruby/java
-test_files: 
-  - test/test_agent.rb
-  - test/test_filter_chain_factory.rb
-  - test/test_prioritizer.rb
+summary: Iudex is a general purpose web crawler and feed processor in ruby/java.
+test_files: []
+