chuckle 1.0.1 → 1.0.2

data/bin/chuckle

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+# in lieu of -w, since we're using env to startup
+$VERBOSE = true
+
+require "chuckle"
+require "trollop"
+
+class Main
+  attr_accessor :options
+
+  def initialize(options = {})
+    self.options = options
+    list = IO.readlines(options[:file]).map(&:chomp)
+    list.each_with_index do |i, index|
+      puts "#{index+1}/#{list.length}. #{i}"
+      begin
+        chuckle.get(i)
+      rescue Chuckle::Error => e
+        puts "  #{e.message}"
+      end
+    end
+  end
+
+  protected
+
+  def chuckle
+    @chuckle ||= Chuckle::Client.new(nretries: options[:nretries], timeout: options[:timeout])
+  end
+end
+
+
+
+#
+# parse command line
+#
+
+options = Trollop.options do
+  banner <<EOF
+Usage: chuckle <url_file>
+
+chuckle fetches urls as listed in url_file. It just populate the disk
+cache.
+EOF
+
+  opt :nretries, "Number of retries per URL", type: Integer
+  opt :timeout, "Timeout per retry", type: Integer
+end
+
+Trollop.die "need <url_file>" if ARGV.length != 1
+options[:file] = ARGV.shift
+Main.new(options)

data/chuckle.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "chuckle"
 
+  s.add_runtime_dependency "trollop"
+
   s.add_development_dependency "awesome_print"
   s.add_development_dependency "json"
   s.add_development_dependency "minitest", "~> 5.0"

data/lib/chuckle/client.rb

@@ -7,7 +7,8 @@ module Chuckle
     attr_accessor :options, :cache
 
     def initialize(options = {})
-      self.options = DEFAULT_OPTIONS.merge(options)
+      self.options = DEFAULT_OPTIONS.dup
+      options.each { |k, v| self.options[k] = v if v }
       self.cache = Cache.new(self)
       sanity!
     end
@@ -56,7 +57,14 @@ module Chuckle
     def curl(request)
       vputs request.uri
       rate_limit!(request)
-      cache.set(request, Curl.new(request))
+
+      curl = Curl.new(request)
+      begin
+        curl.run
+        cache.set(request, curl)
+      ensure
+        curl.cleanup
+      end
     end
 
     def raise_errors(response)
@@ -71,7 +79,7 @@ module Chuckle
       if !cache_errors?
         cache.clear(response.request)
       end
-      raise Error.new("Chuckle::Error, #{error}", response)
+      raise Error.new(error, response)
     end
 
     def vputs(s)

data/lib/chuckle/curl.rb

@@ -4,7 +4,6 @@ module Chuckle
   class Curl
     def initialize(request)
       @request = request
-      run
     end
 
     # tmp path for response headers
@@ -24,7 +23,7 @@ module Chuckle
 
       # capture exit code, bail on INT
       exit_code = $?.to_i / 256
-      if exit_code != 0 && $?.termsig == Signal.list["INT"]
+      if $?.termsig == Signal.list["INT"]
         Process.kill(:INT, $$)
       end
 
@@ -37,6 +36,12 @@ module Chuckle
       end
     end
 
+    # make sure we don't accidentally leave any files hanging around
+    def cleanup
+      Util.rm_if_necessary(headers_path)
+      Util.rm_if_necessary(body_path)
+    end
+
     def self.exit_code_to_headers(exit_code)
       "exit_code #{exit_code}"
     end

data/lib/chuckle/version.rb

@@ -1,4 +1,4 @@
 module Chuckle
   # Gem version
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/helper.rb

@@ -8,6 +8,7 @@ module Helper
   CACHE_DIR = "/tmp/_chuckle_tests"
   URL = "http://chuckle"
   QUERY = { "b" => "12", "a" => "34", "x y" => "56" }
+  TMP = "/tmp/_chuckle_tmp.txt"
 
   #
   # fake responses
@@ -99,4 +100,9 @@ module Helper
     end
     Kernel.stub(:system, fake_system) { yield }
   end
+
+  def assert_command(cmd)
+    system("#{cmd} > #{TMP} 2>&1")
+    assert($? == 0, File.read(TMP))
+  end
 end

data/test/test_network.rb

@@ -53,4 +53,9 @@ class TestNetwork < Minitest::Test
     client.get("http://httpbin.org/robots.txt")
     assert !File.exists?(cookie_jar), "cookie jar should've expired"
   end
+
+  def test_bin
+    Dir.chdir(File.expand_path("../", __FILE__))
+    assert_command("../bin/chuckle url_file.txt")
+  end
 end

data/test/url_file.txt

@@ -0,0 +1,2 @@
+http://httpbin.org/status/500
+http://httpbin.org/get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chuckle
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +110,8 @@ dependencies:
 description: An http client that caches on disk.
 email:
 - amd@gurge.com
-executables: []
+executables:
+- chuckle
 extensions: []
 extra_rdoc_files: []
 files:
@@ -104,6 +121,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/chuckle
 - chuckle.gemspec
 - lib/chuckle.rb
 - lib/chuckle/cache.rb
@@ -120,6 +138,7 @@ files:
 - test/test_cache.rb
 - test/test_network.rb
 - test/test_requests.rb
+- test/url_file.txt
 homepage: http://github.com/gurgeous/chuckle
 licenses: []
 post_install_message: 
@@ -140,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3317364503700294322
+      hash: -116042020902971190
 requirements: []
 rubyforge_project: chuckle
 rubygems_version: 1.8.24
@@ -152,3 +171,4 @@ test_files:
 - test/test_cache.rb
 - test/test_network.rb
 - test/test_requests.rb
+- test/url_file.txt