htty 1.5.4 → 1.5.5

data/lib/htty/cli.rb

@@ -1,15 +1,16 @@
-require File.expand_path("#{File.dirname __FILE__}/cli/commands")
-require File.expand_path("#{File.dirname __FILE__}/cli/commands/help")
-require File.expand_path("#{File.dirname __FILE__}/cli/input_device")
-require File.expand_path("#{File.dirname __FILE__}/cli/display")
-require File.expand_path("#{File.dirname __FILE__}/session")
-require File.expand_path("#{File.dirname __FILE__}/version")
-
-module HTTY; end
+require 'htty'
 
 # Encapsulates the command-line interface to _htty_.
 class HTTY::CLI
 
+  autoload :BodyOpenCommand,   'htty/cli/body_open_command'
+  autoload :Command,           'htty/cli/command'
+  autoload :Commands,          'htty/cli/commands'
+  autoload :Display,           'htty/cli/display'
+  autoload :HTTPMethodCommand, 'htty/cli/http_method_command'
+  autoload :InputDevice,       'htty/cli/input_device'
+  autoload :UrlEscaping,       'htty/cli/url_escaping'
+
   include HTTY::CLI::Display
 
   # Returns the HTTY::Session created from command-line arguments.
@@ -94,11 +95,3 @@ private
     end
   end
 end
-
-
-
-Dir.glob "#{File.dirname __FILE__}/cli/*.rb" do |f|
-  require File.expand_path(
-    "#{File.dirname __FILE__}/cli/" + File.basename(f, '.rb')
-  )
-end

data/lib/htty/cli/body_open_command.rb

@@ -1,16 +1,11 @@
+require 'htty'
+
 begin
   require 'mime/types'
 rescue LoadError
   require 'rubygems'
   retry
 end
-require File.expand_path("#{File.dirname __FILE__}/../platform")
-require File.expand_path("#{File.dirname __FILE__}/../tempfile_preserving_extname")
-require File.expand_path("#{File.dirname __FILE__}/display")
-
-module HTTY; end
-
-class HTTY::CLI; end
 
 # Encapsulates behavior common to all HTTY::CLI::Command subclasses that open
 # body content in an external viewer program.

data/lib/htty/cli/command.rb

@@ -1,10 +1,6 @@
 require 'abbrev'
+require 'htty'
 require 'shellwords'
-require File.expand_path("#{File.dirname __FILE__}/display")
-
-module HTTY; end
-
-class HTTY::CLI; end
 
 # A base class for all HTTY::CLI::Commands.
 class HTTY::CLI::Command
@@ -29,9 +25,7 @@ class HTTY::CLI::Command
     if (match = (command_line_regexp.match(command_line)))
       begin
         if (arguments = match.captures[0])
-          attributes = attributes.merge(
-            :arguments => sanitize_arguments(arguments.strip.shellsplit)
-          )
+          attributes = attributes.merge(:arguments => sanitize_arguments(arguments.strip.shellsplit))
         end
       rescue ArgumentError
         :unclosed_quote
@@ -61,17 +55,15 @@ class HTTY::CLI::Command
       end
     end
     all_command_lines = [my_command_line] + other_command_lines
-    all_abbrevs = Abbrev.abbrev(all_command_lines).group_by do |abbrev,
-                                                                command_line|
+    all_abbrevs = Abbrev.abbrev(all_command_lines).group_by { |abbrev,
+                                                               command_line|
       command_line
-    end.collect do |command_line, abbrevs|
-      abbrevs.sort_by do |command_line, abbrev|
-        command_line
-      end.first
+    }.collect do |command_line, abbrevs|
+      abbrevs.sort_by { |command_line, abbrev| command_line }.first
     end
-    my_abbrev = all_abbrevs.detect do |abbrev, command_line|
+    my_abbrev = all_abbrevs.detect { |abbrev, command_line|
       command_line == my_command_line
-    end.first
+    }.first
     my_abbrev_regexp = Regexp.new("^(#{Regexp.escape my_abbrev})(.*)$")
     my_command_line.gsub my_abbrev_regexp do
       $2.empty? ? $1 : "#{$1}[#{$2}]"
@@ -165,10 +157,10 @@ private
 
   def self.namespace_siblings
     namespace = namespaces.last
-    other_commands = namespace.constants.collect do |constant|
+    namespace.constants.collect { |constant|
       type = namespace.module_eval(constant.to_s, __FILE__, __LINE__)
       (type == self) ? nil : type
-    end.compact
+    }.compact
   end
 
 public

data/lib/htty/cli/commands.rb

@@ -1,10 +1,81 @@
-module HTTY; end
-
-class HTTY::CLI; end
+require 'htty'
 
 # Contains classes that implement commands in the user interface.
 module HTTY::CLI::Commands
 
+  autoload :Address,            'htty/cli/commands/address'
+  autoload :BodyClear,          'htty/cli/commands/body_clear'
+  autoload :BodyEdit,           'htty/cli/commands/body_edit'
+  autoload :BodyRequest,        'htty/cli/commands/body_request'
+  autoload :BodyRequestOpen,    'htty/cli/commands/body_request_open'
+  autoload :BodyResponse,       'htty/cli/commands/body_response'
+  autoload :BodyResponseOpen,   'htty/cli/commands/body_response_open'
+  autoload :BodySet,            'htty/cli/commands/body_set'
+  autoload :BodyUnset,          'htty/cli/commands/body_unset'
+  autoload :Cd,                 'htty/cli/commands/cd'
+  autoload :CookieAdd,          'htty/cli/commands/cookie_add'
+  autoload :CookieRemove,       'htty/cli/commands/cookie_remove'
+  autoload :Cookies,            'htty/cli/commands/cookies'
+  autoload :CookiesAdd,         'htty/cli/commands/cookies_add'
+  autoload :CookiesClear,       'htty/cli/commands/cookies_clear'
+  autoload :CookiesRemove,      'htty/cli/commands/cookies_remove'
+  autoload :CookiesRemoveAll,   'htty/cli/commands/cookies_remove_all'
+  autoload :CookiesUse,         'htty/cli/commands/cookies_use'
+  autoload :Delete,             'htty/cli/commands/delete'
+  autoload :Exit,               'htty/cli/commands/exit'
+  autoload :Follow,             'htty/cli/commands/follow'
+  autoload :Form,               'htty/cli/commands/form'
+  autoload :FormAdd,            'htty/cli/commands/form_add'
+  autoload :FormClear,          'htty/cli/commands/form_clear'
+  autoload :FormRemove,         'htty/cli/commands/form_remove'
+  autoload :FormRemoveAll,      'htty/cli/commands/form_remove_all'
+  autoload :FragmentClear,      'htty/cli/commands/fragment_clear'
+  autoload :FragmentSet,        'htty/cli/commands/fragment_set'
+  autoload :FragmentUnset,      'htty/cli/commands/fragment_unset'
+  autoload :Get,                'htty/cli/commands/get'
+  autoload :HeaderSet,          'htty/cli/commands/header_set'
+  autoload :HeaderUnset,        'htty/cli/commands/header_unset'
+  autoload :HeadersClear,       'htty/cli/commands/headers_clear'
+  autoload :HeadersRequest,     'htty/cli/commands/headers_request'
+  autoload :HeadersResponse,    'htty/cli/commands/headers_response'
+  autoload :HeadersSet,         'htty/cli/commands/headers_set'
+  autoload :HeadersUnset,       'htty/cli/commands/headers_unset'
+  autoload :HeadersUnsetAll,    'htty/cli/commands/headers_unset_all'
+  autoload :Help,               'htty/cli/commands/help'
+  autoload :History,            'htty/cli/commands/history'
+  autoload :HistoryVerbose,     'htty/cli/commands/history_verbose'
+  autoload :HostSet,            'htty/cli/commands/host_set'
+  autoload :HttpDelete,         'htty/cli/commands/http_delete'
+  autoload :HttpGet,            'htty/cli/commands/http_get'
+  autoload :HttpHead,           'htty/cli/commands/http_head'
+  autoload :HttpOptions,        'htty/cli/commands/http_options'
+  autoload :HttpPatch,          'htty/cli/commands/http_patch'
+  autoload :HttpPost,           'htty/cli/commands/http_post'
+  autoload :HttpPut,            'htty/cli/commands/http_put'
+  autoload :HttpTrace,          'htty/cli/commands/http_trace'
+  autoload :Patch,              'htty/cli/commands/patch'
+  autoload :PathSet,            'htty/cli/commands/path_set'
+  autoload :PortSet,            'htty/cli/commands/port_set'
+  autoload :Post,               'htty/cli/commands/post'
+  autoload :Put,                'htty/cli/commands/put'
+  autoload :QueryAdd,           'htty/cli/commands/query_add'
+  autoload :QueryClear,         'htty/cli/commands/query_clear'
+  autoload :QueryRemove,        'htty/cli/commands/query_remove'
+  autoload :QuerySet,           'htty/cli/commands/query_set'
+  autoload :QueryUnset,         'htty/cli/commands/query_unset'
+  autoload :QueryUnsetAll,      'htty/cli/commands/query_unset_all'
+  autoload :Quit,               'htty/cli/commands/quit'
+  autoload :Reuse,              'htty/cli/commands/reuse'
+  autoload :SchemeSet,          'htty/cli/commands/scheme_set'
+  autoload :SslVerification,    'htty/cli/commands/ssl_verification'
+  autoload :SslVerificationOff, 'htty/cli/commands/ssl_verification_off'
+  autoload :SslVerificationOn,  'htty/cli/commands/ssl_verification_on'
+  autoload :Status,             'htty/cli/commands/status'
+  autoload :Undo,               'htty/cli/commands/undo'
+  autoload :UserinfoClear,      'htty/cli/commands/userinfo_clear'
+  autoload :UserinfoSet,        'htty/cli/commands/userinfo_set'
+  autoload :UserinfoUnset,      'htty/cli/commands/userinfo_unset'
+
   extend Enumerable
 
   # Returns a HTTY::CLI::Command descendant whose command line representation
@@ -22,9 +93,8 @@ module HTTY::CLI::Commands
   # Yields each HTTY::CLI::Command descendant in turn.
   def self.each
     Dir.glob "#{File.dirname __FILE__}/commands/*.rb" do |f|
-      class_name = File.basename(f, '.rb').gsub(/^(.)/) do |initial|
-        initial.upcase
-      end.gsub(/_(\S)/) do |initial|
+      class_name = File.basename(f, '.rb').gsub(/^(.)/, &:upcase).
+                                           gsub(/_(\S)/) do |initial|
         initial.gsub(/_/, '').upcase
       end
       klass = const_get(class_name) rescue nil
@@ -34,8 +104,3 @@ module HTTY::CLI::Commands
   end
 
 end
-
-Dir.glob "#{File.dirname __FILE__}/commands/*.rb" do |f|
-  require File.expand_path("#{File.dirname __FILE__}/commands/" +
-                           File.basename(f, '.rb'))
-end

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

@@ -1,17 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/fragment_set")
-require File.expand_path("#{File.dirname __FILE__}/host_set")
-require File.expand_path("#{File.dirname __FILE__}/path_set")
-require File.expand_path("#{File.dirname __FILE__}/port_set")
-require File.expand_path("#{File.dirname __FILE__}/query_set")
-require File.expand_path("#{File.dirname __FILE__}/scheme_set")
-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 _address_ command.
 class HTTY::CLI::Commands::Address < HTTY::CLI::Command

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

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

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

@@ -1,15 +1,5 @@
+require 'htty'
 require 'tempfile'
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../display")
-require File.expand_path("#{File.dirname __FILE__}/body_request")
-require File.expand_path("#{File.dirname __FILE__}/body_unset")
-require File.expand_path("#{File.dirname __FILE__}/body_set")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
 
 # Encapsulates the _body-edit_ command.
 class HTTY::CLI::Commands::BodyEdit < HTTY::CLI::Command

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

@@ -1,15 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/body_request_open")
-require File.expand_path("#{File.dirname __FILE__}/body_response")
-require File.expand_path("#{File.dirname __FILE__}/body_set")
-require File.expand_path("#{File.dirname __FILE__}/body_unset")
-require File.expand_path("#{File.dirname __FILE__}/headers_request")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _body-request_ command.
 class HTTY::CLI::Commands::BodyRequest < HTTY::CLI::Command

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

@@ -1,13 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../body_open_command")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/body_request")
-require File.expand_path("#{File.dirname __FILE__}/body_response_open")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _body-request-open_ command.
 class HTTY::CLI::Commands::BodyRequestOpen < HTTY::CLI::Command

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

@@ -1,15 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../no_response_error")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/body_request")
-require File.expand_path("#{File.dirname __FILE__}/body_response_open")
-require File.expand_path("#{File.dirname __FILE__}/headers_response")
-require File.expand_path("#{File.dirname __FILE__}/status")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _body-response_ command.
 class HTTY::CLI::Commands::BodyResponse < HTTY::CLI::Command

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

@@ -1,14 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../no_response_error")
-require File.expand_path("#{File.dirname __FILE__}/../body_open_command")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/body_request_open")
-require File.expand_path("#{File.dirname __FILE__}/body_response")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _body-response-open_ command.
 class HTTY::CLI::Commands::BodyResponseOpen < HTTY::CLI::Command

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

@@ -1,14 +1,5 @@
+require 'htty'
 require 'readline'
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../display")
-require File.expand_path("#{File.dirname __FILE__}/body_request")
-require File.expand_path("#{File.dirname __FILE__}/body_unset")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
 
 # Encapsulates the _body-set_ command.
 class HTTY::CLI::Commands::BodySet < HTTY::CLI::Command

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

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

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

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

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

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

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

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

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

@@ -1,18 +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__}/../display")
-require File.expand_path("#{File.dirname __FILE__}/cookies_add")
-require File.expand_path("#{File.dirname __FILE__}/cookies_remove")
-require File.expand_path("#{File.dirname __FILE__}/cookies_remove_all")
-require File.expand_path("#{File.dirname __FILE__}/cookies_use")
-require File.expand_path("#{File.dirname __FILE__}/headers_request")
-require File.expand_path("#{File.dirname __FILE__}/headers_response")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _cookies_ command.
 class HTTY::CLI::Commands::Cookies < HTTY::CLI::Command

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

@@ -1,14 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/cookies")
-require File.expand_path("#{File.dirname __FILE__}/cookies_remove")
-require File.expand_path("#{File.dirname __FILE__}/cookies_remove_all")
-require File.expand_path("#{File.dirname __FILE__}/cookies_use")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _cookies-add_ command.
 class HTTY::CLI::Commands::CookiesAdd < HTTY::CLI::Command