iudex-barc 1.2.b.0-java → 1.2.b.1-java

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 1.2.b.1 (2012-5-31)
+* Improve usability of iudex-http-record CLI
+* Output (H) default type in BARCResponseHandler (as used by
+  iudex-http-record)
+
 === 1.2.b.0 (2012-3-4)
 * Upgrade to gravitext-util ~> 1.6.b (beta)
 * Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec (dev)

data/Manifest.txt

@@ -7,4 +7,4 @@ bin/iudex-barc
 bin/iudex-http-record
 lib/iudex-barc/base.rb
 lib/iudex-barc.rb
-lib/iudex-barc/iudex-barc-1.2.b.0.jar
+lib/iudex-barc/iudex-barc-1.2.b.1.jar

data/bin/iudex-http-record

@@ -19,33 +19,97 @@
 $LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
 
 require 'rubygems'
-require 'rjack-logback'
-RJack::Logback.config_console
+require 'optparse'
 
-#RJack::Logback[ "org.apache.commons.httpclient" ].level = RJack::Logback::INFO
-#RJack::Logback[ "iudex" ].level = RJack::Logback::DEBUG
+module IudexBinScript
 
-require 'iudex-barc'
-require 'iudex-httpclient-3' #FIXME: Unspecified dependency
+  require 'rjack-logback'
+  include RJack
 
-import 'iudex.httpclient3.HTTPClient3'
-import 'iudex.barc.http.BARCResponseHandler'
-import 'iudex.barc.BARCFile'
+  Logback.config_console( :stderr => true )
 
-hmanager = RJack::HTTPClient3::ManagerFacade.new
-hmanager.start
+  #FIXME: Add debug flags
+  #RJack::Logback[ "org.apache.commons.httpclient" ].level = RJack::Logback::INFO
+  #RJack::Logback[ "iudex" ].level = RJack::Logback::DEBUG
 
-hclient = HTTPClient3.new( hmanager.client )
+  require 'iudex-barc'
 
-barc_file = BARCFile.new( java.io.File.new( './record.barc' ) ) #FIXME: param
-barc_file.truncate #FIXME: Optional
+  require 'iudex-httpclient-3' #FIXME: Unspecified dependency
 
-handler = BARCResponseHandler.new( barc_file )
-handler.do_compress = false #FIXME: Option
+  class BARCRecorder
+    import 'iudex.httpclient3.HTTPClient3'
+    import 'iudex.barc.http.BARCResponseHandler'
 
-hsession = hclient.createSession;
-hsession.url = 'http://gravitext.com/blog' #FIXME: param
+    def initialize
+      @req_headers = { 'User-Agent' => http_user_agent,
+                       'Accept'     => accept_types }
+    end
 
-hclient.request( hsession, handler )
+    def run( args = ARGV )
+      urls = parse_args( args )
 
-hmanager.shutdown
+      mgr = Iudex::HTTPClient3.create_manager
+      mgr.client_params.set_int_parameter( "http.protocol.max-redirects", 8 )
+      mgr.start
+
+      hclient = HTTPClient3.new( mgr.client )
+
+      barc_file = Iudex::BARC::BARCFile.new( java.io.File.new( @barc_name ) )
+      barc_file.truncate if @barc_name == './record.barc'
+
+      handler = BARCResponseHandler.new( barc_file )
+      handler.do_compress = false
+
+      urls.each do |url|
+        hsession = hclient.createSession;
+        hsession.url = url
+        headers = @req_headers.map { |h,v| Iudex::HTTP::Header.new( h, v ) }
+        hsession.add_request_headers( headers  )
+        hclient.request( hsession, handler )
+      end
+
+    ensure
+      mgr.shutdown if mgr
+      barc_file.close if barc_file
+    end
+
+    def parse_args( args = ARGV )
+      parser = OptionParser.new do |opts|
+        opts.banner = ( "Usage: iudex-http-record [options] URL... " +
+                        "[BARCFile]\n" +
+                        "Options:\n" )
+
+        opts.on( "-v", "--version", "Display version and exit" ) do
+          puts "iudex-barc: #{Iudex::BARC::VERSION}"
+          exit 1
+        end
+
+        opts.on( "-A", "--User-Agent UA", String, "Set alt User-Agent" ) do |s|
+          @req_headers[ 'User-Agent' ] = s
+        end
+
+      end
+
+      args = parser.parse( args )
+      @barc_name = './record.barc'
+      if args.last =~ /.barc$/
+        @barc_name = args.pop
+      end
+
+      args #urls
+    end
+
+    def http_user_agent
+      ( "Mozilla/5.0 (compatible; " +
+        "Iudex #{Iudex::HTTPClient3::VERSION}; " +
+        "+http://gravitext.com/iudex)" )
+    end
+
+    def accept_types
+      "application/xhtml+xml,text/html,application/xml;q=0.9,text/*;q=0.8"
+    end
+
+  end
+
+  BARCRecorder.new.run
+end

data/lib/iudex-barc/base.rb

@@ -16,7 +16,7 @@
 
 module Iudex
   module BARC
-    VERSION = '1.2.b.0'
+    VERSION = '1.2.b.1'
 
     LIB_DIR = File.dirname( __FILE__ ) # :nodoc:
   end

data/pom.xml

@@ -5,7 +5,7 @@
   <groupId>iudex</groupId>
   <artifactId>iudex-barc</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.b.0</version>
+  <version>1.2.b.1</version>
   <name>Iudex Basic ARChive Format</name>
 
   <parent>

metadata

@@ -2,7 +2,7 @@
 name: iudex-barc
 version: !ruby/object:Gem::Version 
   prerelease: 4
-  version: 1.2.b.0
+  version: 1.2.b.1
 platform: java
 authors: 
   - David Kellum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 Z
+date: 2012-06-01 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
@@ -88,7 +88,7 @@ files:
   - bin/iudex-http-record
   - lib/iudex-barc/base.rb
   - lib/iudex-barc.rb
-  - lib/iudex-barc/iudex-barc-1.2.b.0.jar
+  - lib/iudex-barc/iudex-barc-1.2.b.1.jar
 homepage: http://github.com/dekellum/iudex
 licenses: []