htty 1.5.4 → 1.5.5

data/lib/htty/cli/commands/userinfo_clear.rb

@@ -1,11 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/userinfo_unset")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _userinfo-clear_ command.
 class HTTY::CLI::Commands::UserinfoClear < HTTY::CLI::Command

data/lib/htty/cli/commands/userinfo_set.rb

@@ -1,14 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../request")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../url_escaping")
-require File.expand_path("#{File.dirname __FILE__}/address")
-require File.expand_path("#{File.dirname __FILE__}/userinfo_unset")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _userinfo-set_ command.
 class HTTY::CLI::Commands::UserinfoSet < HTTY::CLI::Command

data/lib/htty/cli/commands/userinfo_unset.rb

@@ -1,12 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/address")
-require File.expand_path("#{File.dirname __FILE__}/userinfo_set")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _userinfo-unset_ command.
 class HTTY::CLI::Commands::UserinfoUnset < HTTY::CLI::Command

data/lib/htty/cli/display.rb

@@ -1,6 +1,4 @@
-module HTTY; end
-
-class HTTY::CLI; end
+require 'htty'
 
 # Encapsulates the display logic of _htty_'s command-line interface.
 module HTTY::CLI::Display
@@ -174,13 +172,13 @@ module HTTY::CLI::Display
   # http://api.rubyonrails.org/classes/ActionView/Helpers/TextHelper.html#M002281
   def word_wrap_indented(text, columns=2..80)
     indent_by, wrap_at = columns.min, columns.max - columns.min
-    text.split("\n").collect do |line|
+    text.split("\n").collect { |line|
       (wrap_at < line.length)                              ?
       line.gsub(/(.{1,#{wrap_at}})(\s+|$)/, "\\1\n").strip :
       line
-    end.join("\n").split("\n").collect do |line|
+    }.join("\n").split("\n").collect { |line|
       indent line, indent_by
-    end.join "\n"
+    }.join "\n"
   end
 
 private

data/lib/htty/cli/http_method_command.rb

@@ -1,13 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/display")
-# TODO: See if we can avoid circular references without omitting these 'require' statements
-# require File.expand_path("#{File.dirname __FILE__}/../request")
-# require File.expand_path("#{File.dirname __FILE__}/commands/cookies_use")
-# require File.expand_path("#{File.dirname __FILE__}/commands/follow")
-# require File.expand_path("#{File.dirname __FILE__}/commands/ssl_verification_off")
-
-module HTTY; end
-
-class HTTY::CLI; end
+require 'htty'
 
 # Encapsulates behavior common to all HTTP-method-oriented HTTY::CLI::Command
 # subclasses.

data/lib/htty/cli/input_device.rb

@@ -1,3 +1,4 @@
+require 'htty'
 require 'readline'
 
 module HTTY::CLI::InputDevice

data/lib/htty/cli/url_escaping.rb

@@ -1,9 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/display")
-require File.expand_path("#{File.dirname __FILE__}/../uri")
-
-module HTTY; end
-
-class HTTY::CLI; end
+require 'htty'
 
 # Encapsulates the URL escaping logic of _htty_'s command-line interface.
 module HTTY::CLI::UrlEscaping

data/lib/htty/cookies_util.rb

@@ -1,4 +1,4 @@
-module HTTY; end
+require 'htty'
 
 # Provides support for marshaling HTTP cookies to and from strings.
 module HTTY::CookiesUtil
@@ -21,9 +21,9 @@ module HTTY::CookiesUtil
     cookies = Array(cookies)
     return nil if cookies.empty?
 
-    cookies.collect do |name, value|
+    cookies.collect { |name, value|
       [name, value].compact.join COOKIE_NAME_VALUE_DELIMITER
-    end.join COOKIES_DELIMITER
+    }.join COOKIES_DELIMITER
   end
 
 protected

data/lib/htty/headers.rb

@@ -1,7 +1,6 @@
-require 'uri'
 require 'base64'
-
-module HTTY; end
+require 'htty'
+require 'uri'
 
 # Represents the Headers of a Request or a Response. Headers preserve the
 # insertion order and are case insensitive. A custom Hash is used because Hash
@@ -74,7 +73,7 @@ class HTTY::Headers
   def self.credentials_from(basic_authentication)
     if match = /^Basic (.+)$/.match(basic_authentication)
       credentials = Base64.decode64(match[1]).split(':')
-      return yield *credentials if block_given?
+      return yield(*credentials) if block_given?
       return credentials
     end
   end

data/lib/htty/http_patch.rb

@@ -1,35 +1,32 @@
 require 'net/http'
 
-unless Net::HTTP.const_defined?(:Patch) &&
-       Net::HTTP.instance_methods.collect(&:to_sym).include?(:patch)
-  module Net
+module Net
 
-    class HTTP < Protocol
+  class HTTP < Protocol
 
-      # Represents a HTTP PATCH request. This class exists because Net::HTTP did
-      # not have this behavior in Ruby v1.9.2 and earlier.
-      class Patch < HTTPRequest
+    # Represents a HTTP PATCH request. This class exists because Net::HTTP did
+    # not have this behavior in Ruby v1.9.2 and earlier.
+    class Patch < HTTPRequest
 
-        METHOD            = 'PATCH'
-        REQUEST_HAS_BODY  = true
-        RESPONSE_HAS_BODY = true
+      METHOD            = 'PATCH'
+      REQUEST_HAS_BODY  = true
+      RESPONSE_HAS_BODY = true
 
-      end
+    end
 
-      def patch(path, data, initheader, &block)
-        res = nil
-        request(Patch.new(path, initheader), data) do |r|
-          r.read_body(nil, &block)
-          res = r
-        end
-        unless @newimpl
-          res.value
-          return res, res.body
-        end
-        res
+    def patch(path, data, initheader, &block)
+      res = nil
+      request(Patch.new(path, initheader), data) do |r|
+        r.read_body(nil, &block)
+        res = r
       end
-
+      unless @newimpl
+        res.value
+        return res, res.body
+      end
+      res
     end
 
   end
+
 end

data/lib/htty/no_header_error.rb

@@ -1,4 +1,4 @@
-module HTTY; end
+require 'htty'
 
 # Indicates that an header could not be found in a HTTY::Payload
 class HTTY::NoHeaderError < StandardError

data/lib/htty/no_location_header_error.rb

@@ -1,6 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/response")
-
-module HTTY; end
+require 'htty'
 
 # Indicates that the _Location_ header was missing from HTTY::Request#response.
 class HTTY::NoLocationHeaderError < StandardError

data/lib/htty/no_response_error.rb

@@ -1,4 +1,4 @@
-module HTTY; end
+require 'htty'
 
 # Indicates that HTTY::Request#response was missing.
 class HTTY::NoResponseError < StandardError

data/lib/htty/no_set_cookie_header_error.rb

@@ -1,6 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/response")
-
-module HTTY; end
+require 'htty'
 
 # Indicates that the _Set-Cookie_ header was missing from
 # HTTY::Request#response.

data/lib/htty/payload.rb

@@ -1,8 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/headers")
-require File.expand_path("#{File.dirname __FILE__}/no_header_error")
-require File.expand_path("#{File.dirname __FILE__}/cookies_util")
-
-module HTTY; end
+require 'htty'
 
 # Encapsulates the headers and body of an HTTP(S) request or response.
 class HTTY::Payload

data/lib/htty/platform.rb

@@ -1,4 +1,4 @@
-module HTTY; end
+require 'htty'
 
 # Provides methods for ascertaining system characteristics.
 module HTTY::Platform

data/lib/htty/preferences.rb

@@ -1,4 +1,4 @@
-module HTTY; end
+require 'htty'
 
 # Encapsulates _htty_ user preferences.
 class HTTY::Preferences

data/lib/htty/request.rb

@@ -1,17 +1,7 @@
 require 'base64'
+require 'htty'
 require 'pathname'
 require 'uri'
-require File.expand_path("#{File.dirname __FILE__}/../htty/version")
-require File.expand_path("#{File.dirname __FILE__}/cookies_util")
-require File.expand_path("#{File.dirname __FILE__}/no_location_header_error")
-require File.expand_path("#{File.dirname __FILE__}/no_response_error")
-require File.expand_path("#{File.dirname __FILE__}/no_set_cookie_header_error")
-require File.expand_path("#{File.dirname __FILE__}/uri")
-require File.expand_path("#{File.dirname __FILE__}/payload")
-require File.expand_path("#{File.dirname __FILE__}/requests_util")
-require File.expand_path("#{File.dirname __FILE__}/response")
-
-module HTTY; end
 
 # Encapsulates an HTTP(S) request.
 class HTTY::Request < HTTY::Payload
@@ -206,13 +196,13 @@ public
 
     # Remove just one matching cookie from the end.
     rejected = false
-    new_cookies = cookies.reverse.reject do |cookie_name, cookie_value|
+    new_cookies = cookies.reverse.reject { |cookie_name, cookie_value|
       if !rejected && (cookie_name == name)
         rejected = true
       else
         false
       end
-    end.reverse
+    }.reverse
 
     cookies_string = HTTY::CookiesUtil.cookies_to_string(new_cookies)
     if cookies_string

data/lib/htty/requests_util.rb

@@ -1,11 +1,7 @@
+require 'htty'
 require 'net/http'
 require 'net/https'
 require 'uri'
-require File.expand_path("#{File.dirname __FILE__}/http_patch")
-require File.expand_path("#{File.dirname __FILE__}/preferences")
-require File.expand_path("#{File.dirname __FILE__}/response")
-
-module HTTY; end
 
 # Provides support for making HTTP(S) requests.
 module HTTY::RequestsUtil

data/lib/htty/response.rb

@@ -1,7 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/cookies_util")
-require File.expand_path("#{File.dirname __FILE__}/payload")
-
-module HTTY; end
+require 'htty'
 
 # Encapsulates an HTTP(S) response.
 class HTTY::Response < HTTY::Payload

data/lib/htty/session.rb

@@ -1,6 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/request")
-
-module HTTY; end
+require 'htty'
 
 # Encapsulates an _htty_ session.
 class HTTY::Session

data/lib/htty/tempfile_preserving_extname.rb

@@ -1,7 +1,6 @@
+require 'htty'
 require 'tempfile'
 
-module HTTY; end
-
 # Adds file-extension-preservation behavior to Tempfile.
 class HTTY::TempfilePreservingExtname < Tempfile
 

data/lib/htty/uri.rb

@@ -1,7 +1,6 @@
+require 'htty'
 require 'uri'
 
-module HTTY; end
-
 class HTTY::URI
   # There's a lot of confusion about this, the default implementation
   # of URI.escape is marked as "obsolete", CGI.escape does another work,

data/lib/htty/version.rb

@@ -1,6 +1,6 @@
 module HTTY
 
   # The version of this release of _htty_.
-  VERSION = '1.5.4' unless const_defined?(:VERSION)
+  VERSION = '1.5.5'
 
 end

data/lib/tasks.rb

@@ -0,0 +1,3 @@
+Dir.glob "#{File.dirname __FILE__}/#{File.basename __FILE__, '.rb'}/*.rake" do |f|
+  load f
+end

data/lib/tasks/build_doc.rake

@@ -0,0 +1,8 @@
+begin
+  require 'yard'
+rescue LoadError
+else
+  namespace :build do
+    YARD::Rake::YardocTask.new :doc
+  end
+end

data/lib/tasks/lib_each.rake

@@ -0,0 +1,25 @@
+namespace :lib do
+  desc "Check the source for missing 'require' statements. Set the 'VERBOSE' " +
+       'environment variable to "t[rue]" to display the name of each file as ' +
+       'it is loaded.'
+  task :each do
+    def verbose?
+      ENV['VERBOSE'].to_s =~ /^T/i
+    end
+
+    Dir.chdir 'lib' do
+      Dir.glob( '**/*.rb' ) do |f|
+        next if f == 'tasks.rb'
+
+        if verbose?
+          puts "* #{f}"
+        else
+          print "\e[32m.\e[0m"
+        end
+        command = "/usr/bin/env ruby -e 'require File.expand_path(#{f.inspect})'"
+        break unless system(command)
+      end
+    end
+    puts unless verbose?
+  end
+end

data/lib/tasks/spec.rake

@@ -0,0 +1,68 @@
+begin
+  require 'rspec/core/rake_task'
+rescue LoadError
+else
+  def define_spec_task(name, options={})
+    desc options[:desc]
+    begin
+      require 'rspec/core/rake_task'
+    rescue LoadError
+    else
+      RSpec::Core::RakeTask.new name do |t|
+        t.rspec_opts ||= []
+        t.rspec_opts << "--backtrace" if options[:backtrace]
+
+        debugger_gem = %w(pry-byebug pry-debugger).detect do |gem|
+          `bundle show #{gem} 2>&1 >/dev/null`
+          $?.success?
+        end
+        if debugger_gem && options[:debug] != false
+          t.rspec_opts << "--require #{debugger_gem}"
+        end
+
+        t.rspec_opts << "--format #{options[:format]}" if options.key?(:format)
+        t.rspec_opts << '--no-profile' if options[:profile] == false
+        t.rspec_opts << '--warnings' if options[:warnings]
+        t.pattern = options[:pattern] || %w(spec/*_spec.rb spec/**/*_spec.rb)
+      end
+    end
+  end
+
+  define_spec_task :spec, :desc => 'Run specs', :profile => true
+
+  namespace :spec do
+    uncommitted_files_in_spec = `git ls-files --modified --others spec/* spec/**/*`.split("\n")
+    uncommitted_spec_files = `git ls-files --modified --others spec/*_spec.rb spec/**/*_spec.rb`.split("\n")
+    nonspec_uncommitted_files_in_spec = uncommitted_files_in_spec -
+                                        uncommitted_spec_files
+    if nonspec_uncommitted_files_in_spec.empty?
+      if uncommitted_spec_files.empty?
+        desc 'Run uncommitted specs (none)'
+        task :uncommitted do
+          puts 'No uncommitted specs to run'
+        end
+      else
+        noun_phrase = "#{uncommitted_spec_files.length} uncommitted spec file#{(uncommitted_spec_files.length == 1) ? nil : 's'}"
+        desc = "Run #{noun_phrase}"
+        define_spec_task :uncommitted, :desc    => desc,
+                                       :pattern => uncommitted_spec_files
+      end
+    else
+      noun_phrase = "#{uncommitted_files_in_spec.length} uncommitted file#{uncommitted_files_in_spec.length == 1 ? nil : 's'}"
+      desc = "Run all specs because of #{noun_phrase} in 'spec'"
+      define_spec_task :uncommitted, :desc => desc, :pattern => 'spec'
+    end
+
+    define_spec_task :warnings,
+                     :desc     => 'Run specs with Ruby warnings enabled',
+                     :format   => :progress,
+                     :profile  => false,
+                     :warnings => true
+  end
+
+  # Support the 'gem test' command.
+  define_spec_task :test, :desc => '', :backtrace => true,
+                                       :debug     => false,
+                                       :format    => :progress,
+                                       :profile   => false
+end