bane 0.2.0 → 0.3.0

data/test/bane/configuration_parser_test.rb

@@ -1,31 +1,33 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 require 'mocha'
 
 class ConfigurationParserTest < Test::Unit::TestCase
 
   include Bane
 
-  IRRELEVANT_BEHAVIOR = Module.new
+  IRRELEVANT_BEHAVIOR = Bane::Behaviors::CloseImmediately
+
+  def setup
+    ConfigurationParser.any_instance.stubs(:warn_about_deprecation)
+  end
 
   def test_should_map_single_port_and_server_name
-    parser = ConfigurationParser.new(3000, "CloseAfterPause")
-    assert_matches_configuration([
-            {:port => 3000, :behavior => Behaviors::CloseAfterPause}
-    ], parser)
+    expect_server_created_with :port => 3000, :behavior => Behaviors::CloseAfterPause
+
+    ConfigurationParser.new(3000, "CloseAfterPause")
   end
 
   def test_should_map_multiple_servers_given_one_starting_port
-    parser = ConfigurationParser.new(3000, "CloseImmediately", "CloseAfterPause")
-    assert_matches_configuration([
-            {:port => 3000, :behavior => Behaviors::CloseImmediately},
-            {:port => 3001, :behavior => Behaviors::CloseAfterPause}
-    ], parser)
+    expect_server_created_with :port => 3000, :behavior => Behaviors::CloseImmediately
+    expect_server_created_with :port => 3001, :behavior => Behaviors::CloseAfterPause
+
+    ConfigurationParser.new(3000, "CloseImmediately", "CloseAfterPause")
   end
 
   def test_should_map_string_port
-    parser = Bane::ConfigurationParser.new("3000", IRRELEVANT_BEHAVIOR)
-    actual = parser.configurations[0]
-    assert_equal 3000, actual.instance_variable_get(:@port), "Should have mapped port given a String"
+    expect_server_created_with :port => 3000, :behavior => IRRELEVANT_BEHAVIOR
+    
+    Bane::ConfigurationParser.new("3000", IRRELEVANT_BEHAVIOR)
   end
 
   def test_should_raise_if_unknown_server_name
@@ -35,21 +37,20 @@ class ConfigurationParserTest < Test::Unit::TestCase
   end
 
   def test_should_map_server_when_given_class
-    parser = ConfigurationParser.new(IRRELEVANT_PORT, Behaviors::CloseAfterPause)
-    actual = parser.configurations[0]
-    assert_equal Behaviors::CloseAfterPause, actual.instance_variable_get(:@behavior), "Wrong behavior"
+    expect_server_created_with :port => anything(), :behavior => Behaviors::CloseAfterPause
+
+    ConfigurationParser.new(IRRELEVANT_PORT, Behaviors::CloseAfterPause)
   end
 
   def test_should_ask_service_registry_for_all_behaviors_if_none_specified
     fake_behavior = unique_behavior
     another_fake_behavior = unique_behavior
 
+    expect_server_created_with :port => anything(), :behavior => fake_behavior
+    expect_server_created_with :port => anything(), :behavior => another_fake_behavior
+
     ServiceRegistry.expects(:all_servers).returns([fake_behavior, another_fake_behavior])
-    parser = ConfigurationParser.new(4000)
-    assert_matches_configuration([
-            {:port => 4000, :behavior => fake_behavior},
-            {:port => 4001, :behavior => another_fake_behavior}
-    ], parser)
+    ConfigurationParser.new(4000)
   end
 
   def test_should_raise_exception_if_no_arguments
@@ -65,60 +66,46 @@ class ConfigurationParserTest < Test::Unit::TestCase
   end
 
   def test_should_map_single_hash_entry_as_port_and_behavior
-    parser = ConfigurationParser.new(
+    expect_server_created_with :port => 10256, :behavior => Behaviors::CloseAfterPause
+
+    ConfigurationParser.new(
             10256 => Behaviors::CloseAfterPause
     )
-
-    assert_matches_configuration([
-            {:port => 10256, :behavior => Behaviors::CloseAfterPause}
-    ], parser)
   end
   
   def test_should_map_multiple_hash_entries_as_port_and_behavior
-    parser = ConfigurationParser.new(
+    expect_server_created_with :port => 10256, :behavior => Behaviors::CloseAfterPause
+    expect_server_created_with :port => 6450, :behavior => Behaviors::CloseImmediately
+
+    ConfigurationParser.new(
             10256 => Behaviors::CloseAfterPause,
             6450 => Behaviors::CloseImmediately
     )
-
-    assert_matches_configuration([
-            {:port => 10256, :behavior => Behaviors::CloseAfterPause},
-            {:port => 6450, :behavior => Behaviors::CloseImmediately}
-    ], parser)
   end
 
   def test_should_map_hash_with_options
-    parser = ConfigurationParser.new(
+    expect_server_created_with :port => 10256, :behavior => Behaviors::CloseAfterPause, :options => { :duration => 3 }
+    expect_server_created_with :port => 11239, :behavior => Behaviors::CloseImmediately
+
+    ConfigurationParser.new(
             10256 => {:behavior => Behaviors::CloseAfterPause, :duration => 3},
             11239 => Behaviors::CloseImmediately
     )
-    
-    assert_matches_configuration([
-            {:port => 10256, :behavior => Behaviors::CloseAfterPause},
-            {:port => 11239, :behavior => Behaviors::CloseImmediately}
-    ], parser)
   end
 
   private
 
-  def assert_matches_configuration(expected_config, actual_config)
-    actual_elements = actual_config.configurations
-    assert_equal expected_config.size, actual_elements.size, "Did not create correct number of configurations. Actual: #{actual_elements}, expected #{expected_config}"
-
-    expected_config.each do |expected|
-      # We make no guarantee on the order of the configurations
-      assert_includes_configuration(actual_elements, expected)
-    end
-  end
-
-  def assert_includes_configuration(actual_elements, expected)
-    expected_port = expected[:port]
-    matching_config = actual_elements.detect { |actual| actual.instance_variable_get(:@port) == expected_port }
-    assert_not_nil matching_config, "Should have found a configuration with port #{expected_port}"
-    assert_equal expected[:behavior], matching_config.instance_variable_get(:@behavior), "Wrong behavior for port #{expected_port}"
+  def expect_server_created_with(arguments)
+    arguments = { :options => anything() }.merge(arguments)
+    a_behavior_instance = "an instance of #{arguments[:behavior]}.to_s"
+    behavior = arguments[:behavior]
+    behavior.expects(:new).with(arguments[:options]).returns(a_behavior_instance)
+    BehaviorServer.expects(:new).with(arguments[:port], a_behavior_instance, BehaviorServer::DEFAULT_HOST)
   end
 
+  
   def unique_behavior
-    Module.new
+    Class.new
   end
 
 end

data/test/bane/fake_connection_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 class FakeConnectionTest < Test::Unit::TestCase
 

data/test/bane/integration_test.rb

@@ -1,33 +1,34 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'net/telnet'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 require 'open-uri'
+require 'mocha'
 
 class BaneIntegrationTest < Test::Unit::TestCase
 
   TEST_PORT = 4000
 
   def test_uses_specified_port_and_server
-    run_server_with(TEST_PORT, "FixedResponse") do
-      telnet_to TEST_PORT do |response|
+    run_server_with(TEST_PORT, Bane::Behaviors::FixedResponse) do
+      connect_to TEST_PORT do |response|
         assert !response.empty?, "Should have had a non-empty response"
       end
     end
   end
 
-  def test_uses_behavior_options
+  def test_supports_deprecated_configuration
+    silence_deprecation_warning
     expected_message = "Expected test message"
     options = {TEST_PORT => {:behavior => Bane::Behaviors::FixedResponse,
                              :message => expected_message}}
 
-    run_server_with(options) do
-      telnet_to TEST_PORT do |response|
+    run_server_with_deprecated(options) do
+      connect_to TEST_PORT do |response|
         assert_equal expected_message, response, "Wrong response from server"
       end
     end
   end
 
   def test_serves_http_requests
-    run_server_with(TEST_PORT, "HttpRefuseAllCredentials") do
+    run_server_with(TEST_PORT, Bane::Behaviors::HttpRefuseAllCredentials) do
       begin
         open("http://localhost:#{TEST_PORT}/some/url").read
         flunk "Should have refused access"
@@ -35,33 +36,57 @@ class BaneIntegrationTest < Test::Unit::TestCase
         assert_match /401/, e.message
       end
     end
+  end
 
+  def test_supports_command_line_interface
+    run_server_with_cli_arguments(["--listen-on-localhost", TEST_PORT, "FixedResponse"]) do
+      connect_to TEST_PORT do |response|
+        assert !response.empty?, "Should have had a non-empty response"
+      end
+    end
   end
 
   private
 
-  def run_server_with(*options)
-    begin
-      launcher = Bane::Launcher.new(Configuration(*options), quiet_logger)
-      launcher.start
-      yield
+  def run_server_with(port, behavior, &block)
+    behavior = Bane::BehaviorServer.new(port, behavior.new)
+    launcher = Bane::Launcher.new([behavior], quiet_logger)
+    launch_and_stop_safely(launcher, &block)
+  end
+
+  def run_server_with_deprecated(*options, &block)
+    launcher = Bane::Launcher.new(Configuration(*options), quiet_logger)
+    launch_and_stop_safely(launcher, &block)
+  end
+
+  def run_server_with_cli_arguments(arguments, &block)
+    config = Bane::CommandLineConfiguration.new()
+    launcher = Bane::Launcher.new(config.parse(arguments), quiet_logger)
+    launch_and_stop_safely(launcher, &block)
+  end
+
+  def launch_and_stop_safely(launcher, &block)
+    launcher.start
+    block.call
     ensure
       launcher.stop if launcher
-    end
+      sleep 0.1 # Until we can fix the GServer stopping race condition (Issue #7)
   end
 
   def quiet_logger
     StringIO.new
   end
   
-  def telnet_to(port)
+  def connect_to(port)
     begin
-      telnet = Net::Telnet::new("Host" => "localhost",
-                                "Port" => port,
-                                "Timeout" => 5)
-      yield telnet.read
+      connection = TCPSocket.new "localhost", port
+      yield connection.read
     ensure
-      telnet.close
+      connection.close if connection
     end
   end
+
+  def silence_deprecation_warning
+    Bane::ConfigurationParser.any_instance.stubs(:warn_about_deprecation)
+  end
 end

data/test/bane/naive_http_response_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 class NaiveHttpResponseTest < Test::Unit::TestCase
 

data/test/bane/service_registry_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
 class ServiceRegistryTest < Test::Unit::TestCase
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bane
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Daniel Wellman
@@ -15,26 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -04:00
+date: 2012-08-19 00:00:00 -04:00
 default_executable: bane
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  name: rdoc
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 12
+        version: "3.12"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 5
+        version: 1.1.5
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 8
+        - 4
+        version: 1.8.4
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: mocha
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
-  type: :development
-  version_requirements: *id001
-description: "      Bane is a test harness used to test your application's interaction with\n      other servers. It is based upon the material from Michael Nygard's \"Release\n      It!\" book as described in the \"Test Harness\" chapter.\n"
+  requirement: *id004
+description: "    Bane is a test harness used to test your application's interaction with\n    other servers. It is based upon the material from Michael Nygard's \"Release\n    It!\" book as described in the \"Test Harness\" chapter.\n"
 email: dan@danielwellman.com
 executables: 
 - bane
@@ -47,26 +85,24 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - bin/bane
-- examples/simple_port_and_class_as_constant.rb
-- examples/simple_port_and_class_as_string.rb
-- examples/specify_behavior_options.rb
-- examples/specify_ports.rb
+- examples/multiple_behaviors.rb
+- examples/readme_example.rb
+- examples/single_behavior.rb
 - lib/bane.rb
+- lib/bane/behavior_server.rb
 - lib/bane/behaviors.rb
+- lib/bane/command_line_configuration.rb
 - lib/bane/compatibility.rb
-- lib/bane/configuration.rb
 - lib/bane/configuration_parser.rb
-- lib/bane/delegating_gserver.rb
 - lib/bane/launcher.rb
 - lib/bane/naive_http_response.rb
 - lib/bane/service_registry.rb
+- test/bane/behavior_server_test.rb
 - test/bane/behaviors_test.rb
+- test/bane/command_line_configuration_test.rb
 - test/bane/configuration_parser_test.rb
-- test/bane/configuration_test.rb
-- test/bane/delegating_gserver_test.rb
 - test/bane/fake_connection_test.rb
 - test/bane/integration_test.rb
-- test/bane/launcher_test.rb
 - test/bane/naive_http_response_test.rb
 - test/bane/service_registry_test.rb
 - test/test_helper.rb
@@ -75,50 +111,33 @@ files:
 - TODO
 has_rdoc: true
 homepage: http://github.com/danielwellman/bane
-licenses: []
-
+licenses: 
+- BSD
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A test harness for socket connections based upon ideas from Michael Nygard's 'Release It!'
-test_files: 
-- test/bane/behaviors_test.rb
-- test/bane/configuration_parser_test.rb
-- test/bane/configuration_test.rb
-- test/bane/delegating_gserver_test.rb
-- test/bane/fake_connection_test.rb
-- test/bane/integration_test.rb
-- test/bane/launcher_test.rb
-- test/bane/naive_http_response_test.rb
-- test/bane/service_registry_test.rb
-- test/test_helper.rb
-- examples/simple_port_and_class_as_constant.rb
-- examples/simple_port_and_class_as_string.rb
-- examples/specify_behavior_options.rb
-- examples/specify_ports.rb
+test_files: []
+