forward 0.2.1 → 0.3.0

data/lib/forward.rb

@@ -56,8 +56,9 @@ module Forward
   end
 
   def self.debug!
-    @debug       = true
-    logger.level = Logger::DEBUG
+    @logdev   = STDOUT
+    @debug    = true
+    log.level = Logger::DEBUG
   end
 
   def self.debug?
@@ -69,21 +70,22 @@ module Forward
   end
 
   def self.debug_remotely!
-    logger(stringio_log)
-    debug!
+    @logdev         = stringio_log
+    @debug          = true
     @debug_remotely = true
+    log.level       = Logger::DEBUG
   end
 
   def self.debug_remotely?
-    @debug_remotely
+    @debug_remotely ||= false
   end
 
-  def self.log(level, message)
-    logger.send(level, message) if debug?
+  def self.logdev
+    @logdev ||= '/dev/null'
   end
 
-  def self.logger(logdev = STDOUT)
-    @logger ||= Logger.new(logdev)
+  def self.log
+    @log ||= Logger.new(logdev)
   end
 
   # Returns a string representing a detailed client version.

data/lib/forward/api/resource.rb

@@ -96,7 +96,7 @@ module Forward
       end
 
       # def self.dispatch_error(error)
-      #   Forward.log(:debug, "Dispatching ResourceError:   action: #{error.action}   errors: #{error.errors.inspect}")
+      #   Forward.log.debug("Dispatching ResourceError:   action: #{error.action}   errors: #{error.errors.inspect}")
       #   method = :"#{error.action}_error"
       # 
       #   if respond_to? method
@@ -110,7 +110,7 @@ module Forward
 
       def log(level, message)
         unless self.class.to_s == 'Forward::Api::ClientLog'
-          Forward.log(level, message)
+          Forward.log.send(level.to_sym, message)
         end
       end
 

data/lib/forward/api/tunnel.rb

@@ -10,8 +10,9 @@ module Forward
           :vhost    => options[:host],
           :client   => Forward.client_string,
         }
-
-        [ :subdomain, :cname, :username, :password, :no_auth ].each do |param|
+        
+        params[:subdomain] = options[:subdomain_prefix] if options.has_key?(:subdomain_prefix)
+        [ :cname, :username, :password, :no_auth ].each do |param|
           params[param] = options[param] if options.has_key?(param)
         end
 
@@ -27,15 +28,6 @@ module Forward
         resource.get[:tunnels]
       end
 
-      def self.destroy(id)
-        resource     = Tunnel.new(:destroy)
-        resource.uri = "/api/v2/tunnels/#{id}"
-
-        resource.delete
-      rescue ResourceError => e
-        nil
-      end
-
       def self.show(id)
         resource     = Tunnel.new(:show)
         resource.uri = "/api/v2/tunnels/#{id}"
@@ -64,17 +56,17 @@ module Forward
       end
 
       def self.destroy_and_create(id, options)
-        Forward.log(:debug, "Destroying tunnel: #{id}")
+        Forward.log.debug("Destroying tunnel: #{id}")
         destroy(id)
         puts "tunnel removed, now we're creating a new one"
         create(options)
       end
 
       def self.error_on_create(error, options)
-        Forward.log(:debug, "An error occured creating tunnel:\n#{error.inspect}")
+        Forward.log.debug("An error occured creating tunnel:\n#{error.inspect}")
 
         if error.type == 'tunnel_limit_reached'
-          Forward.log(:debug, 'Tunnel limit reached')
+          Forward.log.debug('Tunnel limit reached')
           ask_to_destroy(error.api_message, options)
         elsif error.type =~ /(?:account_suspended|trial_expired)/i
           Forward::Client.cleanup_and_exit!(error.api_message)

data/lib/forward/cli.rb

@@ -1,7 +1,10 @@
 module Forward
   class CLI
-    CNAME_REGEX     = /\A[a-z0-9]+(?:[\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}\z/i
-    SUBDOMAIN_REGEX = /\A[a-z0-9]{1}[a-z0-9\-]+\z/i
+    BASIC_AUTH_REGEX       = /\A[^\s:]+:[^\s:]+\z/i
+    CNAME_REGEX            = /\A[a-z0-9]+(?:[\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}\z/i
+    SUBDOMAIN_PREFIX_REGEX = /\A[a-z0-9]{1}[a-z0-9\-]+\z/i
+    USERNAME_REGEX         = PASSWORD_REGEX = /\A[^\s]+\z/i
+
     BANNER = <<-BANNER
     Usage: forward <port> [options]
            forward <host> [options]
@@ -20,7 +23,7 @@ module Forward
       > forward 3000
         Forward created at https://4ad3f-mycompany.fwd.wf
 
-    Assigning a subdomain:
+    Assigning a subdomain prefix:
 
       > rails server &
       > forward 3000 myapp
@@ -37,22 +40,11 @@ module Forward
     BANNER
 
     # Parse non-published options and remove them from ARGV, then
-    # parse published options and update the @options Hash with provided
+    # parse published options and update the options Hash with provided
     # options and removes switches from ARGV.
-    def self.parse_options
-      Forward.log(:debug, "Parsing options")
-      @options = {
-        :host   => '127.0.0.1',
-        :port   => 80
-      }
-
-      if ARGV.include?('--debug')
-        Forward.debug!
-        ARGV.delete('--debug')
-      elsif ARGV.include?('--debug-remotely')
-        Forward.debug_remotely!
-        ARGV.delete('--debug-remotely')
-      end
+    def self.parse_cli_options
+      Forward.log.debug("Parsing options")
+      options = {}
 
       @opts = OptionParser.new do |opts|
         opts.banner = BANNER.gsub(/^ {6}/, '')
@@ -61,18 +53,18 @@ module Forward
         opts.separator 'Options:'
 
         opts.on('-a', '--auth [USER:PASS]', 'Protect this tunnel with HTTP Basic Auth.') do |credentials|
-          username, password  = parse_basic_auth(credentials)
-          @options[:username] = username
-          @options[:password] = password
+          exit_with_error("Basic Auth: bad format, expecting USER:PASS") if credentials !~ BASIC_AUTH_REGEX
+          username, password  = credentials.split(':')
+          options[:username] = username
+          options[:password] = password
         end
 
         opts.on('-A', '--no-auth', 'Disable authentication on this tunnel (if a default is set in your preferences)') do |credentials|
-          @options[:no_auth] = true
+          options[:no_auth] = true
         end
 
-        opts.on('-c', '--cname [CNAME]', 'Allow access to this tunnel as NAME.') do |cname|
-          validate_cname(cname)
-          @options[:cname] = cname
+        opts.on('-c', '--cname [CNAME]', 'Allow access to this tunnel as CNAME (you will need to setup a CNAME entry on your DNS server).') do |cname|
+          options[:cname] = cname.downcase
         end
 
         opts.on( '-h', '--help', 'Display this help.' ) do
@@ -87,20 +79,54 @@ module Forward
       end
 
       @opts.parse!
+
+      options
+    end
+
+    # Returns a String file path for PWD/Forwardfile
+    def self.forwardfile_path
+      File.join(Dir.pwd, 'Forwardfile')
     end
 
-    # Attempts to validate the basic auth credentials, if successful updates
-    # the @options Hash with given credentials.
+    # Parse arguments from CLI and options from Forwardfile
     #
-    # credentials - A String containing a username and password separated
-    #               by a colon.
+    # args - An Array of command line arguments
     #
-    # Returns an Array containing the username and password
-    def self.parse_basic_auth(credentials)
-      validate_basic_auth(credentials)
-      username, password  = credentials.split(':')
+    # Returns a Hash of options.
+    def self.parse_args_and_options(args)
+      options = {
+        :host   => '127.0.0.1',
+        :port   => 80
+      }
+
+      Forward.log.debug("Default options: `#{options.inspect}'")
+
+      if File.exist? forwardfile_path
+        options.merge!(parse_forwardfile)
+        Forward.log.debug("Forwardfile options: `#{options.inspect}'")
+      end
+
+      options.merge!(parse_cli_options)
 
-      [ username, password ]
+      forwarded, prefix = args[0..1]
+      options[:subdomain_prefix] = prefix unless prefix.nil?
+      options.merge!(parse_forwarded(forwarded))
+      Forward.log.debug("CLI options: `#{options.inspect}'")
+
+      options
+    end
+
+    # Parse a local Forwardfile (in the PWD) and return it as a Hash.
+    # Raise an error and exit if unable to parse or result isn't a Hash.
+    #
+    # Returns a Hash of the options found in the Forwardfile
+    def self.parse_forwardfile
+      options = YAML.load_file(forwardfile_path)
+      raise CLIError unless options.kind_of?(Hash)
+
+      options.symbolize_keys
+    rescue ArgumentError, SyntaxError, CLIError
+      exit_with_error("Unable to parse #{forwardfile_path}")
     end
 
     # Parses the arguments to determine if we're forwarding a port or host
@@ -110,12 +136,11 @@ module Forward
     #
     # Returns a Hash containing the forwarded host or port
     def self.parse_forwarded(arg)
-      Forward.log(:debug, "Forwarded: `#{arg}'")
+      Forward.log.debug("Forwarded: `#{arg}'")
       forwarded = {}
 
       if arg =~ /\A\d{1,5}\z/
         port = arg.to_i
-        validate_port(port)
 
         forwarded[:port] = port
       elsif arg =~ /\A[-a-z0-9\.\-]+\z/i
@@ -123,7 +148,6 @@ module Forward
       elsif arg =~ /\A[-a-z0-9\.\-]+:\d{1,5}\z/i
         host, port = arg.split(':')
         port       = port.to_i
-        validate_port(port)
 
         forwarded[:host] = host
         forwarded[:port] = port
@@ -135,89 +159,102 @@ module Forward
     # Checks to make sure the port being set is a number between 1 and 65535
     # and exits with an error message if it's not.
     #
-    # port - A String containing the port number.
+    # port - port number Integer
     def self.validate_port(port)
-      Forward.log(:debug, "Validating Port: `#{port}'")
+      Forward.log.debug("Validating Port: `#{port}'")
       unless port.between?(1, 65535)
         exit_with_error "Invalid Port: #{port} is an invalid port number"
       end
     end
 
-    # Checks to make sure the basic auth credentials are in the correct format
-    # and exits with an error message if they're not.
+    # Checks to make sure the username is a valid format
+    # and exits with an error message if not.
     #
-    # credentials - A String with the username and password for basic auth.
-    def self.validate_basic_auth(credentials)
-      Forward.log(:debug, "Validating Basic Auth: `#{credentials}'")
-      if credentials !~ /\A[^\s:]+:[^\s:]+\z/
-        exit_with_error "Basic Auth: bad format, expecting USER:PASS"
-      end
+    # username - username String
+    def self.validate_username(username)
+      Forward.log.debug("Validating Username: `#{username}'")
+      exit_with_error("`#{username}' is an invalid username format") unless username =~ USERNAME_REGEX
+    end
+
+    # Checks to make sure the password is a valid format
+    # and exits with an error message if not.
+    #
+    # password - password String
+    def self.validate_password(password)
+      Forward.log.debug("Validating Password: `#{password}'")
+      exit_with_error("`#{password}' is an invalid password format") unless password =~ PASSWORD_REGEX
     end
 
     # Checks to make sure the cname is in the correct format and exits with an
     # error message if it isn't.
     #
-    # cname - A String containing the cname.
+    # cname - cname String
     def self.validate_cname(cname)
-      Forward.log(:debug, "Validating CNAME: `#{cname}'")
+      Forward.log.debug("Validating CNAME: `#{cname}'")
       exit_with_error("`#{cname}' is an invalid domain format") unless cname =~ CNAME_REGEX
     end
 
-    # Validates the subdomain and returns a Hash containing it.
+    # Checks to make sure the subdomain prefix is in the correct format 
+    # and exits with an error message if it isn't.
     #
-    # subdomain - A String containing the subdomain.
-    #
-    # Returns a Hash containing the subdomain
-    def self.parse_subdomain(subdomain)
-      validate_subdomain(subdomain)
-      { :subdomain => subdomain }
+    # prefix - subdomain prefix String
+    def self.validate_subdomain_prefix(prefix)
+      Forward.log.debug("Validating Subdomain Prefix: `#{prefix}'")
+      exit_with_error("`#{prefix}' is an invalid subdomain prefix format") unless prefix =~ SUBDOMAIN_PREFIX_REGEX
     end
 
-    # Checks to make sure the subdomain is in the correct format and exits with an
-    # error message if it isn't.
+    # Validate all options in options Hash.
     #
-    # cname - A String containing the subdomain.
-    def self.validate_subdomain(subdomain)
-      Forward.log(:debug, "Validating Subdomain: `#{subdomain}'")
-      exit_with_error("`#{subdomain}' is an invalid subdomain format") unless subdomain =~ SUBDOMAIN_REGEX
-    end
-
-    def self.validate_options
-      Forward.log(:debug, "Validating options: `#{@options.inspect}'")
+    # options - the options Hash
+    def self.validate_options(options)
+      Forward.log.debug("Validating options: `#{options.inspect}'")
+      options.each do |key, value|
+        next if value.nil?
+        validate_method = :"validate_#{key}"
+        send(validate_method, value) if respond_to?(validate_method)
+      end
     end
 
     # Asks for the user's email and password and puts them in a Hash.
     #
-    # Returns a Hash with the email and password.
+    # Returns a Hash with the email and password
     def self.authenticate
       puts 'Enter your email and password'
       email    = ask('email: ').chomp
       password = ask('password: ') { |q| q.echo = false }.chomp
-      Forward.log(:debug, "Authenticating User: `#{email}:#{password.gsub(/./, 'x')}'")
+      Forward.log.debug("Authenticating User: `#{email}:#{password.gsub(/./, 'x')}'")
 
       { :email => email, :password => password }
     end
 
-    # Parses various options and arguments, validates everything to ensure 
-    # we're safe to proceed, and finally passes @options to the Client.
+    # Parses various options and arguments, validates everything to ensure
+    # we're safe to proceed, and finally passes options to the Client.
     def self.run(args)
-      Forward.log(:debug, "Starting forward v#{Forward::VERSION}")
-      parse_options
-      @options.merge!(parse_forwarded(args[0]))
-      @options.merge!(parse_subdomain(args[1])) if args.length > 1
-      validate_options
+      ::HighLine.use_color = false if Forward::Config.windows?
+      if ARGV.include?('--debug')
+        Forward.debug!
+        ARGV.delete('--debug')
+      elsif ARGV.include?('--rdebug')
+        Forward.debug_remotely!
+        ARGV.delete('--rdebug')
+      end
+
+      Forward.log.debug("Starting forward v#{Forward::VERSION}")
+
+      options = parse_args_and_options(args)
 
-      print_usage_and_exit if args.empty?
+      validate_options(options)
+      print_usage_and_exit if args.empty? && !File.exist?(forwardfile_path)
 
-      Client.start(@options)
+      Client.start(options)
     end
 
     # Colors an error message red and displays it.
     #
-    # message - A String containing an error message.
+    # message - error message String
     def self.exit_with_error(message)
-      Forward.log(:fatal, message)
-      puts "\033[31m#{message}\033[0m"
+      Forward.log.fatal(message)
+      puts HighLine.color(message, :red)
       exit 1
     end
 

data/lib/forward/client.rb

@@ -15,14 +15,14 @@ module Forward
 
    # Sets up a Tunnel instance and adds it to the Client.
     def setup_tunnel
-      Forward.log(:debug, 'Setting up tunnel')
+      Forward.log.debug('Setting up tunnel')
       @tunnel = Forward::Tunnel.new(self.options)
       if @tunnel.id
         @tunnel.poll_status
       else
         Forward::Client.cleanup_and_exit!('Unable to create a tunnel. If this continues contact support@forwardhq.com')
       end
-      Forward.log(:debug, "Tunnel setup: #{@tunnel.inspect}")
+      Forward.log.debug("Tunnel setup: #{@tunnel.inspect}")
 
       @tunnel
     end
@@ -50,10 +50,10 @@ module Forward
     end
 
     def self.forwarding_message(tunnel)
-      remote = "\033[04mhttps://#{@tunnel.subdomain}.fwd.wf\033[0m"
+      remote = HighLine.color("https://#{@tunnel.subdomain}.fwd.wf", :underline)
 
       unless tunnel.cname.nil? || tunnel.cname.empty?
-        remote << " and \033[04mhttp://#{@tunnel.cname}\033[0m"
+        remote << ' and '<< HighLine.color("http://#{@tunnel.cname}", :underline)
       end
 
       if !tunnel.vhost.nil? && tunnel.vhost !~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
@@ -67,25 +67,24 @@ module Forward
     end
 
     def self.start(options = {})
-      Forward.log(:debug, 'Starting client')
+      Forward.log.debug('Starting client')
       trap(:INT) { cleanup_and_exit!('closing tunnel and exiting...') }
 
       Forward.client = @client = Client.new(options)
       @tunnel        = @client.setup_tunnel
       @session       = Net::SSH.start(@tunnel.tunneler, Forward.ssh_user, @client.ssh_options)
 
-      Forward.log(:debug, "Starting remote forward at #{@tunnel.subdomain}.fwd.wf")
-      # puts "Forwarding port #{@tunnel.hostport} at \033[04mhttps://#{@tunnel.subdomain}.fwd.wf\033[0m\nCtrl-C to stop forwarding"
+      Forward.log.debug("Starting remote forward at #{@tunnel.subdomain}.fwd.wf")
       puts forwarding_message(@tunnel)
 
       @session.forward.remote(@tunnel.hostport, @tunnel.host, @tunnel.port)
       @session.loop { watch_session(@session) }
 
     rescue Net::SSH::AuthenticationFailed => e
-      Forward.log(:fatal, "SSH Auth failed `#{e}'")
+      Forward.log.fatal("SSH Auth failed `#{e}'")
       cleanup_and_exit!("Authentication failed, try deleting `#{Forward::Config.config_path}' and giving it another go. If the problem continues, contact support@forwardhq.com")
     rescue => e
-      Forward.log(:fatal, "#{e.message}\n#{e.backtrace.join("\n")}")
+      Forward.log.fatal("#{e.message}\n#{e.backtrace.join("\n")}")
       cleanup_and_exit!("You've been disconnected...")
     end
 
@@ -93,13 +92,8 @@ module Forward
       puts message.chomp
 
       @session.close if @session && !@session.closed?
-      if @client && @client.tunnel && @client.tunnel.id
-        Forward.log(:debug, "Cleaning up tunnel: `#{@client.tunnel.id}'")
-        @client.tunnel.cleanup
-        @client.tunnel = nil
-      end
 
-      Forward.log(:debug, 'Exiting')
+      Forward.log.debug('Exiting')
       send_debug_log if Forward.debug_remotely?
     ensure
       Thread.main.exit

data/lib/forward/config.rb

@@ -25,7 +25,7 @@ module Forward
     #
     # Returns the updated Config object.
     def update(attributes)
-      Forward.log(:debug, 'Updating Config')
+      Forward.log.debug('Updating Config')
       attributes.each do |key, value|
         self.send(:"#{key}=", value)
       end
@@ -43,7 +43,7 @@ module Forward
     # Validate that the required values are in the Config.
     # Raises a config error if values are missing.
     def validate
-      Forward.log(:debug, 'Validating Config')
+      Forward.log.debug('Validating Config')
       attributes = [:api_token, :private_key]
       errors = []
 
@@ -65,7 +65,7 @@ module Forward
     #
     # Returns the Config object.
     def write
-      Forward.log(:debug, 'Writing Config')
+      Forward.log.debug('Writing Config')
       key_folder  = File.dirname(Config.key_path)
       config_data = to_hash.delete_if { |k,v| !CONFIG_FILE_VALUES.include?(k) }
 
@@ -141,7 +141,7 @@ module Forward
     #
     # Returns the new Config object.
     def self.create
-      Forward.log(:debug, 'Creating Config')
+      Forward.log.debug('Creating Config')
       if @updating_config || ask('Already have an account with Forward? ').chomp =~ /\Ay/i
         config             = Config.new
         email, password    = CLI.authenticate.values_at(:email, :password)
@@ -151,7 +151,9 @@ module Forward
 
         config.write
       else
-        Client.cleanup_and_exit!("You'll need a Forward account first. You can create one at \033[04mhttps://forwardhq.com\033[0m")
+        message = "You'll need a Forward account first. You can create one at "
+        message << HighLine.color('https://forwardhq.com', :underline)
+        Client.cleanup_and_exit!(message)
       end
     end
 
@@ -161,7 +163,7 @@ module Forward
     #
     # Returns the Config object.
     def self.load
-      Forward.log(:debug, 'Loading Config')
+      Forward.log.debug('Loading Config')
       config = Config.new
 
       raise ConfigError, "Unable to find a forward config file at `#{config_path}'" unless Config.present?

data/lib/forward/error.rb

@@ -1,6 +1,8 @@
 module Forward
 	# An error occurred with the API
 	class ApiError < StandardError; end
+	# An error occurred with the CLI
+	class CLIError < StandardError; end
 	# An error occurred with the Client
 	class ClientError < StandardError; end
 	# An error occurred with the Config

data/lib/forward/tunnel.rb

@@ -45,11 +45,11 @@ module Forward
       Thread.new {
         loop do
           if @timeout && !@timeout.zero? && @inactive_for > @timeout
-            Forward.log(:debug, "Session closing due to inactivity `#{@inactive_for}' seconds")
+            Forward.log.debug("Session closing due to inactivity `#{@inactive_for}' seconds")
             Client.cleanup_and_exit!("Tunnel has been inactive for #{@inactive_for} seconds, exiting...")
           elsif Forward::Api::Tunnel.show(@id).nil?
             Client.current.tunnel = nil
-            Forward.log(:debug, "Tunnel destroyed, closing session")
+            Forward.log.debug("Tunnel destroyed, closing session")
             Client.cleanup_and_exit!
           else
             sleep CHECK_INTERVAL
@@ -59,11 +59,7 @@ module Forward
         end
       }
     end
-
-    def cleanup
-      Forward::Api::Tunnel.destroy(@id) if @id
-    end
-
+    
     def active?
       @active
     end

data/lib/forward/version.rb

@@ -1,3 +1,3 @@
 module Forward
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/test/api/tunnel_test.rb

@@ -87,24 +87,4 @@ describe Forward::Api::Tunnel do
      dev_null { Forward::Api::Tunnel.create(:port => 3000) }
    end
 
-   it 'destroys a tunnel and returns the attributes' do
-     fake_body = { :_id => '1', :subdomain => 'foo', :port => 56789 }
-
-     stub_api_request(:delete, '/api/v2/tunnels/1', :body => fake_body.to_json)
-
-     response = Forward::Api::Tunnel.destroy(1)
-
-     fake_body.each do |key, value|
-       response[key].must_equal fake_body[key]
-     end
-   end
-
-   it 'gracefully handles the error if destroy has errors' do
-     fake_body = { :type => 'api_error' }
-
-     stub_api_request(:delete, '/api/v2/tunnels/1', :body => fake_body.to_json, :status => [ 422, 'Unprocessable Entity' ])
-
-     Forward::Api::Tunnel.destroy(1).must_be_nil
-   end
-
 end

data/test/cli_test.rb

@@ -22,23 +22,55 @@ describe Forward::CLI do
     forwarded[:port].must_equal 88
   end
 
-  it 'parses valid basic auth and returns username and password' do
-    username = 'foo'
-    password = 'bar'
+  it 'exits if username is invalid' do
+    [ 'foo ', ' asdfasdf ', 'fooo bar' ].each do |username|
+      lambda {
+        dev_null { Forward::CLI.validate_username(username) }
+      }.must_raise SystemExit
+    end
+  end
 
-    credentials = Forward::CLI.parse_basic_auth("#{username}:#{password}")
-    credentials.first.must_equal username
-    credentials.last.must_equal password
+  it 'validates a good username' do
+    [ 'foo', 'asdflkj3r&)(#@#)', 'DF#R::#SFSDF' ].each do |username|
+      Forward::CLI.validate_username(username).must_be_nil
+    end
   end
 
-  it 'validates basic auth and exits if invalid' do
-    [ 'afadsfsdf', 'adsf:', ':bar' ].each do |credentials|
+  it 'exits if password is invalid' do
+    [ 'foo ', ' asdfasdf ', 'fooo bar' ].each do |password|
       lambda {
-        dev_null { Forward::CLI.validate_basic_auth(credentials) }
+        dev_null { Forward::CLI.validate_password(password) }
       }.must_raise SystemExit
     end
   end
 
+  it 'validates a good password' do
+    [ 'foo', 'asdflkj3r&)(#@#)', 'DF#R::#SFSDF' ].each do |password|
+      Forward::CLI.validate_password(password).must_be_nil
+    end
+  end
+
+  it 'parses a Forwardfile' do
+    yaml = YAML.dump(:auth => 'username:password')
+    File.open('Forwardfile', 'w') { |f| f.write(yaml) }
+
+    options = Forward::CLI.parse_forwardfile
+    options.has_key?(:auth).must_equal true
+  end
+
+  it 'exits if a Forwardfile does not parse to a Hash' do
+    yaml = YAML.dump('username:password')
+    File.open('Forwardfile', 'w') { |f| f.write(yaml) }
+
+    lambda {
+      dev_null { Forward::CLI.parse_forwardfile }
+    }.must_raise SystemExit
+  end
+
+  it 'overloads Forwardfile options via commandline' do
+    flunk
+  end
+
   it 'doesnt exit on valid ports' do
     Forward::CLI.validate_port(69).must_be_nil
     Forward::CLI.validate_port(3000).must_be_nil
@@ -67,16 +99,16 @@ describe Forward::CLI do
     end
   end
 
-  it 'doesnt exit on valid subdomains' do
+  it 'doesnt exit on valid subdomains prefix' do
     [ 'foo', 'whatever-foo', 'asdf40' ].each do |subdomain|
-      Forward::CLI.validate_subdomain(subdomain).must_be_nil
+      Forward::CLI.validate_subdomain_prefix(subdomain).must_be_nil
     end
   end
 
-  it 'validates subdomain and exits if invalid' do
+  it 'validates subdomain prefix and exits if invalid' do
     [ '-asdf', 'adsf#$)' ].each do |subdomain|
       lambda {
-        dev_null { Forward::CLI.validate_subdomain(subdomain) }
+        dev_null { Forward::CLI.validate_subdomain_prefix(subdomain) }
       }.must_raise SystemExit
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forward
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json