chuckle 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf2c395c83dbdfcf6040fef40c5b7080847e11fb91b496fdde6610b20964adf
-  data.tar.gz: 4068e495130496c551eef56c1160903a5b006e848db8440e34e386936ce9dd1f
+  metadata.gz: b98846713307331d88cca61554f826cb93c558f51d479b2265196e737fe17754
+  data.tar.gz: 80536128f6942d4ad5dfff3de94c5077d15772a43cf54a2de5d8d26c75569e82
 SHA512:
-  metadata.gz: 0d552a844dc3ac6cd51cbaaf582aa64965f6555a2d69f8e1b5027707fff62421ad288ae242ef429ba8e9ab38784d6cfa41acce3a3df91f09e3b9a6bc39e277c0
-  data.tar.gz: 1fe660d1964b29c754502cccfb0edc5d6096927d09074d16c03999219d1a980505a1d88f69eba08a99fd377aa88a3f06f37724a25ec07d11cf875ec89f7c8061
+  metadata.gz: 46035fb77f332b0b26ab314e4720097080c4d3bc98c7fe724704c0c288695bec0e5a101b52859d2aa8127bd67055f79aab8bdc26433ef4f7b2cc32b3b6ec5c24
+  data.tar.gz: 0f9fd286ca86253ee4db3e07eac090a8da0eaee2e9202a469aa819be5378019219eda660ec4e5b7a292f08206f43d6f3f83f82d00dcc950497ab01017c487f51

data/.rubocop.yml

@@ -0,0 +1,60 @@
+AllCops:
+  TargetRubyVersion: 2.1.0
+
+# amd: customizations
+Layout/SpaceInsideArrayLiteralBrackets:
+  EnforcedStyle: compact
+Layout/CaseIndentation:
+  EnforcedStyle: end
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+Layout/IndentHeredoc:
+  Enabled: false
+Style/CollectionMethods:
+  Enabled: true
+  PreferredMethods:
+    reduce: inject
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+# amd: these seem extreme
+Lint/AssignmentInCondition: { Enabled: false } # I do this all the time
+Lint/HandleExceptions: { Enabled: false } # blank rescues are useful
+Naming/BinaryOperatorParameterName: { Enabled: false } # silly
+Naming/HeredocDelimiterNaming: { Enabled: false } # silly
+Naming/UncommunicativeMethodParamName: { Enabled: false } # silly
+Performance/FixedSize: { Enabled: false } # silly
+Performance/RegexpMatch: { Enabled: false } # =~ is fine
+Performance/TimesMap: { Enabled: false } # silly
+Rails/FilePath: { Enabled: false }
+Rails/LexicallyScopedActionFilter: { Enabled: false }
+Rails/OutputSafety: { Enabled: false }
+Rails/ReversibleMigration: { Enabled: false } # who cares
+Rails/SkipsModelValidations: { Enabled: false } # silly
+Style/ClassAndModuleChildren: { Enabled: false } # silly
+Style/Documentation: { Enabled: false } # we don't need this
+Style/FormatStringToken: { Enabled: false } # we like printf here
+Style/FrozenStringLiteralComment: { Enabled: false } # seems excessive
+Style/GuardClause: { Enabled: false } # confusing
+Style/IfUnlessModifier: { Enabled: false } # personally I hate unless
+Style/NegatedIf: { Enabled: false } # these are fine
+Style/Next: { Enabled: false } # these are fine
+Style/NumericPredicate: { Enabled: false } # silly
+Style/ParallelAssignment: { Enabled: false } # these are fine
+Style/PerlBackrefs: { Enabled: false } # these are fine
+Style/RaiseArgs: { Enabled: false } # silly
+Style/RegexpLiteral: { Enabled: false } # these are fine
+
+# amd: these Metric rules are annoying, disable
+Metrics/AbcSize: { Enabled: false }
+Metrics/BlockLength: { Enabled: false }
+Metrics/BlockNesting: { Enabled: false }
+Metrics/ClassLength: { Enabled: false }
+Metrics/CyclomaticComplexity: { Enabled: false }
+Metrics/LineLength: { Enabled: false }
+Metrics/MethodLength: { Enabled: false }
+Metrics/ModuleLength: { Enabled: false }
+Metrics/ParameterLists: { Enabled: false }
+Metrics/PerceivedComplexity: { Enabled: false }

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.0
   - 2.5.0

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 gemspec

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_helper"
-require "rake/testtask"
-require "rdoc/task"
+require 'bundler/gem_helper'
+require 'rake/testtask'
+require 'rdoc/task'
 
 Bundler::GemHelper.install_tasks
 
@@ -9,7 +9,7 @@ Bundler::GemHelper.install_tasks
 #
 
 Rake::TestTask.new(:test) do |test|
-  test.libs << "test"
+  test.libs << 'test'
 end
 task default: :test
 
@@ -18,7 +18,7 @@ task default: :test
 #
 
 RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
+  rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "chuckle #{Chuckle::VERSION}"
-  rdoc.rdoc_files.include("lib/**/*.rb")
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/bin/chuckle

@@ -3,8 +3,8 @@
 # in lieu of -w, since we're using env to startup
 $VERBOSE = true
 
-require "chuckle"
-require "trollop"
+require 'chuckle'
+require 'optimist'
 
 class Main
   attr_accessor :options
@@ -13,7 +13,7 @@ class Main
     self.options = options
     list = IO.readlines(options[:file]).map(&:chomp)
     list.each_with_index do |i, index|
-      puts "#{index+1}/#{list.length}. #{i}"
+      puts "#{index + 1}/#{list.length}. #{i}"
       begin
         chuckle.get(i)
       rescue Chuckle::Error => e
@@ -29,13 +29,11 @@ class Main
   end
 end
 
-
-
 #
 # parse command line
 #
 
-options = Trollop.options do
+options = Optimist::options do
   banner <<EOF
 Usage: chuckle <url_file>
 
@@ -43,10 +41,10 @@ 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
+  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
+Optimist::die 'need <url_file>' if ARGV.length != 1
 options[:file] = ARGV.shift
 Main.new(options)

data/chuckle.gemspec

@@ -1,30 +1,30 @@
-$LOAD_PATH << File.expand_path("../lib", __FILE__)
+$LOAD_PATH << File.expand_path('lib', __dir__)
 
-require "chuckle/version"
+require 'chuckle/version'
 
 Gem::Specification.new do |s|
-  s.name        = "chuckle"
+  s.name        = 'chuckle'
   s.version     = Chuckle::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = ">= 1.9.0"
-  s.authors     = ["Adam Doppelt"]
-  s.email       = ["amd@gurge.com"]
-  s.homepage    = "http://github.com/gurgeous/chuckle"
-  s.summary     = "Chuckle - an http client that caches on disk."
-  s.description = "An http client that caches on disk."
+  s.required_ruby_version = '>= 2.1.0'
+  s.authors     = [ 'Adam Doppelt' ]
+  s.email       = [ 'amd@gurge.com' ]
+  s.homepage    = 'http://github.com/gurgeous/chuckle'
+  s.summary     = 'Chuckle - an http client that caches on disk.'
+  s.description = 'An http client that caches on disk.'
 
-  s.rubyforge_project = "chuckle"
+  s.rubyforge_project = 'chuckle'
 
-  s.add_runtime_dependency "trollop"
+  s.add_runtime_dependency 'optimist'
 
-  s.add_development_dependency "awesome_print"
-  s.add_development_dependency "json"
-  s.add_development_dependency "minitest", "~> 5.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rdoc"
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency 'json'
+  s.add_development_dependency 'minitest', '~> 5.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |i| File.basename(i) }
-  s.require_paths = ["lib"]
+  s.require_paths = [ 'lib' ]
 end

data/lib/chuckle.rb

@@ -1,12 +1,12 @@
-require "chuckle/cache"
-require "chuckle/cookie_jar"
-require "chuckle/error"
-require "chuckle/options"
-require "chuckle/request"
-require "chuckle/response"
-require "chuckle/util"
-require "chuckle/version"
+require 'chuckle/cache'
+require 'chuckle/cookie_jar'
+require 'chuckle/error'
+require 'chuckle/options'
+require 'chuckle/request'
+require 'chuckle/response'
+require 'chuckle/util'
+require 'chuckle/version'
 
 # these last
-require "chuckle/curl"
-require "chuckle/client"
+require 'chuckle/curl'
+require 'chuckle/client'

data/lib/chuckle/cache.rb

@@ -1,4 +1,4 @@
-require "fileutils"
+require 'fileutils'
 
 module Chuckle
   class Cache
@@ -21,7 +21,7 @@ module Chuckle
 
     def set(request, curl)
       # mkdirs
-      FileUtils.mkdir_p([File.dirname(request.headers_path), File.dirname(request.body_path)])
+      FileUtils.mkdir_p([ File.dirname(request.headers_path), File.dirname(request.body_path) ])
 
       # now mv
       FileUtils.mv(curl.headers_path, request.headers_path)
@@ -53,7 +53,7 @@ module Chuckle
 
       # calculate body_path
       s = @client.cache_dir
-      s = "#{s}/#{pathify(uri.host || "file")}"
+      s = "#{s}/#{pathify(uri.host || 'file')}"
       s = "#{s}/#{pathify(uri.path)}"
       if uri.query
         q = "?#{uri.query}"
@@ -76,15 +76,15 @@ module Chuckle
 
     # turn s into a string that can be a path
     def pathify(s)
-      s = s.gsub(/^\//, "")
-      s = s.gsub("..", ",")
-      s = s.gsub(/[?\/&]/, ",")
+      s = s.gsub(/^\//, '')
+      s = s.gsub('..', ',')
+      s = s.gsub(/[?\/&]/, ',')
       s = s.gsub(/[^A-Za-z0-9_.,=%-]/) do |i|
-        hex = i.unpack("H2").first
+        hex = i.unpack('H2').first
         "%#{hex}"
       end
       s = s.downcase
-      s = "_root_" if s.empty?
+      s = '_root_' if s.empty?
       s
     end
   end

data/lib/chuckle/client.rb

@@ -1,4 +1,5 @@
-require "uri"
+require 'English'
+require 'uri'
 
 module Chuckle
   class Client
@@ -8,7 +9,7 @@ module Chuckle
 
     def initialize(options = {})
       self.options = DEFAULT_OPTIONS.dup
-      options.each { |k, v| self.options[k] = v if v != nil }
+      options.each { |k, v| self.options[k] = v if !v.nil? }
       self.cache = Cache.new(self)
       sanity!
     end
@@ -50,8 +51,8 @@ module Chuckle
 
     # make sure curl command exists
     def sanity!
-      system("which curl > /dev/null")
-      raise "Chuckle requires curl. Please install it." if $? != 0
+      system('which curl > /dev/null')
+      raise 'Chuckle requires curl. Please install it.' if $CHILD_STATUS != 0
     end
 
     def curl(request)

data/lib/chuckle/cookie_jar.rb

@@ -1,6 +1,6 @@
 module Chuckle
   class CookieJar
-    PATH = "/_chuckle_cookies.txt"
+    PATH = '/_chuckle_cookies.txt'.freeze
 
     def initialize(request)
       @request = request

data/lib/chuckle/curl.rb

@@ -1,4 +1,5 @@
-require "fileutils"
+require 'English'
+require 'fileutils'
 
 module Chuckle
   class Curl
@@ -22,9 +23,9 @@ module Chuckle
       Kernel.system(*command)
 
       # capture exit code, bail on INT
-      exit_code = $?.to_i / 256
-      if $?.termsig == Signal.list["INT"]
-        Process.kill(:INT, $$)
+      exit_code = $CHILD_STATUS.to_i / 256
+      if $CHILD_STATUS.termsig == Signal.list['INT']
+        Process.kill(:INT, $PROCESS_ID)
       end
 
       # create tmp files if there were errors
@@ -59,41 +60,41 @@ module Chuckle
     def command(request)
       client = request.client
 
-      command = ["curl"]
-      command << "--silent"
-      command << "--compressed"
+      command = [ 'curl' ]
+      command << '--silent'
+      command << '--compressed'
 
-      command += [ "--user-agent", client.user_agent]
-      command += ["--max-time", client.timeout]
-      command += ["--retry", client.nretries]
-      command += ["--location", "--max-redirs", 3]
+      command += [ '--user-agent', client.user_agent ]
+      command += [ '--max-time', client.timeout ]
+      command += [ '--retry', client.nretries ]
+      command += [ '--location', '--max-redirs', 3 ]
 
       if request.body
-        command += ["--data-binary", request.body]
+        command += [ '--data-binary', request.body ]
       end
 
       # maintain backwards compatibility for content type
-      client.headers.each do |key,value|
-        if key == "Content-Type"
-          command += ["--header", "#{key}: #{value}"] if request.body
+      client.headers.each do |key, value|
+        if key == 'Content-Type'
+          command += [ '--header', "#{key}: #{value}" ] if request.body
         else
-          command += ["--header", "#{key}: #{value}"]
+          command += [ '--header', "#{key}: #{value}" ]
         end
       end
 
       if client.cookies?
         cookie_jar.preflight
-        command += ["--cookie", cookie_jar.path]
-        command += ["--cookie-jar", cookie_jar.path]
+        command += [ '--cookie', cookie_jar.path ]
+        command += [ '--cookie-jar', cookie_jar.path ]
       end
 
       # SSL options
-      command += ["--cacert", client.cacert] if client.cacert
-      command += ["--capath", client.capath] if client.capath
-      command += ["--insecure"] if client.insecure?
+      command += [ '--cacert', client.cacert ] if client.cacert
+      command += [ '--capath', client.capath ] if client.capath
+      command += [ '--insecure' ] if client.insecure?
 
-      command += ["--dump-header", headers_path]
-      command += ["--output", body_path]
+      command += [ '--dump-header', headers_path ]
+      command += [ '--output', body_path ]
 
       command << request.uri
 

data/lib/chuckle/options.rb

@@ -5,7 +5,7 @@ module Chuckle
       cache_errors: true,
       cacert: nil,
       capath: nil,
-      content_type: "application/x-www-form-urlencoded",
+      content_type: 'application/x-www-form-urlencoded',
       cookies: false,
       expires_in: :never,
       headers: nil,
@@ -13,22 +13,22 @@ module Chuckle
       nretries: 2,
       rate_limit: 1,
       timeout: 30,
-      user_agent: "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0",
+      user_agent: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0',
       verbose: false,
-    }
+    }.freeze
 
     # cache root directory
     def cache_dir
       @cache_dir ||= begin
         dir = options[:cache_dir]
         dir ||= begin
-          if home = ENV["HOME"]
+          if home = ENV['HOME']
             if File.exist?(home) && File.stat(home).writable?
               "#{home}/.chuckle"
             end
           end
         end
-        dir ||= "/tmp/chuckle"
+        dir ||= '/tmp/chuckle'
         dir
       end
     end
@@ -66,7 +66,7 @@ module Chuckle
     def headers
       @headers ||= begin
         headers = options[:headers] || {}
-        headers["Content-Type"] = options[:content_type] if options[:content_type]
+        headers['Content-Type'] = options[:content_type] if options[:content_type]
         headers
       end
     end

data/lib/chuckle/response.rb

@@ -34,7 +34,7 @@ module Chuckle
       if !locations.empty?
         location = locations.last
         # some buggy servers do this. sigh.
-        location = location.gsub(" ", "%20")
+        location = location.gsub(' ', '%20')
         self.uri += location
       end
 

data/lib/chuckle/util.rb

@@ -1,9 +1,9 @@
-require "digest/md5"
-require "tempfile"
+require 'digest/md5'
+require 'tempfile'
 
 module Chuckle
   module Util
-    extend self
+    module_function
 
     def hash_to_query(hash)
       q = hash.map do |key, value|
@@ -11,7 +11,7 @@ module Chuckle
         value = CGI.escape(value.to_s)
         "#{key}=#{value}"
       end
-      q.sort.join("&")
+      q.sort.join('&')
     end
 
     def md5(s)
@@ -23,7 +23,7 @@ module Chuckle
     end
 
     def tmp_path
-      Tempfile.open("chuckle") do |f|
+      Tempfile.open('chuckle') do |f|
         path = f.path
         f.unlink
         path

data/lib/chuckle/version.rb

@@ -1,4 +1,4 @@
 module Chuckle
   # Gem version
-  VERSION = "1.0.7"
+  VERSION = '1.0.9'.freeze
 end

data/test/helper.rb

@@ -1,39 +1,38 @@
-require "awesome_print"
-require "chuckle"
-require "json"
-require "minitest/autorun"
-require "minitest/pride"
+require 'awesome_print'
+require 'chuckle'
+require 'json'
+require 'minitest/autorun'
+require 'minitest/pride'
 
 module Helper
-  CACHE_DIR = "/tmp/_chuckle_tests"
-  URL = "http://chuckle"
-  QUERY = { "b" => "12", "a" => "34", "x y" => "56" }
-  TMP = "/tmp/_chuckle_tmp.txt"
+  CACHE_DIR = '/tmp/_chuckle_tests'.freeze
+  URL = 'http://chuckle'.freeze
+  QUERY = { 'b' => '12', 'a' => '34', 'x y' => '56' }.freeze
+  TMP = '/tmp/_chuckle_tmp.txt'.freeze
 
   #
   # fake responses
   #
 
-  HTTP_200 = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP_200 = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/1.1 200 OK
 
     hello
   EOF
 
-  HTTP_200_ALTERNATE = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP_200_ALTERNATE = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/1.1 200 OK
 
     alternate
   EOF
 
-
-  HTTP2_200 = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP2_200 = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/2 200 OK
 
     hello
   EOF
 
-  HTTP_302 = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP_302 = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/1.1 302 FOUND
     Location: http://one
 
@@ -42,7 +41,7 @@ module Helper
     hello
   EOF
 
-  HTTP_302_2 = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP_302_2 = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/1.1 302 FOUND
     Location: http://one
 
@@ -54,7 +53,7 @@ module Helper
     hello
   EOF
 
-  HTTP_302_RELATIVE = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP_302_RELATIVE = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/1.1 302 FOUND
     Location: /two
 
@@ -63,7 +62,7 @@ module Helper
     hello
   EOF
 
-  HTTP_404 = <<-EOF.gsub(/(^|\n) +/, "\\1")
+  HTTP_404 = <<-EOF.gsub(/(^|\n) +/, '\\1')
     HTTP/1.1 404 Not Found
 
   EOF
@@ -82,7 +81,7 @@ module Helper
   end
 
   # pretend to be curl by stubbing Kernel.system
-  def mcurl(response, exit_code = 0, &block)
+  def mcurl(response, exit_code = 0)
     # divide response into headers/body
     sep = response.rindex("\n\n") + "\n\n".length
     body = response[sep..-1]
@@ -90,8 +89,8 @@ module Helper
 
     # a lambda that pretends to be curl
     fake_system = lambda do |*command|
-      tmp_headers = command[command.index("--dump-header") + 1]
-      tmp_body    = command[command.index("--output") + 1]
+      tmp_headers = command[command.index('--dump-header') + 1]
+      tmp_body    = command[command.index('--output') + 1]
       IO.write(tmp_headers, headers)
       IO.write(tmp_body, body)
       `(exit #{exit_code})`
@@ -101,7 +100,7 @@ module Helper
     Kernel.stub(:system, fake_system) { yield }
   end
 
-  def assert_if_system(&block)
+  def assert_if_system
     fake_system = lambda do |*command|
       assert false, "system called with #{command.inspect}"
     end
@@ -110,6 +109,6 @@ module Helper
 
   def assert_command(cmd)
     system("#{cmd} > #{TMP} 2>&1")
-    assert($? == 0, File.read(TMP))
+    assert($CHILD_STATUS == 0, File.read(TMP))
   end
 end

data/test/test_cache.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 class TestCache < Minitest::Test
   include Helper
@@ -10,16 +10,16 @@ class TestCache < Minitest::Test
   # exists? and expired? (and clear)
   def test_predicates
     request = client.create_request(URL)
-    assert !client.cache.exists?(request), "uncache! uri said it was cached"
+    assert !client.cache.exists?(request), 'uncache! uri said it was cached'
 
     mcurl(HTTP_200) do
       client.run(request)
     end
     assert client.cache.exists?(request), "cache said it wasn't cached"
-    assert !client.cache.expired?(request), "cache said it was expired"
+    assert !client.cache.expired?(request), 'cache said it was expired'
 
     client.cache.clear(request)
-    assert !client.cache.exists?(request), "still cached after clear"
+    assert !client.cache.exists?(request), 'still cached after clear'
   end
 
   # cache expiration
@@ -71,7 +71,7 @@ class TestCache < Minitest::Test
       mcurl(HTTP_404) do
         client.get(URL)
       end
-    rescue Chuckle::Error => e
+    rescue Chuckle::Error
     end
 
     # cache hit
@@ -91,7 +91,7 @@ class TestCache < Minitest::Test
       mcurl(HTTP_404, Chuckle::Error::CURL_TIMEOUT) do
         client.get(URL)
       end
-    rescue Chuckle::Error => e
+    rescue Chuckle::Error
     end
 
     # cache hit
@@ -123,9 +123,9 @@ class TestCache < Minitest::Test
   end
 
   def test_long_url
-    words = %w(the quick brown fox jumped over the lazy dog)
+    words = %w[the quick brown fox jumped over the lazy dog]
     query = (1..100).map { words[rand(words.length)] }
-    query = query.each_slice(2).map { |i| i.join("=") }.join("&")
+    query = query.each_slice(2).map { |i| i.join('=') }.join('&')
 
     # cache miss
     mcurl(HTTP_200) do

data/test/test_headers.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 # these actually use the network, and get skipped unless ENV["NETWORK"].
 class TestHeaders < Minitest::Test
@@ -6,45 +6,43 @@ class TestHeaders < Minitest::Test
 
   def test_default_headers
     test_client = client(verbose: true)
-    assert_equal({"Content-Type"=>"application/x-www-form-urlencoded"}, test_client.headers)
+    assert_equal({ 'Content-Type' => 'application/x-www-form-urlencoded' }, test_client.headers)
   end
 
   def test_content_type
-    test_client = client(content_type: "text/json")
-    assert_equal({"Content-Type"=>"text/json"}, test_client.headers)
+    test_client = client(content_type: 'text/json')
+    assert_equal({ 'Content-Type' => 'text/json' }, test_client.headers)
   end
 
   def test_arbitrary_headers
-    test_client = client(headers: {"Referer" => "http://foo.com"})
-    assert_equal test_client.headers["Referer"], "http://foo.com"
-    assert_equal test_client.headers["Content-Type"], "application/x-www-form-urlencoded"
-
+    test_client = client(headers: { 'Referer' => 'http://foo.com' })
+    assert_equal test_client.headers['Referer'], 'http://foo.com'
+    assert_equal test_client.headers['Content-Type'], 'application/x-www-form-urlencoded'
   end
 
   def test_basic_get
     test_client = client(verbose: true)
-    request = test_client.create_request("http://httpbin.org/get")
+    request = test_client.create_request('http://httpbin.org/get')
     headers = command_headers(request)
     assert_equal headers, []
   end
 
-
   def test_basic_post
-    request = client(verbose: true).create_request("http://httpbin.org/post", "foo")
+    request = client(verbose: true).create_request('http://httpbin.org/post', 'foo')
     headers = command_headers(request)
-    assert_equal headers, ["Content-Type: application/x-www-form-urlencoded"]
+    assert_equal headers, [ 'Content-Type: application/x-www-form-urlencoded' ]
   end
 
   def test_get_headers
-    request = client(headers: {"Referer" => "http://foo.com"}).create_request("http://httpbin.org/get")
+    request = client(headers: { 'Referer' => 'http://foo.com' }).create_request('http://httpbin.org/get')
     headers = command_headers(request)
-    assert_equal headers, ["Referer: http://foo.com"]
+    assert_equal headers, [ 'Referer: http://foo.com' ]
   end
 
   def test_post_headers
-    request = client(headers: {"Referer" => "http://foo.com"}).create_request("http://httpbin.org/post", "foo")
+    request = client(headers: { 'Referer' => 'http://foo.com' }).create_request('http://httpbin.org/post', 'foo')
     headers = command_headers(request)
-    assert_equal headers.sort, ["Content-Type: application/x-www-form-urlencoded", "Referer: http://foo.com"]
+    assert_equal headers.sort, [ 'Content-Type: application/x-www-form-urlencoded', 'Referer: http://foo.com' ]
   end
 
   private
@@ -58,8 +56,8 @@ class TestHeaders < Minitest::Test
     headers = []
     test_command = command(request)
     test_command.each_with_index do |item, i|
-      if item == "--header"
-        headers << test_command[i+1]
+      if item == '--header'
+        headers << test_command[i + 1]
       end
     end
     headers
@@ -70,5 +68,4 @@ class TestHeaders < Minitest::Test
       command(@request)
     end
   end
-
-end
+end

data/test/test_network.rb

@@ -1,36 +1,36 @@
-require "helper"
+require 'helper'
 
 # these actually use the network, and get skipped unless ENV["NETWORK"].
 class TestNetwork < Minitest::Test
   include Helper
 
   def after_setup
-    skip if !ENV["NETWORK"]
+    skip if !ENV['NETWORK']
   end
 
   def test_get
-    response = client.get("http://httpbin.org/get")
+    response = client.get('http://httpbin.org/get')
     assert_equal 200, response.code
   end
 
   def test_timeout
     e = assert_raises Chuckle::Error do
-      client(nretries: 0, timeout: 2).get("http://httpbin.org/delay/3")
+      client(nretries: 0, timeout: 2).get('http://httpbin.org/delay/3')
     end
     assert e.timeout?, "exception didn't indicate timeout"
   end
 
   def test_post
-    response = client.post("http://httpbin.org/post", QUERY)
-    assert_equal JSON.parse(response.body)["form"], QUERY
+    response = client.post('http://httpbin.org/post', QUERY)
+    assert_equal JSON.parse(response.body)['form'], QUERY
   end
 
   def test_cookies
-    cookies = { "a" => "b" }
+    cookies = { 'a' => 'b' }
 
     client(cookies: true, expires_in: 60) # set options
 
-    request = client.create_request("http://httpbin.org/get")
+    request = client.create_request('http://httpbin.org/get')
     cookie_jar = Chuckle::CookieJar.new(request).path
 
     # make sure there are no cookies after the GET
@@ -39,23 +39,23 @@ class TestNetwork < Minitest::Test
 
     # make sure there ARE cookies after a Set-Cookie
     client.get("http://httpbin.org/cookies/set?#{Chuckle::Util.hash_to_query(cookies)}")
-    assert File.exist?(cookie_jar), "cookie jar SHOULD exist now"
+    assert File.exist?(cookie_jar), 'cookie jar SHOULD exist now'
 
     # make sure cookies come back from the server
-    response = client.get("http://httpbin.org/cookies")
-    assert_equal JSON.parse(response.body)["cookies"], cookies
+    response = client.get('http://httpbin.org/cookies')
+    assert_equal JSON.parse(response.body)['cookies'], cookies
 
     # Finally, test cache expiry on cookie_jar. Note that this has to
     # be an un-cached URL, otherwise the cookie_jar never gets
     # checked!
     tm = Time.now - (client.expires_in + 9999)
     File.utime(tm, tm, cookie_jar)
-    client.get("http://httpbin.org/robots.txt")
+    client.get('http://httpbin.org/robots.txt')
     assert !File.exist?(cookie_jar), "cookie jar should've expired"
   end
 
   def test_https
-    response = client.get("https://httpbin.org/get")
+    response = client.get('https://httpbin.org/get')
     assert_equal 200, response.code
   end
 
@@ -66,7 +66,7 @@ class TestNetwork < Minitest::Test
   # end
 
   def test_bin
-    Dir.chdir(File.expand_path("../", __FILE__))
-    assert_command("../bin/chuckle url_file.txt")
+    Dir.chdir(File.expand_path(__dir__))
+    assert_command('../bin/chuckle url_file.txt')
   end
 end

data/test/test_requests.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 class TestRequests < Minitest::Test
   include Helper
@@ -20,14 +20,14 @@ class TestRequests < Minitest::Test
   def test_302
     response = mcurl(HTTP_302) { client.get(URL) }
     assert_equal 200, response.code
-    assert_equal URI.parse("http://one"), response.uri
+    assert_equal URI.parse('http://one'), response.uri
     assert_equal "hello\n", response.body
   end
 
   def test_302_2
     response = mcurl(HTTP_302_2) { client.get(URL) }
     assert_equal 200, response.code
-    assert_equal URI.parse("http://two"), response.uri
+    assert_equal URI.parse('http://two'), response.uri
     assert_equal "hello\n", response.body
   end
 
@@ -58,7 +58,7 @@ class TestRequests < Minitest::Test
 
   def test_post
     # just test hash_to_query first
-    assert_equal "a=34&b=12&x+y=56", Chuckle::Util.hash_to_query(QUERY)
+    assert_equal 'a=34&b=12&x+y=56', Chuckle::Util.hash_to_query(QUERY)
 
     response = mcurl(HTTP_200) { client.post(URL, QUERY) }
     assert_equal response.request.body, Chuckle::Util.hash_to_query(QUERY)
@@ -69,10 +69,10 @@ class TestRequests < Minitest::Test
 
   def test_strange_urls
     [
-     "gub",
-     "file://gub",
-     "file://gub/gub",
-     "file:///gub",
+      'gub',
+      'file://gub',
+      'file://gub/gub',
+      'file:///gub',
     ].each do |url|
       response = mcurl(HTTP_200) { client.get(url) }
       assert_equal 200, response.code

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: chuckle
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Adam Doppelt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -138,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: chuckle
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Chuckle - an http client that caches on disk.