htty 1.4.1 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b3b290d26fc218bc076d46a221d175b42e90eb80
+  data.tar.gz: 3f69157993072a96e5d052a89b847bd874ac9570
+SHA512:
+  metadata.gz: 6970d457cec829c0f55020e681d5bf898a6a74d48c7004ed0397b75ff5ddb7823a90a1c924504eebc7177ea9a9863fd75ac131d3f743ca971f135ec21cb475ff
+  data.tar.gz: 18e1e0ef5c813c95ce3be0afb08a8f8c3f7241d744964c2a0ae7dae99f919dacb02181ee5305bf945dd7e14d3e0b426f36b4e8af91fd4292b9eef434bfef1a66

data/.gitignore

@@ -1,6 +1,7 @@
 .bundle/
 .rbx
-.rvmrc
+.ruby-gemset
+.ruby-version
 .yardoc/
 *.gem
 Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -1,10 +1,28 @@
+language: ruby
 bundler_args: --without debug doc tooling
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
   - ree
-  - jruby
-  - rbx
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
+  - rbx-head
 notifications:
   irc: "irc.freenode.org#htty"
-script: "bundle exec rake"
+script: "bundle exec rake test"
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: rbx-head

data/.yardopts

@@ -1 +1 @@
---file MIT-LICENSE.markdown --file History.markdown --no-private --protected --title "htty, the HTTP TTY"
+--file History.markdown --file License.markdown --no-private --protected --title "htty, the HTTP TTY"

data/Gemfile

@@ -11,11 +11,11 @@ end
 
 group :doc do
   gem   'yard',          '~> 0', :platforms => [:ruby, :mswin, :mingw]
-  gem   'rdiscount',     '~> 1', :platforms => [:ruby, :mswin, :mingw]
+  gem   'rdiscount',             :platforms => [:ruby, :mswin, :mingw]
 end
 
 group :tooling do
-  gem   'guard-rspec',   '~> 1'
+  gem   'guard-rspec',   '~> 3'
   if RUBY_PLATFORM =~ /darwin/i
     gem 'rb-fsevent',    '~> 0',                        :require => false
   end

data/Guardfile

@@ -1,17 +1,19 @@
-guard 'rspec', :cli => '--color', :version => 2 do
-  # Run the corresponding spec (or all specs) when code changes.
-  watch( %r{^lib/(.+)\.rb$} ) do |match|
-    corresponding_specs = %W(spec/integration/#{match[1]}_spec.rb
-                             spec/unit/#{match[1]}_spec.rb)
-    existing = corresponding_specs.select do |s|
-      File.file? File.expand_path( "../#{s}", __FILE__ )
-    end
-    existing.empty? ? 'spec' : existing
+interactor :off
+
+guard :rspec, :cli => '--debug' do
+  # Run the corresponding spec(s) (or all specs) when code changes.
+  watch(%r{^lib/(.+)\.rb$}) do |match|
+    corresponding_specs = Dir["spec/{integration,unit}/#{match[1]}_spec.rb"]
+    corresponding_specs.empty? ? 'spec' : corresponding_specs
   end
 
   # Run a spec when it changes.
   watch %r{^spec/.+_spec\.rb$}
 
+  # Run all specs when the RSpec configuration changes.
+  watch('.rspec'             ) { 'spec' }
+  watch('spec/spec_helper.rb') { 'spec' }
+
   # Run all specs when the bundle changes.
-  watch( 'Gemfile.lock' ) { 'spec' }
+  watch('Gemfile.lock') { 'spec' }
 end

data/History.markdown

@@ -1,6 +1,20 @@
 Version history for the _htty_ project
 ======================================
 
+<a name="v1.5.0"></a>v1.5.0, Tue 4/01/2014
+-------------------------------------------
+
+* Added support for Ruby v1.9.3, v2.0, and v2.1 \[with help from [gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")\]
+* Added the `body-edit` command for using `$EDITOR` to manipulate the request body [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Added support for following relative URIs in _Location_ response headers [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Added support for automatically URL-encoding reserved characters such as _?_ [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Added support for automatically synchronizing userinfo and the _Authorization_ request header [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Improved support for scripting via _stdin_ [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Added support for case-insensitive editing of request headers [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Fixed a bug that mangled the prompt upon backspace [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Fixed bugs in the `query-*` commands [[gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub")]
+* Updated and refined dependencies
+
 <a name="v1.4.1"></a>v1.4.1, Wed 9/26/2012
 -------------------------------------------
 

data/{MIT-LICENSE.markdown → License.markdown}

@@ -1,7 +1,7 @@
 The MIT License
 ===============
 
-Source code for _htty_ is Copyright © 2010–2012 [Nils Jonsson](mailto:htty@nilsjonsson.com) and [contributors](http://github.com/htty/htty/contributors "htty contributors at GitHub").
+Source code for _htty_ is Copyright © 2010–2014 [Nils Jonsson](mailto:htty@nilsjonsson.com) and [contributors](http://github.com/htty/htty/contributors "htty contributors at GitHub").
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.markdown

@@ -27,21 +27,26 @@
                  |____|     |____|    / ______|
                                       \/
 
-[<img align="right" src="https://gemnasium.com/htty/htty.png" title="Gemnasium build status" />](http://gemnasium.com/htty/htty) [<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.
+[htty](http://htty.github.io) 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).
+[![Travis CI build status]](http://travis-ci.org/htty/htty          "Travis CI build status")
+[![Gemnasium build status]](http://gemnasium.com/htty/htty          "Gemnasium build status")
+[![Code Climate report]   ](http://codeclimate.com/github/htty/htty "Code Climate report")
+[![RubyGems release]      ](http://rubygems.org/gems/htty           "RubyGems release")
 
-<a name="installation"></a>Installation
-=======================================
+See what’s changed lately by reading the [project history](http://github.com/htty/htty/blob/master/History.markdown).
+
+Installation
+============
 
 It couldn’t be much easier.
 
     $ gem install htty
 
-You’ll need Ruby and RubyGems. It’s known to work well under OS X against Ruby v1.8.7 and v1.9.2.
+You’ll need Ruby and RubyGems. It’s known to work well under OS X against Ruby v1.8.7, v1.9.2, v1.9.3, v2.0, and v2.1.
 
-<a name="features"></a>Features
-===============================
+Features
+========
 
 * Intuitive, Tab-completed commands and command aliases
 * Support for familiar HTTP methods _GET_, _POST_, _PUT_, and _DELETE_, as well as _PATCH_, _HEAD_, _OPTIONS_ and _TRACE_
@@ -60,17 +65,17 @@ The things you can do with _htty_ are:
 * **Review history** — a normal and a verbose transcript of your session are available at all times (destroyed when you quit _htty_)
 * **Reuse previous requests** — you can refer to prior requests and copy them
 
-<a name="examples"></a>Examples
-===============================
+Examples
+========
 
 Here are a few annotated _htty_ session transcripts to get you started.
 
-<a name="basic-example"></a>Querying a web service
---------------------------------------------------
+Querying a web service
+----------------------
 
 This simple example shows how to explore a read-only web service with _htty_.
 
-![ESV Bible Web Service example #1](http://htty.github.com/images/esvapi1.png)
+![ESV Bible Web Service example #1](http://htty.github.io/images/esvapi1.png)
 
 You can point _htty_ at a complete or partial web URL. If you don’t supply a URL, http://0.0.0.0/ (port 80) will be used. You can vary the protocol scheme, userinfo, host, port, path, query string, and fragment as you wish.
 
@@ -80,17 +85,17 @@ The `get` command is one of seven HTTP request methods supported. A concise summ
 
 You can follow redirects using the `follow` command. No request is made until you type a request command such as `get` or `post`.
 
-![ESV Bible Web Service example #2](http://htty.github.com/images/esvapi2.png)
+![ESV Bible Web Service example #2](http://htty.github.io/images/esvapi2.png)
 
 You can tweak segments of the address at will. Here we are navigating the site’s path hierarchy, which you can do with relative as well as absolute pathspecs.
 
-![ESV Bible Web Service example #3](http://htty.github.com/images/esvapi3.png)
+![ESV Bible Web Service example #3](http://htty.github.io/images/esvapi3.png)
 
 Here we add query-string parameters. Notice that characters that require URL encoding are automatically URL-encoded (unless they are part of a URL-encoded expression).
 
 The `headers-response` and `body-response` commands reveal the details of a response.
 
-![ESV Bible Web Service example #4](http://htty.github.com/images/esvapi4.png)
+![ESV Bible Web Service example #4](http://htty.github.io/images/esvapi4.png)
 
 There was some cruft in the web service’s response (a horizontal line, a passage reference, verse numbers, a copyright stamp, and line breaks). We eliminate it by using API options provided by the web service we’re talking to.
 
@@ -98,22 +103,22 @@ We do a Julia Child maneuver and use the `address` command to change the entire
 
 Exit your session at any time by typing `quit` or hitting Ctrl-D.
 
-<a name="cookies-example"></a>Working with cookies
---------------------------------------------------
+Working with cookies
+--------------------
 
 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)
+![Google example #1](http://htty.github.io/images/google1.png)
 
 The _https://_ scheme and port 443 imply each other, just as the _http://_ scheme and port 80 imply each other. If you omit the scheme or the port, it will default to the appropriate value.
 
 Notice that when cookies are offered in a response, a bold asterisk (it looks like a cookie) appears in the response summary. The same cookie symbol appears next to the _Set-Cookie_ header when you display response headers.
 
-![Google example #2](http://htty.github.com/images/google2.png)
+![Google example #2](http://htty.github.io/images/google2.png)
 
 The `cookies-use` command copies cookies out of the response into the next request. The cookie symbol appears next to the _Cookie_ header when you display request headers.
 
-![Google example #3](http://htty.github.com/images/google3.png)
+![Google example #3](http://htty.github.io/images/google3.png)
 
 An abbreviated history is available through the `history` command. Information about requests in the history includes request method, URL, number of headers (and a cookie symbol, if cookies were sent), and the size of the body. Information about responses in the history includes response code, number of headers (and a cookie symbol, if cookies were received), and the size of the body.
 
@@ -121,8 +126,8 @@ Note that history contains only numbered HTTP request and response pairs, not a
 
 The `reuse` command makes a copy of the headers and body of an earlier request for you to build on.
 
-<a name="history-example"></a>Understanding complex HTTP conversations at a glance using history
-------------------------------------------------------------------------------------------------
+Understanding complex HTTP conversations at a glance using history
+------------------------------------------------------------------
 
 Now we’ll look at <i>htty</i>’s HTTP Basic Authentication support and learn how to display unabbreviated transcripts of _htty_ sessions.
 
@@ -148,11 +153,11 @@ Assume that we have the following Sinatra application listening on Sinatra’s d
 
 This application expects _GET_ and _POST_ requests and responds in various contrived ways.
 
-![Sinatra application example #1](http://htty.github.com/images/sinatra1.png)
+![Sinatra application example #1](http://htty.github.io/images/sinatra1.png)
 
 When you change the userinfo portion of the address, or the entire address, the appropriate HTTP Basic Authentication header is created for you automatically. Notice that characters that require URL encoding are automatically URL-encoded (unless they are part of a URL-encoded expression).
 
-When userinfo is supplied in a request, a bold mercantile symbol (_@_) appears next to the resulting _Authorization_ header when you display request headers (see below).
+When userinfo is supplied in a request, a bold mercantile symbol ( _@_ ) appears next to the resulting _Authorization_ header when you display request headers (see below).
 
 Type `body-set` to enter body data, and terminate it by entering two consecutive blank lines, or by hitting Ctrl-D. The body will only be sent for _POST_ and _PUT_ requests. The appropriate _Content-Length_ header is created for you automatically (see below).
 
@@ -163,76 +168,56 @@ Different response codes are rendered with colors that suggest their meaning:
 * Response codes between 400 and 499 appear <span style="background-color: darkred; color: white; font-weight: bold; padding: 0 0.25em 0 0.25em;">white on red</span> to indicate failure
 * Response codes between 500 and 599 appear <span style="background-color: yellow; color: black; font-weight: bold; padding: 0 0.25em 0 0.25em; text-decoration: blink;">flashing black on yellow</span> to indicate a server error
 
-![Sinatra application example #2](http://htty.github.com/images/sinatra2.png)
+![Sinatra application example #2](http://htty.github.io/images/sinatra2.png)
 
 As with the abbreviated history demonstrated earlier, verbose history shows a numbered list of requests and the responses they elicited. All information exchanged between client and server is shown.
 
-<a name="help"></a>Getting help
--------------------------------
+Getting help
+------------
 
 You can learn how to use _htty_ commands from within _htty_.
 
-![htty’s built-in help](http://htty.github.com/images/help.png)
+![htty’s built-in help](http://htty.github.io/images/help.png)
 
 The `help` command takes an optional argument of the abbreviated or full name of a command.
 
-<a name="coming-soon"></a>Coming soon
-=====================================
-
-Here are some features that are coming down the pike.
-
-<a name="forms-coming-soon"></a>Commands for streamlining web form submission
------------------------------------------------------------------------------
-
-These features will make _htty_ better at screen-scraping.
-
-Using any of the forthcoming `form` commands will clear any non-form content in the body of the request. Adding at least one URL-encoded form parameter to the request will set the _Content-Type_ header to _application/x-www-form-urlencoded_. Removing all URL-encoded form parameters will remove this header.
-
-* `form` — display all form parameters offered in the response
-* `form-fill` — prompt in turn for a value for each of the form inputs in the response
-* <code>form-add _name_ _value_</code> — add a URL-encoded form parameter for the request, using the specified name and value
-* <code>form-remove _name_</code> — remove a URL-encoded form parameter from the request, using the specified name
-* `form-remove-all` — remove all URL-encoded form parameters from the request
-
-You will also be able to pop open a browser window containing request and response bodies.
-
-<a name="custom-aliases-coming-soon"></a>Custom command aliases and shell emulation of _http-console_
------------------------------------------------------------------------------------------------------
-
-You should be able to make your own command aliases.
-
-_http-console_ has a nice command-line. We should have an _http-console_ skin for _htty_.
-
-<a name="contributing"></a>Contributing
-=======================================
+Contributing
+============
 
 Report defects and feature requests on [GitHub Issues](http://github.com/htty/htty/issues).
 
 Your patches are welcome, and you will receive attribution here for good stuff. Fork [the official _htty_ repository](http://github.com/htty/htty "htty’s ‘htty’ repository at GitHub") and send a pull request.
 
-<a name="contact"></a>News and information
-==========================================
+News and information
+====================
 
 Stay in touch with the _htty_ project by following [@get_htty](http://twitter.com/get_htty "get_htty at Twitter") on Twitter.
 
 You can also get help in the [#htty channel on Freenode](http://webchat.freenode.net/?channels=htty).
 
-<a name="credits"></a>Credits
-=============================
+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.
 
 Thanks to [contributors](http://github.com/htty/htty/contributors "htty contributors at GitHub") (in alphabetical order):
 
+* Pascal Borreli ([pborreli](http://github.com/pborreli "pborreli at GitHub"))
 * Rob Dawson (ephox-rob/[rojotek](http://github.com/rojotek "rojotek at GitHub"))
 * Bo Frederiksen ([bofrede](http://github.com/bofrede "bofrede at GitHub"))
 * Johannes Gorset ([jgorset](http://github.com/jgorset "jgorset at GitHub"))
+* Gabriele Lana ([gabrielelana](http://github.com/gabrielelana "gabrielelana at GitHub"))
 * Carson McDonald ([carsonmcdonald](http://github.com/carsonmcdonald "carsonmcdonald at GitHub"))
-* Sam X ([dtjm](http://github.com/dtjm "dtjm at GitHub"))
+* Sam Nguyen ([dtjm](http://github.com/dtjm "dtjm at GitHub"))
 * Robert Pitts ([rbxbx](http://github.com/rbxbx "rbxbx at GitHub"))
 * Matt Sanders ([nextmat](http://github.com/nextmat "nextmat at GitHub"))
 
-<a name="license"></a>License
-=============================
+License
+=======
+
+Released under the [MIT License](http://github.com/htty/htty/blob/master/License.markdown).
 
-Released under the [MIT License](http://htty.github.com/file.MIT-LICENSE.html).
+[Travis CI build status]: https://secure.travis-ci.org/htty/htty.png?branch=master
+[Gemnasium build status]: https://gemnasium.com/htty/htty.png
+[Code Climate report]:    https://codeclimate.com/github/htty/htty.png
+[RubyGems release]:       https://badge.fury.io/rb/htty.png

data/Rakefile

@@ -23,7 +23,7 @@ namespace :lib do
       if verbose?
         puts "* #{f}"
       else
-        print "\x1b[1;32m.\x1b[0m"
+        print "\e[32m.\e[0m"
       end
       command = "/usr/bin/env ruby -e 'require File.expand_path(#{f.inspect})'"
       break unless system(command)
@@ -34,7 +34,7 @@ end
 
 def define_spec_task(name, options={})
   RSpec::Core::RakeTask.new name do |t|
-    t.rspec_opts = ['--color']
+    t.rspec_opts ||= []
     unless options[:debug] == false
       begin
         require 'ruby-debug'

data/htty.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Nils Jonsson']
   s.email       = ['htty@nilsjonsson.com']
-  s.homepage    = 'http://htty.github.com'
+  s.homepage    = 'http://htty.github.io'
   s.summary     = 'The HTTP TTY'
   s.description = <<-end_description.gsub(/^\s+/, '').chomp
                   htty is a console application for interacting with web servers.
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency             'mime-types', '~> 1'
 
-  s.add_development_dependency 'rake',       '~> 0'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec',      '~> 2'
 
   s.rubyforge_project = 'htty'

data/lib/htty/cli.rb

@@ -1,7 +1,6 @@
-require 'readline'
 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/commands/quit")
+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")
@@ -18,102 +17,88 @@ 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
+    handle_version(command_line_arguments)
+    handle_help(command_line_arguments)
+    initialize_session(command_line_arguments)
   end
 
-  # Takes over stdin, stdout, and stderr to expose #session to command-line
+  # Takes over STDIN, STDOUT, and STDERR to expose #session to command-line
   # interaction.
   def run!
     say_hello
-
     catch :quit do
-      loop do
-        begin
-          unless (command = prompt_for_command)
-            $stderr.puts notice('Unrecognized command')
-            puts notice('Try typing ' +
-                        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
-            rescuing_from Exception do
-              command.perform
-            end
-          end
-        rescue Interrupt
-          puts
-          throw :quit
-        end
+      HTTY::CLI::InputDevice.new(self).commands do |command_line|
+        run_command_line(command_line)
       end
     end
-
     say_goodbye
   end
 
+  # This is something that should belong to Display
+  def line(command = '')
+     puts formatted_prompt + command
+  end
+
+  # This is something that should belong to Display
+  def formatted_prompt
+    formatted_prompt_for(@session.requests.last)
+  end
+
 private
 
-  def prompt_for_command
-    command_line = ''
-    while command_line.empty? do
-      prompt = prompt(session.requests.last)
-      print prompt
-      if (command_line = Readline.readline('', true)).nil?
-        raise Interrupt
-      end
-      if whitespace?(command_line) || repeat?(command_line)
-        Readline::HISTORY.pop
-      end
-      command_line.chomp!
-      command_line.strip!
+  def run_command_line(command_line)
+    command = HTTY::CLI::Commands.build_for command_line, :session => @session
+
+    unless command
+      STDERR.puts notice('Unrecognized command')
+      puts notice(
+        'Try typing ' + strong(HTTY::CLI::Commands::Help.command_line)
+      )
+      return
+    end
+
+    if command == :unclosed_quote
+      STDERR.puts notice('Unclosed quoted expression -- try again')
+      return
     end
-    HTTY::CLI::Commands.build_for command_line, :session => session
-  end
 
-  def register_completion_proc
-    Readline.completion_proc = proc do |input|
-      autocomplete_list = HTTY::CLI::Commands.select do |c|
-        c.complete_for? input
+    if ARGV.include?('--debug')
+      command.perform
+    else
+      rescuing_from Exception do
+        command.perform
       end
-      autocomplete_list.collect(&:raw_name)
     end
   end
 
-  def repeat?(command_line)
-    command_line == Readline::HISTORY.to_a[-2]
+  def handle_version(command_line_arguments)
+    if command_line_arguments.include?('--version')
+      puts "v#{HTTY::VERSION}"
+      exit
+    end
   end
 
-  def whitespace?(command_line)
-    command_line.strip.empty?
+  def handle_help(command_line_arguments)
+    if command_line_arguments.include?('--help')
+      HTTY::CLI::Commands::Help.new.perform
+      exit
+    end
   end
 
+  def initialize_session(command_line_arguments)
+    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
+  end
 end
 
+
+
 Dir.glob "#{File.dirname __FILE__}/cli/*.rb" do |f|
-  require File.expand_path("#{File.dirname __FILE__}/cli/" +
-                           File.basename(f, '.rb'))
+  require File.expand_path(
+    "#{File.dirname __FILE__}/cli/" + File.basename(f, '.rb')
+  )
 end