fetcher 0.4.3 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 95db80b36d0be7460c96648620191047913fcec3
+  data.tar.gz: 4b6fa34c25e625ca71860da03a7831f26404d6d2
+SHA512:
+  metadata.gz: 7fc927c713af888ef8049619fe0e368d3039119b57596091c6c8e02de21ae7800d741dd96df4da180807e1ad0df600f3a4fe1bc10ea31d0ca0a67540a7c8e2a0
+  data.tar.gz: 705e042295b9ca6bf8b8379145da4860f4e823f92ff0569573ba73959eea5dacc280db37f24389ecd7423e0ac2412e79b0640c9c9be06ce4c5219db2cc0a66e1

data/lib/fetcher.rb

@@ -25,22 +25,12 @@ require 'logutils'
 
 # our own code
 
-require 'fetcher/version'
+require 'fetcher/version'   # let version always go first
 require 'fetcher/worker'
 
 
 module Fetcher
 
-  # version string for generator meta tag (includes ruby version)
-  def self.banner
-    "fetcher/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
-  end
-
-
   def self.main
 
     ## NB: only load (require) cli code if called
@@ -58,11 +48,12 @@ module Fetcher
     Runner.new.run(args)
   end
 
+
   #############################
   # convenience shortcuts
 
-  def self.copy( src, dest )
-    Worker.new.copy( src, dest )
+  def self.copy( src, dest, opts={} )
+    Worker.new.copy( src, dest, opts )
   end
 
   def self.read( src )
@@ -79,6 +70,5 @@ end  # module Fetcher
 if __FILE__ == $0
   Fetcher.main
 else
-  # say hello
-  puts Fetcher.banner
+  puts Fetcher.banner    # say hello
 end

data/lib/fetcher/version.rb

@@ -1,7 +1,23 @@
 
 module Fetcher
 
-  VERSION = '0.4.3'
+  MAJOR = 0    ## todo: namespace inside version or something - why? why not??
+  MINOR = 4
+  PATCH = 4
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  # version string for generator meta tag (includes ruby version)
+  def self.banner
+    "fetcher/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+  end
 
 end  # module Fetcher
 

data/lib/fetcher/worker.rb

@@ -2,6 +2,27 @@
 
 module Fetcher
 
+  class Error < StandardError
+  end
+
+  ####
+  # todo/check:
+  #  rename to HttpRequestError or similar??
+  #  use "common" error class - why? why not?
+
+  class HttpError < Error
+    attr_reader :code, :message
+
+    def initialize( code, message )
+      @code, @message = code, message
+    end
+
+    def to_s
+      "HTTP request failed (NOK) => #{@code} #{@message}"
+    end
+  end
+
+
   class Worker
 
     include LogUtils::Logging
@@ -49,7 +70,7 @@ module Fetcher
     end
 
 
-    def copy( src, dest )
+    def copy( src, dest, opts={} )
       ### fix: return true - success or
       #               false - error!!!
 
@@ -59,18 +80,28 @@ module Fetcher
 
       response = get_response( src )
 
-      # on error return; do NOT copy file; sorry
-      return  if response.code != '200'
+      # NOTE: on error (NOK) raise exception; do NOT copy file; sorry
+      if response.code != '200'
+        raise HttpError.new( response.code, response.message )
+      end
+
+      ### check:
+      ## why not always use wb???
+      ##  how is it differet for text files?
+      ##  will convert newlines (from windows to unix) ???
 
       # check for content type; use 'wb' for images
-      if response.content_type =~ /image/
+      if response.content_type =~ /image/ ||
+         response.content_type =~ /zip/    ## use application/zip or something - why? why not??
         logger.debug '  switching to binary'
-        flags = 'wb'
+        mode = 'wb'
       else
-        flags = 'w'
+        mode = 'w'
       end
   
-      File.open( dest, flags ) do |f|
+      mode = opts[:mode]  if opts[:mode]  # if mode flags passed in -take precedence
+
+      File.open( dest, mode ) do |f|
         f.write( response.body )
       end
     end

data/test/helper.rb

@@ -3,11 +3,8 @@
 
 ## minitest setup
 
-# require 'minitest/unit'
 require 'minitest/autorun'
 
-# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
-
 
 ## our own code
 

data/test/test_get.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestGet < MiniTest::Unit::TestCase
+class TestGet < MiniTest::Test
 
   def test_get
     url = 'https://raw.github.com/rubylibs/fetcher/master/README.md'

metadata

@@ -1,57 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: fetcher
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &81882710 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *81882710
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81882450 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *81882450
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81882190 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *81882190
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: fetcher - Fetch Text Documents or Binary Blobs via HTTP, HTTPS
 email: webslideshow@googlegroups.com
 executables:
 - fetch
 extensions: []
 extra_rdoc_files:
+- HISTORY.md
 - Manifest.txt
+- README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -64,33 +75,31 @@ files:
 - lib/fetcher/worker.rb
 - test/helper.rb
 - test/test_get.rb
-- .gemtest
 homepage: https://github.com/rubylibs/fetcher
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: fetcher
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fetcher - Fetch Text Documents or Binary Blobs via HTTP, HTTPS
 test_files:
 - test/test_get.rb