minestrone 0.0.1

data/test/extensions_test.rb

@@ -0,0 +1,69 @@
+require "utils"
+require 'minestrone'
+
+class ExtensionsTest < Test::Unit::TestCase
+  module CustomExtension
+    def do_something(command)
+      run(command)
+    end
+  end
+
+  def setup
+    @config = Minestrone::Configuration.new
+  end
+
+  def teardown
+    Minestrone::EXTENSIONS.keys.each { |e| Minestrone.remove_plugin(e) }
+  end
+
+  def test_register_plugin_should_add_instance_method_on_configuration_and_return_true
+    assert !@config.respond_to?(:custom_stuff)
+    assert Minestrone.plugin(:custom_stuff, CustomExtension)
+    assert @config.respond_to?(:custom_stuff)
+  end
+
+  def test_register_plugin_that_already_exists_should_return_false
+    assert Minestrone.plugin(:custom_stuff, CustomExtension)
+    assert !Minestrone.plugin(:custom_stuff, CustomExtension)
+  end
+
+  def test_register_plugin_with_public_method_name_should_fail
+    method = Minestrone::Configuration.public_instance_methods.first
+    assert_not_nil method, "need a public instance method for testing"
+    assert_raises(Minestrone::Error) { Minestrone.plugin(method, CustomExtension) }
+  end
+
+  def test_register_plugin_with_protected_method_name_should_fail
+    method = Minestrone::Configuration.protected_instance_methods.first
+    assert_not_nil method, "need a protected instance method for testing"
+    assert_raises(Minestrone::Error) { Minestrone.plugin(method, CustomExtension) }
+  end
+
+  def test_register_plugin_with_private_method_name_should_fail
+    method = Minestrone::Configuration.private_instance_methods.first
+    assert_not_nil method, "need a private instance method for testing"
+    assert_raises(Minestrone::Error) { Minestrone.plugin(method, CustomExtension) }
+  end
+
+  def test_unregister_plugin_that_does_not_exist_should_return_false
+    assert !Minestrone.remove_plugin(:custom_stuff)
+  end
+
+  def test_unregister_plugin_should_remove_method_and_return_true
+    assert Minestrone.plugin(:custom_stuff, CustomExtension)
+    assert @config.respond_to?(:custom_stuff)
+    assert Minestrone.remove_plugin(:custom_stuff)
+    assert !@config.respond_to?(:custom_stuff)
+  end
+
+  def test_registered_plugin_proxy_should_return_proxy_object
+    Minestrone.plugin(:custom_stuff, CustomExtension)
+    assert_instance_of Minestrone::ExtensionProxy, @config.custom_stuff
+  end
+
+  def test_proxy_object_should_delegate_to_configuration
+    Minestrone.plugin(:custom_stuff, CustomExtension)
+    @config.expects(:run).with("hello")
+    @config.custom_stuff.do_something("hello")
+  end
+end

data/test/fixtures/cli_integration.rb

@@ -0,0 +1,5 @@
+server "www.minestrone.test"
+
+task :testing do
+  set :testing_occurred, true
+end

data/test/fixtures/config.rb

@@ -0,0 +1,4 @@
+set :application, "foo"
+set :repository, "1/2/#{application}"
+
+server "www.example.com"

data/test/fixtures/custom.rb

@@ -0,0 +1,3 @@
+ConfigurationLoadingTest::MockConfig.instance(:must_exist).load do
+  ping! :custom
+end

data/test/logger_formatting_test.rb

@@ -0,0 +1,149 @@
+require File.expand_path("../utils", __FILE__)
+require 'minestrone/logger'
+require 'stringio'
+
+Minestrone::Logger.class_eval do
+  # Allows formatters to be changed during tests
+  def self.formatters=(formatters)
+    @formatters = formatters
+    @sorted_formatters = nil
+  end
+end
+
+class LoggerFormattingTest < Test::Unit::TestCase
+  def setup
+    @io = StringIO.new
+    @io.stubs(:tty?).returns(true)
+    @logger = Minestrone::Logger.new(:output => @io, :level => 3)
+  end
+
+  def test_matching_with_style_and_color
+    Minestrone::Logger.formatters = [{ :match => /^err ::/, :color => :red, :style => :underscore, :level => 0 }]
+    @logger.log(0, "err :: Error Occurred")
+    assert @io.string.include? "\e[4;31merr :: Error Occurred\e[0m"
+  end
+
+  def test_style_without_color
+    Minestrone::Logger.formatters = [{ :match => /.*/, :style => :underscore, :level => 0 }]
+    @logger.log(0, "test message")
+    # Default color should be blank (0m)
+    assert @io.string.include? "\e[4;0mtest message\e[0m"
+  end
+
+  def test_prepending_text
+    Minestrone::Logger.formatters = [{ :match => /^executing/, :level => 0, :prepend => '== Currently ' }]
+    @logger.log(0, "executing task")
+    assert @io.string.include? '== Currently executing task'
+  end
+
+  def test_replacing_matched_text
+    Minestrone::Logger.formatters = [{ :match => /^executing/, :level => 0, :replace => 'running' }]
+    @logger.log(0, "executing task")
+    assert @io.string.include? 'running task'
+  end
+
+  def test_prepending_timestamps
+    Minestrone::Logger.formatters = [{ :match => /.*/, :level => 0, :timestamp => true }]
+    @logger.log(0, "test message")
+    assert @io.string.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} test message/)
+  end
+
+  def test_formatter_priorities
+    Minestrone::Logger.formatters = [
+      { :match => /.*/, :color => :red,  :level => 0, :priority => -10 },
+      { :match => /.*/, :color => :blue, :level => 0, :priority => -20, :prepend => '###' }
+    ]
+
+    @logger.log(0, "test message")
+    # Only the red formatter (color 31) should be applied.
+    assert @io.string.include? "\e[31mtest message"
+    # The blue formatter should not have prepended $$$
+    assert !@io.string.include?('###')
+  end
+
+  def test_no_formatting_if_no_color_or_style
+    Minestrone::Logger.formatters = []
+    @logger.log(0, "test message")
+    assert @io.string.include? "*** test message"
+  end
+
+  def test_formatter_log_levels
+    Minestrone::Logger.formatters = [{ :match => /.*/, :color => :blue, :level => 3 }]
+    @logger.log(0, "test message")
+    # Should not match log level
+    assert @io.string.include? "*** test message"
+
+    clear_logger
+    @logger.log(3, "test message")
+    # Should match log level and apply blue color
+    assert @io.string.include? "\e[34mtest message"
+  end
+
+  private
+
+  def colorize(message, color, style = nil)
+    style = "#{style};" if style
+    "\e[#{style}#{color}m" + message + "\e[0m"
+  end
+
+  def clear_logger
+    @io = StringIO.new
+    @io.stubs(:tty?).returns(true)
+    @logger.device = @io
+  end
+end
+
+class DefaultLoggerFormattersTest < Test::Unit::TestCase
+  def setup
+    @expected_default_formatter_values = [
+      # TRACE
+      { :match => /command finished/,          :color => :white,   :style => :dim, :level => 3, :priority => -10 },
+      { :match => /executing locally/,         :color => :yellow,  :level => 3, :priority => -20 },
+
+      # DEBUG
+      { :match => /executing `.*/,             :color => :green,   :level => 2, :priority => -10, :timestamp => true },
+      { :match => /.*/,                        :color => :yellow,  :level => 2, :priority => -30 },
+
+      # INFO
+      { :match => /.*out\] (fatal:|ERROR:).*/, :color => :red,     :level => 1, :priority => -10 },
+      { :match => /Permission denied/,         :color => :red,     :level => 1, :priority => -20 },
+      { :match => /sh: .+: command not found/, :color => :magenta, :level => 1, :priority => -30 },
+
+      # IMPORTANT
+      { :match => /^err ::/,                   :color => :red,     :level => 0, :priority => -10 },
+      { :match => /.*/,                        :color => :blue,    :level => 0, :priority => -20 }
+    ]
+
+    @custom_default_formatter_values = [
+      { :match => /.*/,  :color => :white }
+    ]
+
+  end
+
+  def test_default_formatters_api
+    assert Minestrone::Logger.respond_to? :default_formatters
+    assert Minestrone::Logger.respond_to? :default_formatters=
+  end
+
+  def test_default_formatters_values
+    assert_equal @expected_default_formatter_values, Minestrone::Logger.default_formatters
+    assert_equal @expected_default_formatter_values, Minestrone::Logger.instance_variable_get("@formatters")
+    assert_equal nil, Minestrone::Logger.instance_variable_get("@sorted_formatters")
+  end
+
+  def test_set_default_formatters_values
+    # when given an array
+    Minestrone::Logger.default_formatters = @custom_default_formatter_values
+
+    assert_equal @custom_default_formatter_values, Minestrone::Logger.default_formatters
+    Minestrone::Logger.default_formatters = @custom_default_formatter_values
+    assert_equal @custom_default_formatter_values, Minestrone::Logger.instance_variable_get("@formatters")
+    assert_equal nil, Minestrone::Logger.instance_variable_get("@sorted_formatters")
+
+    # when given a single formatter values hash
+    Minestrone::Logger.default_formatters = @custom_default_formatter_values.first
+
+    assert_equal @custom_default_formatter_values, Minestrone::Logger.default_formatters
+  end
+
+end

data/test/logger_test.rb

@@ -0,0 +1,134 @@
+require "utils"
+require 'minestrone/logger'
+require 'stringio'
+
+class LoggerTest < Test::Unit::TestCase
+  def setup
+    @io = StringIO.new
+    # Turn off formatting for these tests. Formatting is tested in `logger_formatting_test.rb`.
+    @logger = Minestrone::Logger.new(:output => @io, :disable_formatters => true)
+  end
+
+  def test_logger_should_use_STDERR_by_default
+    logger = Minestrone::Logger.new
+    assert_equal STDERR, logger.device
+  end
+
+  def test_logger_should_have_log_level_0
+    logger = Minestrone::Logger.new
+    assert_equal 0, logger.level
+  end
+
+  def test_logger_should_use_level_form_options
+    logger = Minestrone::Logger.new :level => 4
+    assert_equal 4, logger.level
+  end
+
+  def test_logger_should_use_output_option_if_output_responds_to_puts
+    logger = Minestrone::Logger.new(:output => STDOUT)
+    assert_equal STDOUT, logger.device
+  end
+
+  def test_logger_should_open_file_if_output_does_not_respond_to_puts
+    File.expects(:open).with("logs/minestrone.log", "a").returns(:mock)
+    logger = Minestrone::Logger.new(:output => "logs/minestrone.log")
+    assert_equal :mock, logger.device
+  end
+
+  def test_close_should_not_close_device_if_device_is_default
+    logger = Minestrone::Logger.new
+    logger.device.expects(:close).never
+    logger.close
+  end
+
+  def test_close_should_not_close_device_is_device_is_explicitly_given
+    logger = Minestrone::Logger.new(:output => STDOUT)
+    STDOUT.expects(:close).never
+    logger.close
+  end
+
+  def test_close_should_close_device_when_device_was_implicitly_opened
+    f = mock("file", :close => nil)
+    File.expects(:open).with("logs/minestrone.log", "a").returns(f)
+    logger = Minestrone::Logger.new(:output => "logs/minestrone.log")
+    logger.close
+  end
+
+  def test_log_with_level_greater_than_threshold_should_ignore_message
+    @logger.level = 3
+    @logger.log(4, "message")
+    assert @io.string.empty?
+  end
+
+  def test_log_with_level_equal_to_threshold_should_log_message
+    @logger.level = 3
+    @logger.log(3, "message")
+    assert @io.string.include?("message")
+  end
+
+  def test_log_with_level_less_than_threshold_should_log_message
+    @logger.level = 3
+    @logger.log(2, "message")
+    assert @io.string.include?("message")
+  end
+
+  def test_log_with_multiline_message_should_log_each_line_separately
+    @logger.log(0, "first line\nsecond line")
+    assert @io.string.include?("*** first line")
+    assert @io.string.include?("*** second line")
+  end
+
+  def test_log_with_line_prefix_should_insert_line_prefix_before_message
+    @logger.log(0, "message", "prefix")
+    assert @io.string.include?("*** [prefix] message")
+  end
+
+  def test_log_with_level_0_should_have_strong_indent
+    @logger.log(0, "message")
+    assert @io.string.match(/^\*\*\* message/)
+  end
+
+  def test_log_with_level_1_should_have_weaker_indent
+    @logger.level = 1
+    @logger.log(1, "message")
+    assert @io.string.match(/^ \*\* message/)
+  end
+
+  def test_log_with_level_2_should_have_weaker_indent
+    @logger.level = 2
+    @logger.log(2, "message")
+    assert @io.string.match(/^  \* message/)
+  end
+
+  def test_log_with_level_3_should_have_weakest_indent
+    @logger.level = 3
+    @logger.log(3, "message")
+    assert @io.string.match(/^    message/)
+  end
+
+  def test_important_should_delegate_to_log_with_level_IMPORTANT
+    @logger.expects(:log).with(Minestrone::Logger::IMPORTANT, "message", "prefix")
+    @logger.important("message", "prefix")
+  end
+
+  def test_info_should_delegate_to_log_with_level_INFO
+    @logger.expects(:log).with(Minestrone::Logger::INFO, "message", "prefix")
+    @logger.info("message", "prefix")
+  end
+
+  def test_debug_should_delegate_to_log_with_level_DEBUG
+    @logger.expects(:log).with(Minestrone::Logger::DEBUG, "message", "prefix")
+    @logger.debug("message", "prefix")
+  end
+
+  def test_trace_should_delegate_to_log_with_level_TRACE
+    @logger.expects(:log).with(Minestrone::Logger::TRACE, "message", "prefix")
+    @logger.trace("message", "prefix")
+  end
+
+  def test_ordering_of_levels
+    assert Minestrone::Logger::IMPORTANT < Minestrone::Logger::INFO
+    assert Minestrone::Logger::INFO < Minestrone::Logger::DEBUG
+    assert Minestrone::Logger::DEBUG < Minestrone::Logger::TRACE
+  end
+end

data/test/recipes_test.rb

@@ -0,0 +1,26 @@
+require 'utils'
+require 'minestrone/configuration'
+
+class RecipesTest < Test::Unit::TestCase
+
+  def setup
+    @config = Minestrone::Configuration.new
+    @config.stubs(:logger).returns(stub_everything)
+  end
+
+  def test_current_releases_does_not_cause_error_on_dry_run
+    @config.dry_run = true
+    @config.load 'deploy'
+    @config.load do
+      server "example.com"
+      set :application, "foo"
+      task :dry_run_test do
+        fetch :current_release
+      end
+    end
+
+    assert_nothing_raised do
+      @config.dry_run_test
+    end
+  end
+end

data/test/server_definition_test.rb

@@ -0,0 +1,121 @@
+require "utils"
+require 'minestrone/server_definition'
+
+class ServerDefinitionTest < Test::Unit::TestCase
+  def test_new_without_credentials_or_port_should_set_values_to_defaults
+    server = Minestrone::ServerDefinition.new("www.minestrone.test")
+    assert_equal "www.minestrone.test", server.host
+    assert_nil   server.user
+    assert_nil   server.port
+  end
+
+  def test_new_with_encoded_user_should_extract_user_and_use_default_port
+    server = Minestrone::ServerDefinition.new("jamis@www.minestrone.test")
+    assert_equal "www.minestrone.test", server.host
+    assert_equal "jamis", server.user
+    assert_nil   server.port
+  end
+
+  def test_new_with_encoded_port_should_extract_port_and_use_default_user
+    server = Minestrone::ServerDefinition.new("www.minestrone.test:8080")
+    assert_equal "www.minestrone.test", server.host
+    assert_nil   server.user
+    assert_equal 8080, server.port
+  end
+
+  def test_new_with_encoded_user_and_port_should_extract_user_and_port
+    server = Minestrone::ServerDefinition.new("jamis@www.minestrone.test:8080")
+    assert_equal "www.minestrone.test", server.host
+    assert_equal "jamis", server.user
+    assert_equal 8080, server.port
+  end
+
+  def test_new_with_user_as_option_should_use_given_user
+    server = Minestrone::ServerDefinition.new("www.minestrone.test", :user => "jamis")
+    assert_equal "www.minestrone.test", server.host
+    assert_equal "jamis", server.user
+    assert_nil   server.port
+  end
+
+  def test_new_with_port_as_option_should_use_given_user
+    server = Minestrone::ServerDefinition.new("www.minestrone.test", :port => 8080)
+    assert_equal "www.minestrone.test", server.host
+    assert_nil   server.user
+    assert_equal 8080, server.port
+  end
+
+  def test_encoded_value_should_override_hash_option
+    server = Minestrone::ServerDefinition.new("jamis@www.minestrone.test:8080", :user => "david", :port => 8081)
+    assert_equal "www.minestrone.test", server.host
+    assert_equal "jamis", server.user
+    assert_equal 8080, server.port
+    assert server.options.empty?
+  end
+
+  def test_new_with_option_should_dup_option_hash
+    options = {}
+    server = Minestrone::ServerDefinition.new("www.minestrone.test", options)
+    assert_not_equal options.object_id, server.options.object_id
+  end
+
+  def test_new_with_options_should_keep_options
+    server = Minestrone::ServerDefinition.new("www.minestrone.test", :ssh_options => { :forward_agent => true })
+    assert_equal({ :forward_agent => true }, server.options[:ssh_options])
+  end
+
+  def test_default_user_should_try_to_guess_username
+    ENV.stubs(:[]).returns(nil)
+    assert_equal "not-specified", Minestrone::ServerDefinition.default_user
+
+    ENV.stubs(:[]).returns(nil)
+    ENV.stubs(:[]).with("USERNAME").returns("ryan")
+    assert_equal "ryan", Minestrone::ServerDefinition.default_user
+
+    ENV.stubs(:[]).returns(nil)
+    ENV.stubs(:[]).with("USER").returns("jamis")
+    assert_equal "jamis", Minestrone::ServerDefinition.default_user
+  end
+
+  def test_comparison_should_match_when_host_user_port_are_same
+    s1 = server("jamis@www.minestrone.test:8080")
+    s2 = server("www.minestrone.test", :user => "jamis", :port => 8080)
+    assert_equal s1, s2
+    assert_equal s1.hash, s2.hash
+    assert s1.eql?(s2)
+  end
+
+  def test_servers_should_be_comparable
+    s1 = server("jamis@www.minestrone.test:8080")
+    s2 = server("www.alphabet.test:1234")
+    s3 = server("jamis@www.minestrone.test:8075")
+    s4 = server("billy@www.minestrone.test:8080")
+
+    assert s2 < s1
+    assert s3 < s1
+    assert s4 < s1
+    assert s2 < s3
+    assert s2 < s4
+    assert s3 < s4
+  end
+
+  def test_comparison_should_not_match_when_any_of_host_user_port_differ
+    s1 = server("jamis@www.minestrone.test:8080")
+    s2 = server("bob@www.minestrone.test:8080")
+    s3 = server("jamis@www.minestrone.test:8081")
+    s4 = server("jamis@app.minestrone.test:8080")
+    assert_not_equal s1, s2
+    assert_not_equal s1, s3
+    assert_not_equal s1, s4
+    assert_not_equal s2, s3
+    assert_not_equal s2, s4
+    assert_not_equal s3, s4
+  end
+
+  def test_to_s
+    assert_equal "www.minestrone.test", server("www.minestrone.test").to_s
+    assert_equal "www.minestrone.test", server("www.minestrone.test:22").to_s
+    assert_equal "www.minestrone.test:1234", server("www.minestrone.test:1234").to_s
+    assert_equal "jamis@www.minestrone.test", server("jamis@www.minestrone.test").to_s
+    assert_equal "jamis@www.minestrone.test:1234", server("jamis@www.minestrone.test:1234").to_s
+  end
+end

data/test/ssh_test.rb

@@ -0,0 +1,99 @@
+require "utils"
+require 'minestrone/ssh'
+
+class SSHTest < Test::Unit::TestCase
+  def setup
+    Minestrone::ServerDefinition.stubs(:default_user).returns("default-user")
+    @options = { :auth_methods => %w(publickey),
+                 :config => false }
+    @server = server("minestrone")
+    Net::SSH.stubs(:configuration_for).returns({})
+  end
+
+  def test_connect_with_bare_server_without_options_or_config_with_public_key_succeeding_should_only_loop_once
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server)
+  end
+
+  def test_connect_with_bare_server_without_options_with_public_key_failing_should_raise_error
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options).raises(Net::SSH::AuthenticationFailed)
+    assert_raises(Net::SSH::AuthenticationFailed) do
+      Minestrone::SSH.connect(@server, :password => "f4b13n")
+    end
+  end
+
+  def test_connect_with_bare_server_and_user_via_public_key_should_pass_user_to_net_ssh
+    Net::SSH.expects(:start).with(@server.host, "jamis", @options).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :user => "jamis")
+  end
+
+  def test_connect_with_bare_server_with_explicit_port_should_pass_port_to_net_ssh
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:port => 1234)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :port => 1234)
+  end
+
+  def test_connect_with_server_with_user_should_pass_user_to_net_ssh
+    server = server("jamis@minestrone")
+    Net::SSH.expects(:start).with(server.host, "jamis", @options).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(server)
+  end
+
+  def test_connect_with_server_with_port_should_pass_port_to_net_ssh
+    server = server("minestrone:1235")
+    Net::SSH.expects(:start).with(server.host, "default-user", @options.merge(:port => 1235)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(server)
+  end
+
+  def test_connect_with_server_with_user_and_port_should_pass_user_and_port_to_net_ssh
+    server = server("jamis@minestrone:1235")
+    Net::SSH.expects(:start).with(server.host, "jamis", @options.merge(:port => 1235)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(server)
+  end
+
+  def test_connect_with_server_with_other_ssh_options_should_pass_ssh_options_to_net_ssh
+    server = server("jamis@minestrone:1235", :ssh_options => { :keys => %w(some_valid_key), :hmac => 'none' })
+    Net::SSH.expects(:start).with(server.host, "jamis", @options.merge(:port => 1235, :keys => %w(some_valid_key), :hmac => 'none' )).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(server)
+  end
+
+  def test_connect_with_ssh_options_should_use_ssh_options
+    ssh_options = { :username => "JamisMan", :port => 8125, :config => false }
+    Net::SSH.expects(:start).with(@server.host, "JamisMan", @options.merge(:port => 8125, :config => false)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, {:ssh_options => ssh_options})
+  end
+
+  def test_connect_with_options_and_ssh_options_should_see_options_override_ssh_options
+    ssh_options = { :username => "JamisMan", :port => 8125, :forward_agent => true }
+    Net::SSH.expects(:start).with(@server.host, "jamis", @options.merge(:port => 1235, :forward_agent => true)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :ssh_options => ssh_options, :user => "jamis", :port => 1235)
+  end
+
+  def test_connect_with_verbose_option_should_set_verbose_option_on_ssh
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :verbose => 0)
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:verbose => :debug)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :verbose => 1)
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:verbose => :debug)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :verbose => 2)
+  end
+
+  def test_connect_with_ssh_options_should_see_server_options_override_ssh_options
+    ssh_options = { :username => "JamisMan", :port => 8125, :forward_agent => true }
+    server = server("jamis@minestrone:1235")
+    Net::SSH.expects(:start).with(server.host, "jamis", @options.merge(:port => 1235, :forward_agent => true, :config => false)).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(server, {:ssh_options => ssh_options})
+  end
+
+  def test_connect_should_add_xserver_accessor_to_connection
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server)
+    assert success.respond_to?(:xserver)
+    assert success.respond_to?(:xserver)
+    assert_equal success.xserver, @server
+  end
+
+  def test_connect_should_ignore_custom_auth_methods
+    Net::SSH.expects(:start).with(@server.host, "default-user", @options).returns(success = Object.new)
+    assert_equal success, Minestrone::SSH.connect(@server, :ssh_options => { :auth_methods => %w(password keyboard-interactive) })
+  end
+end