fetcher 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930c43d21e2b74f6d413e59aef2cbdff621d9c54
-  data.tar.gz: abeb5fc3593a9f13beaba961d1fcc8c30a0cd0d3
+  metadata.gz: ef1b964e3b4a79b13b008147f894244610851bb9
+  data.tar.gz: 84815891771fe636ecf09891451dca80bb4fd83f
 SHA512:
-  metadata.gz: 6ceebb4318870c02805cdf52c53ae8b9ff35c0adb004638adc0082a954662ea05201390888aaaeac3e8b60efb05cb0f1de08308087a87606f5a93fce1f5f8652
-  data.tar.gz: e3100ec244e84a23798c38b895ce5017d99582462d064f07b198e18b88cd695c8ff6752834e02275be4a6ad6404ae00e198112411557107eddc9202f2c9dc35a
+  metadata.gz: 01df88051ef004d00c25e9dcbdb1fb363737f1862106af02c4f74ad6712894960eb47c152853be0a29689c41aa47db7ebb57b00ef9154ff8564e92dafb4d213e
+  data.tar.gz: 13a9c6a495483b07a0fc4b693cec8cc205aa7de48333f95884535d4ac2ab61cd3e4d5e85b4b24c41f477fcee3a971d125381bae36d872b319d12a18dfb240d3c

data/Manifest.txt

@@ -4,5 +4,7 @@ README.markdown
 Rakefile
 bin/fetch
 lib/fetcher.rb
-lib/fetcher/runner.rb
+lib/fetcher/cli/opts.rb
+lib/fetcher/cli/runner.rb
+lib/fetcher/version.rb
 lib/fetcher/worker.rb

data/Rakefile

@@ -1,5 +1,5 @@
 require 'hoe'
-require './lib/fetcher.rb'
+require './lib/fetcher/version.rb'
 
 Hoe.spec 'fetcher' do
   

data/bin/fetch

@@ -9,7 +9,7 @@
 #
 # Set the executable bit in Linux. Example:
 #
-#    % chmod a+x bin/markdown
+#    % chmod a+x bin/fetch
 #
 
 require 'fetcher'

data/lib/fetcher.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
+
 ###
 # NB: for local testing run like:
 #
-# 1.8.x: ruby -Ilib -rrubygems lib/fetcher.rb
 # 1.9.x: ruby -Ilib lib/fetcher.rb
 
 # core and stlibs
@@ -9,7 +10,6 @@
 require 'yaml'
 require 'pp'
 require 'logger'
-require 'optparse'
 require 'fileutils'
 require 'uri'
 require 'net/http'
@@ -25,20 +25,22 @@ require 'logutils'
 
 # our own code
 
-require 'fetcher/runner'
+require 'fetcher/version'
 require 'fetcher/worker'
 
 
 module Fetcher
 
-  VERSION = '0.2.0'
-
   # version string for generator meta tag (includes ruby version)
   def self.banner
-    "Fetcher #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "fetcher #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
   def self.main
+
+    ## NB: only load (require) cli code if called
+
+    require 'fetcher/cli/runner'
     
     # allow env variable to set RUBYOPT-style default command line options
     #   e.g. -o site 
@@ -64,4 +66,9 @@ module Fetcher
 end  # module Fetcher
 
 
-Fetcher.main if __FILE__ == $0
+if __FILE__ == $0
+  Fetcher.main
+else
+  # say hello
+  puts Fetcher.banner
+end

data/lib/fetcher/cli/opts.rb

@@ -0,0 +1,20 @@
+
+module Fetcher
+
+  class Opts
+  
+    def initialize
+      @output_path  = ''
+    end
+
+    def output_path=( value )
+      @output_path = value
+    end    
+  
+    def output_path
+      @output_path
+    end
+
+  end # class Opts
+
+end  # module Fetcher

data/lib/fetcher/{runner.rb → cli/runner.rb}

@@ -1,42 +1,36 @@
+# encoding: utf-8
 
-module Fetcher
 
-  class Opts
-  
-    def initialize
-      @hash = {}
-    end
-    
-    def put( key, value )
-      @hash[ key.to_s ] = value
-    end    
-  
-    def output_path
-      @hash.fetch( 'output', '.' )
-    end
+# more core and stlibs
+
+require 'optparse'
 
-  end # class Opts
+# our own code (for command line interface/cli)
 
+require 'fetcher/cli/opts'
+
+
+module Fetcher
 
   class Runner
 
     include LogUtils::Logging
-    
+
     attr_reader :opts
-    
+        
     def initialize
-      @opts         = Opts.new
+      @opts = Opts.new
     end
     
     def run( args )
       opt=OptionParser.new do |cmd|
-    
+
         cmd.banner = "Usage: fetch [options] uri"
-    
-        cmd.on( '-o', '--output PATH', 'Output Path' ) { |s| opts.put( 'output', s ) }
+
+        cmd.on( '-o', '--output PATH', "Output Path (default is '#{opts.output_path}')" ) { |s| opts.output_path = s }
 
         # todo: find different letter for debug trace switch (use v for version?)
-        cmd.on( "-v", "--verbose", "Show debug trace" )  do
+        cmd.on( '-v', '--verbose', 'Show debug trace' )  do
            # todo/fix: use/change to logutils settings for level
            # logger.datetime_format = "%H:%H:%S"
            # logger.level = Logger::DEBUG
@@ -57,7 +51,7 @@ Further information:
 
 EOS
  
-        cmd.on_tail( "-h", "--help", "Show this message" ) do
+        cmd.on_tail( '-h', '--help', 'Show this message' ) do
            puts usage
            exit
         end

data/lib/fetcher/version.rb

@@ -0,0 +1,7 @@
+
+module Fetcher
+
+  VERSION = '0.3.0'
+
+end  # module Fetcher
+

data/lib/fetcher/worker.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Fetcher
 
   class Worker
@@ -85,7 +87,7 @@ module Fetcher
     
         logger.debug "GET #{uri.request_uri} uri=#{uri}, redirect_limit=#{redirect_limit}"
     
-        request    = Net::HTTP::Get.new( uri.request_uri, { 'User-Agent'=> 'slideshow'} )
+        request    = Net::HTTP::Get.new( uri.request_uri, { 'User-Agent' => "fetcher gem v#{VERSION}" } )
         if uri.instance_of? URI::HTTPS
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -66,7 +66,9 @@ files:
 - Rakefile
 - bin/fetch
 - lib/fetcher.rb
-- lib/fetcher/runner.rb
+- lib/fetcher/cli/opts.rb
+- lib/fetcher/cli/runner.rb
+- lib/fetcher/version.rb
 - lib/fetcher/worker.rb
 homepage: https://github.com/geraldb/fetcher
 licenses: