htty 1.3.3 → 1.3.4

data/.gitignore

@@ -5,4 +5,3 @@
 Gemfile.lock
 doc/
 pkg/*
-spec/system/scenarios/**/actual_*

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - jruby
+  - rbx
+script: "bundle exec rake test"
+notifications:
+  irc: "irc.freenode.org#htty"

data/Gemfile

@@ -2,7 +2,17 @@ source 'http://rubygems.org'
 
 gemspec
 
+gem 'jruby-openssl',          :platforms => :jruby
+
 group :development do
-  gem 'ruby-debug',   '~> 0.2',  :platforms => 'ruby_18'
-  gem 'ruby-debug19', '~> 0.11', :platforms => 'ruby_19'
+  gem 'ruby-debug',           :platforms => :mri_18
+
+  # This is a dependency of ruby-debug. We're specifying it here because its
+  # v0.45 is incompatible with Ruby v1.8.7.
+  gem 'linecache', '<= 0.43', :platforms => :mri_18
+
+  gem 'ruby-debug19',         :platforms => :mri_19
+
+  gem 'yard',                 :platforms => [:ruby, :mswin, :mingw]
+  gem 'rdiscount',            :platforms => [:ruby, :mswin, :mingw]
 end

data/History.markdown

@@ -1,6 +1,12 @@
 Version history for the _htty_ project
 ======================================
 
+<a name="v1.3.4"></a>v1.3.4, Mon 10/17/2011
+-------------------------------------------
+
+* Added support for Ctrl-D to exit and to terminate `body-set` command input \[with help from [[bofrede](http://github.com/bofrede "bofrede at GitHub")]\]
+* Added `--version` and `--help` command-line arguments
+
 <a name="v1.3.3"></a>v1.3.3, Sat 3/05/2011
 -------------------------------------------
 
@@ -34,12 +40,12 @@ Version history for the _htty_ project
 -------------------------------------------
 
 * Added support for Tab-key completion of user input [[carsonmcdonald](http://github.com/carsonmcdonald "carsonmcdonald at GitHub")]
-* Enhanced the `query-unset` command to accept an optional _value_ argument [[mattsa](http://github.com/mattsa "mattsa at GitHub")]
+* Enhanced the `query-unset` command to accept an optional _value_ argument [[nextmat](http://github.com/nextmat "nextmat at GitHub")]
 
 <a name="v1.1.6"></a>v1.1.6, Mon 11/22/2010
 -------------------------------------------
 
-* Added the `query-add` and `query-remove` commands [[mattsa](http://github.com/mattsa "mattsa at GitHub")]:
+* Added the `query-add` and `query-remove` commands [[nextmat](http://github.com/nextmat "nextmat at GitHub")]:
 * Added context-sensitive help in connection with server certificate verification
 * Upgraded various dependencies
 
@@ -47,13 +53,13 @@ Version history for the _htty_ project
 -------------------------------------------
 
 * Added the `ssl-verification*` commands for controlling the verification of server certificates [[dtjm](http://github.com/dtjm "dtjm at GitHub")]
-* Fixed a bug in the `query-set` command [[mattsa](http://github.com/mattsa "mattsa at GitHub")]
+* Fixed a bug in the `query-set` command [[nextmat](http://github.com/nextmat "nextmat at GitHub")]
 * Fixed a Ruby < v1.9 compatibility problem
 
 <a name="v1.1.4"></a>v1.1.4, Sat 10/16/2010
 -------------------------------------------
 
-* Enhanced the `query-set` command [[mattsa](http://github.com/mattsa "mattsa at GitHub")] to:
+* Enhanced the `query-set` command [[nextmat](http://github.com/nextmat "nextmat at GitHub")] to:
   - Accept an arbitrary number of arguments
   - Support valueless keys
   - Support duplicate keys

data/README.markdown

@@ -27,9 +27,9 @@
                  |____|     |____|    / ______|
                                       \/
 
-[htty](http://htty.github.com) is a console application for interacting with web servers. It’s a fun way to explore web APIs and to learn the ins and outs of HTTP.
+[<img align="right" src="https://secure.travis-ci.org/htty/htty.png?branch=master" title="Travis CI build status" />](http://travis-ci.org/htty/htty) [htty](http://htty.github.com) is a console application for interacting with web servers. It’s a fun way to explore web APIs and to learn the ins and outs of HTTP.
 
-See what’s changed lately by reading the [project history](http://htty.github.com/file.History.html). [![Flattr this](http://api.flattr.com/button/button-compact-static-100x17.png)](http://flattr.com/thing/68277/htty-the-HTTP-TTY "Flattr this")
+See what’s changed lately by reading the [project history](http://htty.github.com/file.History.html).
 
 <a name="installation"></a>Installation
 =======================================
@@ -101,7 +101,7 @@ Exit your session at any time by typing `quit`.
 <a name="cookies-example"></a>Working with cookies
 --------------------------------------------------
 
-The next example demonstrates _htty_’s HTTP Secure support and cookies features, as well as how to review and revisit past requests.
+The next example demonstrates <i>htty</i>’s HTTP Secure support and cookies features, as well as how to review and revisit past requests.
 
 ![Google example #1](http://htty.github.com/images/google1.png)
 
@@ -124,7 +124,7 @@ The `reuse` command makes a copy of the headers and body of an earlier request f
 <a name="history-example"></a>Understanding complex HTTP conversations at a glance using history
 ------------------------------------------------------------------------------------------------
 
-Now we’ll look at _htty_’s HTTP Basic Authentication support and learn how to display unabbreviated transcripts of _htty_ sessions.
+Now we’ll look at <i>htty</i>’s HTTP Basic Authentication support and learn how to display unabbreviated transcripts of _htty_ sessions.
 
 Assume that we have the following Sinatra application listening on Sinatra’s default port, 4567.
 
@@ -217,7 +217,7 @@ Stay in touch with the _htty_ project by following [@get_htty](http://twitter.co
 
 You can also get help in the [#htty channel on Freenode](http://webchat.freenode.net/?channels=htty).
 
-<a name="credits"></a>Credits [![Flattr this](http://api.flattr.com/button/button-compact-static-100x17.png)](http://flattr.com/thing/68277/htty-the-HTTP-TTY "Flattr this")
+<a name="credits"></a>Credits
 =============================
 
 The author, [Nils Jonsson](mailto:htty@nilsjonsson.com), owes a debt of inspiration to the [_http-console_](http://github.com/cloudhead/http-console) project.
@@ -228,9 +228,9 @@ Thanks to [contributors](http://github.com/htty/htty/contributors "htty contribu
 * Bo Frederiksen ([bofrede](http://github.com/bofrede "bofrede at GitHub"))
 * Johannes Gorset ([jgorset](http://github.com/jgorset "jgorset at GitHub"))
 * Carson McDonald ([carsonmcdonald](http://github.com/carsonmcdonald "carsonmcdonald at GitHub"))
-* Sam Nguyen ([dtjm](http://github.com/dtjm "dtjm at GitHub"))
+* Sam X ([dtjm](http://github.com/dtjm "dtjm at GitHub"))
 * Robert Pitts ([rbxbx](http://github.com/rbxbx "rbxbx at GitHub"))
-* Matt Sanders ([mattsa](http://github.com/mattsa "mattsa at GitHub"))
+* Matt Sanders ([nextmat](http://github.com/nextmat "nextmat at GitHub"))
 
 <a name="license"></a>License
 =============================

data/Rakefile

@@ -1,19 +1,13 @@
+require 'bundler'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+
 begin
-  require 'bundler'
+  require 'yard'
 rescue LoadError
 else
-  Bundler::GemHelper.install_tasks
-end
-
-namespace :build do
-  begin
-    require 'yard'
-  rescue LoadError
-    desc "(Not available -- try 'gem install yard')"
-    task :doc do
-      STDERR.puts "*** 'gem install yard' in order to build documentation"
-    end
-  else
+  namespace :build do
     YARD::Rake::YardocTask.new :doc
   end
 end
@@ -40,43 +34,38 @@ namespace :lib do
   end
 end
 
-begin
-  require 'rspec/core/rake_task'
-rescue LoadError
-  desc "(Not available -- try 'gem install rspec')"
-  task :spec do
-    STDERR.puts "*** 'gem install rspec' in order to run specs"
-  end
-else
-  def define_spec_task(name, options={})
-    RSpec::Core::RakeTask.new name do |t|
-      t.rspec_opts = ['--color']
-      t.skip_bundler = options[:skip_bundler]
-      unless options[:debug] == false
+def define_spec_task(name, options={})
+  RSpec::Core::RakeTask.new name do |t|
+    t.rspec_opts = ['--color']
+    unless options[:debug] == false
+      begin
+        require 'ruby-debug'
+      rescue LoadError
+      else
         # TODO: Change '-d' to '--debug' when that `rspec` bug is fixed
         t.rspec_opts << '-d'
       end
-
-      directory = options[:as_subdirectory] ? "spec/#{name}" : 'spec'
-      t.pattern = "#{directory}/**/*_spec.rb"
     end
+
+    directory = options[:as_subdirectory] ? "spec/#{name}" : 'spec'
+    t.pattern = "#{directory}/**/*_spec.rb"
   end
+end
 
-  namespace :spec do |n|
-    %w(unit integration system).each do |type_of_spec|
-      desc "Run #{type_of_spec} specs"
-      define_spec_task type_of_spec, :as_subdirectory => true
-    end
+namespace :spec do |n|
+  %w(unit integration).each do |type_of_spec|
+    desc "Run #{type_of_spec} specs"
+    define_spec_task type_of_spec, :as_subdirectory => true
   end
+end
 
-  desc 'Run all specs'
-  define_spec_task :spec
+desc 'Run all specs'
+define_spec_task :spec
 
-  desc 'Run all specs'
-  task '' => :spec
-  task :default => :spec
+desc 'Run all specs'
+task ''       => :spec
+task :default => :spec
 
-  # Support the 'gem test' command.
-  desc ''
-  define_spec_task :test, :debug => false, :skip_bundler => true
-end
+# Support the 'gem test' command.
+desc ''
+define_spec_task :test, :debug => false

data/htty.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.8.7'
 
-  s.add_dependency 'mime-types', '~> 1.0'
+  s.add_dependency 'mime-types'
 
-  s.add_development_dependency 'rake',  '~> 0.8'
-  s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 2.7'
 
   s.rubyforge_project = 'htty'
   s.has_rdoc          = true

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

@@ -31,7 +31,7 @@ class HTTY::CLI::Commands::BodySet < HTTY::CLI::Command
     'Sets the body content used for the request. Does not communicate with ' +
     "the host.\n"                                                            +
     "\n"                                                                     +
-    'Hit Return three times in a row to signify the end of the body.'
+    'Enter two blank lines, or hit Ctrl-D, to signify the end of the body.'
   end
 
   # Returns related command classes for the _body-set_ command.
@@ -42,7 +42,8 @@ class HTTY::CLI::Commands::BodySet < HTTY::CLI::Command
   # Performs the _body-set_ command.
   def perform
     add_request_if_new do |request|
-      puts notice('Hit Return three times to signify the end of the body')
+      puts notice('Enter two blank lines, or hit Ctrl-D, to signify the end ' +
+                  'of the body')
       lines            = []
       empty_line_count = 0
       while empty_line_count < 2 do

data/lib/htty/cli.rb

@@ -4,6 +4,7 @@ require File.expand_path("#{File.dirname __FILE__}/cli/commands/help")
 require File.expand_path("#{File.dirname __FILE__}/cli/commands/quit")
 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
 
@@ -17,12 +18,23 @@ class HTTY::CLI
 
   # Instantiates a new HTTY::CLI with the specified _command_line_arguments_.
   def initialize(command_line_arguments)
+    if command_line_arguments.include?('--version')
+      puts "v#{HTTY::VERSION}"
+      exit
+    end
+
+    if command_line_arguments.include?('--help')
+      HTTY::CLI::Commands::Help.new.perform
+      exit
+    end
+
     exit unless @session = rescuing_from(ArgumentError) do
       everything_but_options = command_line_arguments.reject do |a|
         a[0..0] == '-'
       end
       HTTY::Session.new(everything_but_options.first)
     end
+
     register_completion_proc
   end
 
@@ -30,6 +42,7 @@ class HTTY::CLI
   # interaction.
   def run!
     say_hello
+
     catch :quit do
       loop do
         begin
@@ -39,10 +52,12 @@ class HTTY::CLI
                         strong(HTTY::CLI::Commands::Help.command_line))
             next
           end
+
           if command == :unclosed_quote
             $stderr.puts notice('Unclosed quoted expression -- try again')
             next
           end
+
           if ARGV.include?('--debug')
             command.perform
           else
@@ -52,13 +67,11 @@ class HTTY::CLI
           end
         rescue Interrupt
           puts
-          puts notice('Type ' +
-                      strong(HTTY::CLI::Commands::Quit.command_line) +
-                      ' to quit')
-          next
+          throw :quit
         end
       end
     end
+
     say_goodbye
   end
 

data/lib/htty/version.rb

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

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

@@ -37,7 +37,7 @@ describe HTTY::CLI::Commands::BodySet do
       expected = <<-end_help_extended
 Sets the body content used for the request. Does not communicate with the host.
 
-Hit Return three times in a row to signify the end of the body.
+Enter two blank lines, or hit Ctrl-D, to signify the end of the body.
       end_help_extended
       klass.help_extended.should == expected.chomp
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: htty
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -06:00
-default_executable: 
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -24,13 +23,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,13 +37,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 8
-        version: "0.8"
+        version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,11 +53,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 7
+        version: "2.7"
   type: :development
   version_requirements: *id003
 description: htty is a console application for interacting with web servers. It's a fun way to explore web APIs and to learn the ins and outs of HTTP.
@@ -75,6 +72,7 @@ extra_rdoc_files: []
 files: 
 - .gemtest
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - History.markdown
@@ -179,11 +177,6 @@ files:
 - spec/integration/htty/cli/commands/query_remove_spec.rb
 - spec/integration/htty/cli/commands/query_set_spec.rb
 - spec/integration/htty/cli/commands/query_unset_spec.rb
-- spec/system/scenarios/exit/expected_stdout
-- spec/system/scenarios/exit/stdin
-- spec/system/scenarios/quit/expected_stdout
-- spec/system/scenarios/quit/stdin
-- spec/system/scenarios_spec.rb
 - spec/unit/htty/cli/commands/address_spec.rb
 - spec/unit/htty/cli/commands/body_clear_spec.rb
 - spec/unit/htty/cli/commands/body_request_spec.rb
@@ -258,7 +251,6 @@ files:
 - spec/unit/htty/response_spec.rb
 - spec/unit/htty/session_spec.rb
 - spec/unit/htty/version_spec.rb
-has_rdoc: true
 homepage: http://htty.github.com
 licenses: 
 - MIT
@@ -290,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: htty
-rubygems_version: 1.6.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: The HTTP TTY
@@ -299,11 +291,6 @@ test_files:
 - spec/integration/htty/cli/commands/query_remove_spec.rb
 - spec/integration/htty/cli/commands/query_set_spec.rb
 - spec/integration/htty/cli/commands/query_unset_spec.rb
-- spec/system/scenarios/exit/expected_stdout
-- spec/system/scenarios/exit/stdin
-- spec/system/scenarios/quit/expected_stdout
-- spec/system/scenarios/quit/stdin
-- spec/system/scenarios_spec.rb
 - spec/unit/htty/cli/commands/address_spec.rb
 - spec/unit/htty/cli/commands/body_clear_spec.rb
 - spec/unit/htty/cli/commands/body_request_spec.rb
@@ -378,3 +365,4 @@ test_files:
 - spec/unit/htty/response_spec.rb
 - spec/unit/htty/session_spec.rb
 - spec/unit/htty/version_spec.rb
+has_rdoc: true

data/spec/system/scenarios/exit/expected_stdout

@@ -1,2 +0,0 @@
-*** Welcome to  htty , the HTTP TTY. Heck To The Yeah!
-*** Happy Trails To You!

data/spec/system/scenarios/exit/stdin

@@ -1 +0,0 @@
-exit

data/spec/system/scenarios/quit/expected_stdout

@@ -1,2 +0,0 @@
-*** Welcome to  htty , the HTTP TTY. Heck To The Yeah!
-*** Happy Trails To You!

data/spec/system/scenarios/quit/stdin

@@ -1 +0,0 @@
-quit

data/spec/system/scenarios_spec.rb

@@ -1,47 +0,0 @@
-require 'rspec'
-require 'pathname'
-
-all_dir = Pathname.new("#{File.dirname __FILE__}/scenarios")
-Dir.glob "#{all_dir}/**/*/" do |this_dir|
-  relative_path = Pathname.new(this_dir).relative_path_from(all_dir).to_s
-  context_name = relative_path.split('/').join(' ').gsub('_', ' ')
-  describe context_name do
-    define_method :content do |filename|
-      path = "#{this_dir}/#{filename}"
-      return nil unless File.file?(path)
-      content = File.read(path)
-      return nil if content.empty?
-      content
-    end
-
-    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] ?
-                      '&1'                                :
-                      "#{this_dir}/actual_stderr"
-      arguments = "#{content 'arguments'} 2>#{stderr_target}"
-      stdout_filename = "#{this_dir}/actual_stdout"
-      system "cat #{stdin_filename} | "         +
-             "#{htty_filename} #{arguments} > " +
-             "#{this_dir}/actual_stdout"
-    end
-
-    it 'should produce the expected stdout' do
-      run_and_capture
-      content('actual_stdout').should == content('expected_stdout')
-    end
-
-    it 'should produce the expected stderr' do
-      run_and_capture
-      content('actual_stderr').should == content('expected_stderr')
-    end
-
-    it 'should produce the expected combined stdout and stderr' do
-      run_and_capture :combine_stdout_and_stderr => true
-      content('actual_stdout_and_stderr').should ==
-      content('expected_stdout_and_stderr')
-    end
-  end
-end