htty 1.5.4 → 1.5.5

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

@@ -1,16 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/follow")
-require File.expand_path("#{File.dirname __FILE__}/http_delete")
-require File.expand_path("#{File.dirname __FILE__}/http_patch")
-require File.expand_path("#{File.dirname __FILE__}/http_post")
-require File.expand_path("#{File.dirname __FILE__}/http_put")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-get_ command.
 class HTTY::CLI::Commands::HttpGet < HTTY::CLI::Command

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

@@ -1,12 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/http_get")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-head_ command.
 class HTTY::CLI::Commands::HttpHead < HTTY::CLI::Command

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

@@ -1,12 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/http_get")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-options_ command.
 class HTTY::CLI::Commands::HttpOptions < HTTY::CLI::Command

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

@@ -1,16 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/follow")
-require File.expand_path("#{File.dirname __FILE__}/http_delete")
-require File.expand_path("#{File.dirname __FILE__}/http_get")
-require File.expand_path("#{File.dirname __FILE__}/http_post")
-require File.expand_path("#{File.dirname __FILE__}/http_put")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-patch_ command.
 class HTTY::CLI::Commands::HttpPatch < HTTY::CLI::Command

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

@@ -1,16 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/follow")
-require File.expand_path("#{File.dirname __FILE__}/http_delete")
-require File.expand_path("#{File.dirname __FILE__}/http_get")
-require File.expand_path("#{File.dirname __FILE__}/http_patch")
-require File.expand_path("#{File.dirname __FILE__}/http_put")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-post_ command.
 class HTTY::CLI::Commands::HttpPost < HTTY::CLI::Command

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

@@ -1,15 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/http_get")
-require File.expand_path("#{File.dirname __FILE__}/http_patch")
-require File.expand_path("#{File.dirname __FILE__}/http_post")
-require File.expand_path("#{File.dirname __FILE__}/http_delete")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-put_ command.
 class HTTY::CLI::Commands::HttpPut < HTTY::CLI::Command

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

@@ -1,12 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../http_method_command")
-require File.expand_path("#{File.dirname __FILE__}/http_get")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _http-trace_ command.
 class HTTY::CLI::Commands::HttpTrace < HTTY::CLI::Command

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

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

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

@@ -1,17 +1,9 @@
-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")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _path-set_ command.
 class HTTY::CLI::Commands::PathSet < HTTY::CLI::Command
 
-  include HTTY::CLI::UrlEscaping
+  extend HTTY::CLI::UrlEscaping
 
   # Returns the name of a category under which help for the _path-set_ command
   # should appear.
@@ -44,11 +36,19 @@ class HTTY::CLI::Commands::PathSet < HTTY::CLI::Command
     [HTTY::CLI::Commands::Address]
   end
 
+  def self.sanitize_arguments(arguments)
+    path = arguments[0]
+    path_components = path.split('/')
+    escaped_components = escape_or_warn_of_escape_sequences(path_components)
+    escaped_path = escaped_components.join('/')
+    [escaped_path]
+  end
+
   # Performs the _path-set_ command.
   def perform
     add_request_if_new do |request|
       self.class.notify_if_cookies_cleared request do
-        request.path_set(*escape_or_warn_of_escape_sequences(arguments))
+        request.path_set(arguments[0])
       end
     end
   end

data/lib/htty/cli/commands/port_set.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__}/scheme_set")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _port-set_ command.
 class HTTY::CLI::Commands::PortSet < HTTY::CLI::Command

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

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

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

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

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

@@ -1,16 +1,4 @@
-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__}/query_remove")
-require File.expand_path("#{File.dirname __FILE__}/query_set")
-require File.expand_path("#{File.dirname __FILE__}/query_unset")
-require File.expand_path("#{File.dirname __FILE__}/query_unset_all")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _query-add_ command.
 class HTTY::CLI::Commands::QueryAdd < HTTY::CLI::Command

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

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

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

@@ -1,16 +1,4 @@
-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__}/query_add")
-require File.expand_path("#{File.dirname __FILE__}/query_set")
-require File.expand_path("#{File.dirname __FILE__}/query_unset")
-require File.expand_path("#{File.dirname __FILE__}/query_unset_all")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _query-remove_ command.
 class HTTY::CLI::Commands::QueryRemove < HTTY::CLI::Command

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

@@ -1,16 +1,4 @@
-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__}/query_add")
-require File.expand_path("#{File.dirname __FILE__}/query_remove")
-require File.expand_path("#{File.dirname __FILE__}/query_unset")
-require File.expand_path("#{File.dirname __FILE__}/query_unset_all")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _query-set_ command.
 class HTTY::CLI::Commands::QuerySet < HTTY::CLI::Command

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

@@ -1,16 +1,4 @@
-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__}/query_add")
-require File.expand_path("#{File.dirname __FILE__}/query_remove")
-require File.expand_path("#{File.dirname __FILE__}/query_set")
-require File.expand_path("#{File.dirname __FILE__}/query_unset_all")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _query-unset_ command.
 class HTTY::CLI::Commands::QueryUnset < HTTY::CLI::Command

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

@@ -1,13 +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__}/query_set")
-require File.expand_path("#{File.dirname __FILE__}/query_unset")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _query-unset-all_ command.
 class HTTY::CLI::Commands::QueryUnsetAll < HTTY::CLI::Command

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

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

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

@@ -1,13 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../display")
-require File.expand_path("#{File.dirname __FILE__}/history")
-require File.expand_path("#{File.dirname __FILE__}/history_verbose")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _reuse_ command.
 class HTTY::CLI::Commands::Reuse < HTTY::CLI::Command
@@ -69,8 +60,10 @@ class HTTY::CLI::Commands::Reuse < HTTY::CLI::Command
       end
     end
 
-    add_request_if_new do
-      requests[index - 1].send :dup_without_response
+    add_request_if_new do |request|
+      session.requests.pop if request.response.nil?
+
+      requests[index - 1].send(:dup_without_response)
     end
 
     puts notice("Using a copy of request ##{index}")

data/lib/htty/cli/commands/scheme_set.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__}/port_set")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _scheme-set_ command.
 class HTTY::CLI::Commands::SchemeSet < HTTY::CLI::Command

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

@@ -1,14 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../preferences")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../display")
-require File.expand_path("#{File.dirname __FILE__}/ssl_verification_off")
-require File.expand_path("#{File.dirname __FILE__}/ssl_verification_on")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _ssl-verification_ command.
 class HTTY::CLI::Commands::SslVerification < HTTY::CLI::Command

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

@@ -1,13 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../preferences")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/ssl_verification")
-require File.expand_path("#{File.dirname __FILE__}/ssl_verification_on")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _ssl-verification-off_ command.
 class HTTY::CLI::Commands::SslVerificationOff < HTTY::CLI::Command

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

@@ -1,13 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../preferences")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/ssl_verification")
-require File.expand_path("#{File.dirname __FILE__}/ssl_verification_off")
-
-module HTTY; end
-
-class HTTY::CLI; end
-
-module HTTY::CLI::Commands; end
+require 'htty'
 
 # Encapsulates the _ssl-verification-on_ command.
 class HTTY::CLI::Commands::SslVerificationOn < HTTY::CLI::Command

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

@@ -1,14 +1,4 @@
-require File.expand_path("#{File.dirname __FILE__}/../../response")
-require File.expand_path("#{File.dirname __FILE__}/../command")
-require File.expand_path("#{File.dirname __FILE__}/../display")
-require File.expand_path("#{File.dirname __FILE__}/body_response")
-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 _status_ command.
 class HTTY::CLI::Commands::Status < HTTY::CLI::Command

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

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