htty 1.1.4 → 1.1.5

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

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

@@ -52,6 +52,7 @@ private
                            'Building Requests',
                            'Issuing Requests',
                            'Inspecting Responses',
+                           'Preferences',
                            nil]
     HTTY::CLI::Commands.select do |c|
       # Filter out commands not yet implemented.
@@ -60,7 +61,7 @@ private
        c.alias_for.instance_methods.collect(&:to_sym).include?(:perform))
     end.group_by(&:category).sort_by do |category, commands|
       # Group commands by category and give the categories a custom order.
-      categories_in_order.index category
+      categories_in_order.index(category) || 0
     end.each do |category, commands|
       category ||= 'Miscellaneous'
       puts

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

@@ -0,0 +1,57 @@
+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
+
+# Encapsulates the _ssl-verification_ command.
+class HTTY::CLI::Commands::SslVerification < HTTY::CLI::Command
+
+  include HTTY::CLI::Display
+
+  # Returns the name of a category under which help for the _ssl-verification_
+  # command should appear.
+  def self.category
+    'Preferences'
+  end
+
+  # Returns the help text for the _ssl-verification_ command.
+  def self.help
+    'Displays the preference for SSL certificate verification'
+  end
+
+  # Returns the extended help text for the _ssl-verification_ command.
+  def self.help_extended
+    'Displays the preference for SSL certificate verification. Does not ' +
+    "communicate with the host.\n"                                        +
+    "\n"                                                                  +
+    'When issuing HTTP Secure requests, server certificates will be '     +
+    'verified. You can disable and reenable this behavior.'
+  end
+
+  # Returns related command classes for the _ssl-verification_ command.
+  def self.see_also_commands
+    [HTTY::CLI::Commands::SslVerificationOff,
+     HTTY::CLI::Commands::SslVerificationOn]
+  end
+
+  # Performs the _ssl-verification_ command.
+  def perform
+    unless arguments.empty?
+      raise ArgumentError,
+            "wrong number of arguments (#{arguments.length} for 0)"
+    end
+
+    will_or_not = HTTY::Preferences.current.verify_certificates? ?
+                  'will'                                         :
+                  'will not'
+    puts notice("SSL certificates #{will_or_not} be verified")
+  end
+
+end

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

@@ -0,0 +1,42 @@
+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
+
+# Encapsulates the _ssl-verification-off_ command.
+class HTTY::CLI::Commands::SslVerificationOff < HTTY::CLI::Command
+
+  # Returns the name of a category under which help for the
+  # _ssl-verification-off_ command should appear.
+  def self.category
+    'Preferences'
+  end
+
+  # Returns the help text for the _ssl-verification-off_ command.
+  def self.help
+    'Disables SSL certificate verification'
+  end
+
+  # Returns the extended help text for the _ssl-verification-off_ command.
+  def self.help_extended
+    'Disables SSL certificate verification. Does not communicate with the host.'
+  end
+
+  # Returns related command classes for the _ssl-verification-off_ command.
+  def self.see_also_commands
+    [HTTY::CLI::Commands::SslVerificationOn,
+     HTTY::CLI::Commands::SslVerification]
+  end
+
+  # Performs the _ssl-verification-off_ command.
+  def perform
+    HTTY::Preferences.current.verify_certificates = false
+  end
+
+end

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

@@ -0,0 +1,43 @@
+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
+
+# Encapsulates the _ssl-verification-on_ command.
+class HTTY::CLI::Commands::SslVerificationOn < HTTY::CLI::Command
+
+  # Returns the name of a category under which help for the
+  # _ssl-verification-on_ command should appear.
+  def self.category
+    'Preferences'
+  end
+
+  # Returns the help text for the _ssl-verification-on_ command.
+  def self.help
+    'Reenables SSL certificate verification'
+  end
+
+  # Returns the extended help text for the _ssl-verification-on_ command.
+  def self.help_extended
+    'Reenables SSL certificate verification. Does not communicate with the ' +
+    'host.'
+  end
+
+  # Returns related command classes for the _ssl-verification-on_ command.
+  def self.see_also_commands
+    [HTTY::CLI::Commands::SslVerificationOff,
+     HTTY::CLI::Commands::SslVerification]
+  end
+
+  # Performs the _ssl-verification-on_ command.
+  def perform
+    HTTY::Preferences.current.verify_certificates = true
+  end
+
+end

data/lib/htty/preferences.rb

@@ -0,0 +1,26 @@
+module HTTY; end
+
+# Encapsulates _htty_ user preferences.
+class HTTY::Preferences
+
+  # Returns the instance of HTTY::Preferences holding current preferences.
+  def self.current
+    @current ||= new
+  end
+
+  # Sets the boolean preference for whether server certificates are verified
+  # during HTTP Secure requests.
+  attr_writer :verify_certificates
+
+  # Initializes a new HTTY::Preferences object.
+  def initialize
+    @verify_certificates = true
+  end
+
+  # Returns +true+ if server certificates are verified during HTTP Secure
+  # requests.
+  def verify_certificates?
+    @verify_certificates
+  end
+
+end

data/lib/htty/request.rb

@@ -490,7 +490,8 @@ private
   end
 
   def field_matcher(name)
-    Regexp.new "^#{Regexp.escape name}=?.*"
+    escaped = Regexp.escape(name)
+    Regexp.new "^(#{escaped}|#{escaped}=.*)$"
   end
 
   def request!(method)

data/lib/htty/requests_util.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
+require File.expand_path("#{File.dirname __FILE__}/preferences")
 require File.expand_path("#{File.dirname __FILE__}/response")
 
 module HTTY; end
@@ -73,7 +74,14 @@ private
 
   def self.request(request)
     http = Net::HTTP.new(request.uri.host, request.uri.port)
-    http.use_ssl = true if request.uri.kind_of?(URI::HTTPS)
+
+    if request.uri.kind_of?(URI::HTTPS)
+      http.use_ssl = true
+      http.verify_mode = HTTY::Preferences.current.verify_certificates? ?
+                         OpenSSL::SSL::VERIFY_PEER                      :
+                         OpenSSL::SSL::VERIFY_NONE
+    end
+
     http.start do |host|
       http_response = yield(host)
       headers = []

data/spec/system/scenarios_spec.rb

@@ -14,7 +14,8 @@ Dir.glob "#{all_dir}/**/*/" do |this_dir|
       content
     end
 
-    define_method :run_and_capture do |options={}|
+    define_method :run_and_capture do |*args|
+      options = args.first || {}
       stdin_filename = "#{this_dir}/stdin"
       htty_filename = "#{File.dirname __FILE__}/../../bin/htty"
       stderr_target = options[:combine_stdout_and_stderr] ?

data/spec/unit/htty/cli/commands/query_set_spec.rb

@@ -54,9 +54,10 @@ describe HTTY::CLI::Commands::QuerySet do
     end
 
     it 'should play nice with nested fields' do
-      @session.requests.last.uri.query = 'test[my][]=true'
-      query_set = create_query_set_and_perform('test[my][]', 'false')
-      query_set.session.requests.last.uri.query.should == 'test[my][]=false'
+      @session.requests.last.uri.query = 'test[my][]=1'
+      query_set = create_query_set_and_perform('test[my][]', '2')
+      query_set = create_query_set_and_perform('test', '3')
+      query_set.session.requests.last.uri.query.should == 'test[my][]=2&test=3'
     end
   end
 

data/spec/unit/htty/preferences_spec.rb

@@ -0,0 +1,8 @@
+require 'spec'
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/preferences")
+
+describe HTTY::Preferences do
+  it 'should maintain current preferences' do
+    HTTY::Preferences.current.should be_equal(HTTY::Preferences.current)
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: htty
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -05:00
+date: 2010-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -70,6 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 6
@@ -148,6 +153,9 @@ files:
 - lib/htty/cli/commands/quit.rb
 - lib/htty/cli/commands/reuse.rb
 - lib/htty/cli/commands/scheme_set.rb
+- lib/htty/cli/commands/ssl_verification.rb
+- lib/htty/cli/commands/ssl_verification_off.rb
+- lib/htty/cli/commands/ssl_verification_on.rb
 - lib/htty/cli/commands/status.rb
 - lib/htty/cli/commands/undo.rb
 - lib/htty/cli/commands/userinfo_clear.rb
@@ -164,6 +172,7 @@ files:
 - lib/htty/no_set_cookie_header_error.rb
 - lib/htty/ordered_hash.rb
 - lib/htty/payload.rb
+- lib/htty/preferences.rb
 - lib/htty/request.rb
 - lib/htty/requests_util.rb
 - lib/htty/response.rb
@@ -181,6 +190,7 @@ files:
 - spec/unit/htty/cli/commands/query_set_spec.rb
 - spec/unit/htty/cli_spec.rb
 - spec/unit/htty/ordered_hash_spec.rb
+- spec/unit/htty/preferences_spec.rb
 - spec/unit/htty/request_spec.rb
 - spec/unit/htty/response_spec.rb
 - spec/unit/htty/session_spec.rb
@@ -200,6 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -208,6 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"