sanford 0.6.3 → 0.6.4

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
+*.log
 *.rbc
+.rbx/
 .bundle
 .config
 .yardoc
@@ -15,5 +17,3 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-log/*.output
-.pid

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in sanford.gemspec
 gemspec
 
-gem 'bson_ext'
-gem 'rake',     '~>0.9.2'
+gem 'rake'
+gem 'pry'
+
+gem 'bson_ext', '~>1.7'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 jcredding
+Copyright (c) 2012-Present Collin Redding and Kelly Redding
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,8 +1,8 @@
 # Sanford
 
-Sanford: simple hosts for Sanford services.  Define hosts for versioned services.  Setup handlers for the services.  Run the host as a daemon.
+Sanford TCP protocol server for hosting services.  Define hosts for versioned services.  Setup handlers for the services.  Run the host as a daemon.
 
-Sanford uses [Sanford::Protocol](https://github.com/redding/sanford-protocol) to communicate with clients.
+Sanford uses [Sanford::Protocol](https://github.com/redding/sanford-protocol) to communicate with clients.  Check out [AndSon](https://github.com/redding/and-son) for a Ruby Sanford protocol client.
 
 ## Usage
 

data/Rakefile

@@ -1,3 +1,2 @@
 require "bundler/gem_tasks"
-
 require 'bench/tasks'

data/bin/sanford

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2013 Collin Redding & Kelly Redding
+# Copyright (c) 2012 Collin Redding & Kelly Redding
 #
 
 require 'sanford/cli'

data/lib/sanford/cli.rb

@@ -96,27 +96,32 @@ module Sanford
       def run!(daemonize = false)
         daemonize!(true) if daemonize
         Sanford::Server.new(@host, @server_options).tap do |server|
-          log "Starting server for #{@host.name}"
+          log "Starting #{@host.name} server..."
 
           server.listen(*@config.listen_args)
+          $0 = ProcessName.new(@host.name, server.ip, server.port)
           log "Listening on #{server.ip}:#{server.port}"
-          log "PID: #{Process.pid}"
 
-          $0 = ProcessName.new(@host.name, server.ip, server.port)
           @config.pid_file.write
+          log "PID: #{Process.pid}"
 
           Signal.trap("TERM"){ self.stop!(server) }
           Signal.trap("INT"){  self.halt!(server) }
           Signal.trap("USR2"){ self.restart!(server) }
 
-          server.run(@config.client_file_descriptors).join
+          server_thread = server.run(@config.client_file_descriptors)
+          log "#{@host.name} server started and ready."
+          server_thread.join
         end
+      rescue RuntimeError => err
+        log "Error: #{err.message}"
+        log "#{@host.name} server never started."
       ensure
         @config.pid_file.remove
       end
 
       def restart!(server)
-        log "Restarting the server..."
+        log "Restarting #{@host.name} server..."
         server.pause
         log "server paused"
 
@@ -124,21 +129,21 @@ module Sanford
         ENV['SANFORD_SERVER_FD']   = server.file_descriptor.to_s
         ENV['SANFORD_CLIENT_FDS']  = server.client_file_descriptors.join(',')
 
-        @logger.info "calling exec ..."
+        log "calling exec ..."
         Dir.chdir @restart_cmd.dir
         Kernel.exec(*@restart_cmd.argv)
       end
 
       def stop!(server)
-        log "Stopping the server..."
+        log "Stopping #{@host.name} server..."
         server.stop
-        log "Done"
+        log "#{@host.name} server stopped."
       end
 
       def halt!(server)
-        log "Halting the server..."
+        log "Halting #{@host.name} server..."
         server.halt false
-        log "Done"
+        log "#{@host.name} server halted."
       end
 
       # Full explanation: http://www.steve.org.uk/Reference/Unix/faq_2.html#SEC16
@@ -232,8 +237,10 @@ module Sanford
     end
 
     class PIDFile
+      DEF_FILE = '/dev/null'
+
       def initialize(path)
-        @path = (path || '/dev/null').to_s
+        @path = (path || DEF_FILE).to_s
       end
 
       def pid
@@ -242,7 +249,13 @@ module Sanford
       end
 
       def write
-        File.open(@path, 'w'){|f| f.puts Process.pid }
+        begin
+          File.open(@path, 'w'){|f| f.puts Process.pid }
+        rescue Errno::ENOENT => err
+          e = RuntimeError.new("Can't write pid to file `#{@path}`")
+          e.set_backtrace(err.backtrace)
+          raise e
+        end
       end
 
       def remove

data/lib/sanford/host_data.rb

@@ -11,6 +11,7 @@ module Sanford
 
     # NOTE: The `name` attribute shouldn't be removed, it is used to identify
     # a `HostData`, particularly in error handlers
+
     attr_reader :name, :logger, :verbose, :keep_alive, :runner, :error_procs
 
     def initialize(service_host, options = nil)

data/lib/sanford/server.rb

@@ -25,6 +25,7 @@ module Sanford
     # communication, we have all the information we need to send up front and
     # are closing the connection, so it doesn't need to buffer.
     # See http://linux.die.net/man/7/tcp
+
     def configure_tcp_server(tcp_server)
       tcp_server.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)
     end
@@ -37,6 +38,7 @@ module Sanford
     # a new instance of the handler for every request.
     # When using TCP_CORK, you "cork" the socket, handle it and then "uncork"
     # it, see the `TCPCork` module for more info.
+
     def serve(socket)
       TCPCork.apply(socket)
       connection = Connection.new(socket)
@@ -88,6 +90,7 @@ module Sanford
       # to HTTP, it doesn't receive sporadic packets, it has all it's data
       # come in at once.
       # For more information: http://baus.net/on-tcp_cork
+
       if RUBY_PLATFORM =~ /linux/
         # 3 == TCP_CORK
         def self.apply(socket)

data/lib/sanford/service_handler.rb

@@ -52,17 +52,10 @@ module Sanford
 
     protected
 
-    def before_init
-    end
-
-    def after_init
-    end
-
-    def before_run
-    end
-
-    def after_run
-    end
+    def before_init; end
+    def after_init;  end
+    def before_run;  end
+    def after_run;   end
 
     # Helpers
 
@@ -70,21 +63,10 @@ module Sanford
       handler_class.run(params || {}, self.logger)
     end
 
-    def halt(*args)
-      @sanford_runner.halt(*args)
-    end
-
-    def request
-      @sanford_runner.request
-    end
-
-    def params
-      self.request.params
-    end
-
-    def logger
-      @sanford_runner.logger
-    end
+    def halt(*args); @sanford_runner.halt(*args); end
+    def request;     @sanford_runner.request;     end
+    def params;      self.request.params;         end
+    def logger;      @sanford_runner.logger;      end
 
     def run_callback(callback)
       self.send(callback.to_s)

data/lib/sanford/test_runner.rb

@@ -19,6 +19,7 @@ module Sanford
     # we override the `run` method because the TestRunner wants to control
     # storing any generated response. If `init` generated a response, we don't
     # want to `run` at all.
+
     def run
       @response ||= build_response catch_halt{ @handler.run }
     end

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/sanford/worker.rb

@@ -9,7 +9,9 @@ module Sanford
 
   class Worker
 
-    ProcessedService = Struct.new(:request, :handler_class, :response, :exception, :time_taken)
+    ProcessedService = Struct.new(*[
+      :request, :handler_class, :response, :exception, :time_taken
+    ])
 
     attr_reader :logger
 

data/lib/sanford.rb

@@ -1,15 +1,13 @@
-module Sanford; end
-
 require 'ns-options'
 require 'pathname'
 require 'set'
 
+require 'sanford/version'
 require 'sanford/host'
 require 'sanford/logger'
 require 'sanford/runner'
 require 'sanford/server'
 require 'sanford/service_handler'
-require 'sanford/version'
 
 ENV['SANFORD_SERVICES_FILE'] ||= 'config/services'
 

data/sanford.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Sanford::VERSION
   gem.authors       = ["Collin Redding", "Kelly Redding"]
   gem.email         = ["collin.redding@me.com", "kelly@kellyredding.com"]
-  gem.description   = "Simple hosts for Sanford services."
-  gem.summary       = "Simple hosts for Sanford services."
+  gem.description   = "Sanford TCP protocol server for hosting services"
+  gem.summary       = "Sanford TCP protocol server for hosting services"
   gem.homepage      = "https://github.com/redding/sanford"
 
   gem.files         = `git ls-files`.split($/)

data/test/helper.rb

@@ -1,11 +1,16 @@
-ENV['SANFORD_PROTOCOL_DEBUG'] = 'yes'
+# this file is automatically required when you run `assert`
+# put any test helpers here
 
-require 'ostruct'
+# add the root dir to the load path
+$LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
-ROOT = File.expand_path('../..', __FILE__)
+require 'pry' # require pry for debugging (`binding.pry`)
+require 'assert-mocha' if defined?(Assert)
 
-require 'sanford'
+ENV['SANFORD_PROTOCOL_DEBUG'] = 'yes'
 
+require 'sanford'
+ROOT = File.expand_path('../..', __FILE__)
 Sanford.configure do |config|
   config.services_file = File.join(ROOT, 'test/support/services')
 end
@@ -15,7 +20,3 @@ require 'test/support/fake_connection'
 require 'test/support/service_handlers'
 require 'test/support/simple_client'
 require 'test/support/helpers'
-
-if defined?(Assert)
-  require 'assert-mocha'
-end

data/test/support/helpers.rb

@@ -1,5 +1,4 @@
 module Test
-
   module SpawnServerHelper
 
     def start_server(host, &block)
@@ -15,5 +14,4 @@ module Test
     end
 
   end
-
 end

data/test/system/{request_handling_test.rb → request_handling_tests.rb}

@@ -1,11 +1,10 @@
-# These tests are intended as a high level test against Sanford's server. They
-# use fake and real connections to test how Sanford behaves.
-
 require 'assert'
-
 require 'sanford-protocol/test/fake_socket'
 
-class RequestHandlingTest < Assert::Context
+# These tests are intended as a high level test against Sanford's server. They
+# use fake and real connections to test how Sanford behaves.
+
+class RequestHandlingTests < Assert::Context
   desc "Sanford's handling of requests"
   setup do
     @env_sanford_protocol_debug = ENV['SANFORD_PROTOCOL_DEBUG']
@@ -18,13 +17,13 @@ class RequestHandlingTest < Assert::Context
     ENV['SANFORD_PROTOCOL_DEBUG'] = @env_sanford_protocol_debug
   end
 
-  class FakeConnectionTest < RequestHandlingTest
+  class FakeConnectionTests < RequestHandlingTests
     setup do
       @host_data = Sanford::HostData.new(TestHost)
     end
   end
 
-  class EchoTest < FakeConnectionTest
+  class EchoTests < FakeConnectionTests
     desc "running a request for the echo server"
     setup do
       @connection = FakeConnection.with_request('v1', 'echo', { :message => 'test' })
@@ -48,7 +47,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class MissingServiceVersionTest < FakeConnectionTest
+  class MissingServiceVersionTests < FakeConnectionTests
     desc "running a request with no service version"
     setup do
       request_hash = Sanford::Protocol::Request.new('v1', 'what', {}).to_hash
@@ -71,7 +70,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class MissingServiceNameTest < FakeConnectionTest
+  class MissingServiceNameTests < FakeConnectionTests
     desc "running a request with no service name"
     setup do
       request_hash = Sanford::Protocol::Request.new('v1', 'what', {}).to_hash
@@ -94,7 +93,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class NotFoundServiceTest < FakeConnectionTest
+  class NotFoundServiceTests < FakeConnectionTests
     desc "running a request with no matching service name"
     setup do
       @connection = FakeConnection.with_request('v1', 'what', {})
@@ -114,7 +113,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class ErrorServiceTest < FakeConnectionTest
+  class ErrorServiceTests < FakeConnectionTests
     desc "running a request that errors on the server"
     setup do
       @connection = FakeConnection.with_request('v1', 'bad', {})
@@ -134,7 +133,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class HaltTest < FakeConnectionTest
+  class HaltTests < FakeConnectionTests
     desc "running a request that halts"
     setup do
       @connection = FakeConnection.with_request('v1', 'halt_it', {})
@@ -152,7 +151,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class AuthorizeRequestTest < FakeConnectionTest
+  class AuthorizeRequestTests < FakeConnectionTests
     desc "running a request that halts in a callback"
     setup do
       @connection = FakeConnection.with_request('v1', 'authorized', {})
@@ -170,7 +169,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class WithCustomErrorHandlerTest < FakeConnectionTest
+  class WithCustomErrorHandlerTests < FakeConnectionTests
     desc "running a request that triggers our custom error handler"
     setup do
       @connection = FakeConnection.with_request('v1', 'custom_error', {})
@@ -188,7 +187,7 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class WithBadResponseHashTest < FakeConnectionTest
+  class WithBadResponseHashTests < FakeConnectionTests
     desc "running a request that builds an object that can't be encoded"
     setup do
       @connection = FakeConnection.with_request('v1', 'echo', { :message => 'cant encode' }, true)
@@ -213,7 +212,7 @@ class RequestHandlingTest < Assert::Context
     end
   end
 
-  class WithAKeepAliveTest < FakeConnectionTest
+  class WithAKeepAliveTests < FakeConnectionTests
     desc "receiving a keep-alive connection"
     setup do
       @server = Sanford::Server.new(TestHost, {
@@ -238,12 +237,12 @@ class RequestHandlingTest < Assert::Context
 
   end
 
-  class ForkedServerTest < RequestHandlingTest
+  class ForkedServerTests < RequestHandlingTests
     include Test::SpawnServerHelper
   end
 
   # Simple service test that echos back the params sent to it
-  class EchoServerTest < ForkedServerTest
+  class EchoServerTests < ForkedServerTests
     desc "when hitting an echo service"
 
     should "return a successful response and echo the params sent to it" do
@@ -260,7 +259,7 @@ class RequestHandlingTest < Assert::Context
   end
 
   # Sending the server a completely wrong stream of bytes
-  class BadMessageTest < ForkedServerTest
+  class BadMessageTests < ForkedServerTests
     desc "when sent a invalid request stream"
 
     should "return a bad request response with an error message" do
@@ -276,7 +275,7 @@ class RequestHandlingTest < Assert::Context
   end
 
   # Sending the server a protocol version that doesn't match it's version
-  class WrongProtocolVersionTest < ForkedServerTest
+  class WrongProtocolVersionTests < ForkedServerTests
     desc "when sent a request with a wrong protocol version"
 
     should "return a bad request response with an error message" do
@@ -292,7 +291,7 @@ class RequestHandlingTest < Assert::Context
   end
 
   # Sending the server a body that it can't parse
-  class BadBodyTest < ForkedServerTest
+  class BadBodyTests < ForkedServerTests
     desc "when sent a request with an invalid body"
 
     should "return a bad request response with an error message" do
@@ -306,7 +305,7 @@ class RequestHandlingTest < Assert::Context
     end
   end
 
-  class HangingRequestTest < ForkedServerTest
+  class HangingRequestTests < ForkedServerTests
     desc "when a client connects but doesn't send anything for to long"
     setup do
       ENV['SANFORD_TIMEOUT'] = '0.1'

data/test/unit/{config_test.rb → config_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 module Sanford::Config
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Config"
     subject{ Sanford::Config }
 

data/test/unit/{error_handler_test.rb → error_handler_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 class Sanford::ErrorHandler
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::ErrorHandler"
     setup do
       @exception = RuntimeError.new('test')
@@ -28,7 +28,7 @@ class Sanford::ErrorHandler
 
   end
 
-  class ResponseFromProcTest < BaseTest
+  class ResponseFromProcTests < BaseTests
     desc "generating a respone from an error proc"
     setup do
       @host_defaults = { :ip => "localhost", :port => 8000 }
@@ -94,7 +94,7 @@ class Sanford::ErrorHandler
 
   end
 
-  class ResponseFromExceptionTest < BaseTest
+  class ResponseFromExceptionTests < BaseTests
     desc "generating a respone from an exception"
 
     should "build a 400 response with a protocol BadMessageError" do
@@ -130,7 +130,7 @@ class Sanford::ErrorHandler
 
   end
 
-  class MultipleErrorProcsTest < ResponseFromProcTest
+  class MultipleErrorProcsTests < ResponseFromProcTests
     desc "with multiple error procs"
     setup do
       @first_called, @second_called, @third_called = nil, nil, nil

data/test/unit/{host_configuration_test.rb → host_configuration_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 class Sanford::Host::Configuration
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Host::Configuration"
     setup do
       @configuration = Sanford::Host::Configuration.new(EmptyHost.instance)

data/test/unit/{host_data_test.rb → host_data_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 class Sanford::HostData
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::HostData"
     setup do
       TestHost.init_has_been_called = false

data/test/unit/{host_test.rb → host_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 module Sanford::Host
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Host"
     setup do
       @configuration = MyHost.configuration.to_hash
@@ -31,7 +31,7 @@ module Sanford::Host
 
   end
 
-  class ClassMethodsTest < Assert::Context
+  class ClassMethodsTests < Assert::Context
     desc "Sanford::Host class"
     subject{ MyHost }
 

data/test/unit/{host_version_group_test.rb → host_version_group_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 class Sanford::Host::VersionGroup
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Host::VersionGroup"
     setup do
       @version_group = Sanford::Host::VersionGroup.new('v1'){ }

data/test/unit/{hosts_test.rb → hosts_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 class Sanford::Hosts
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::hosts"
     setup do
       @hosts = Sanford::Hosts.new
@@ -13,7 +13,7 @@ class Sanford::Hosts
 
   end
 
-  class FindTest < BaseTest
+  class FindTests < BaseTests
     desc "find"
     setup do
       @hosts.add ::NotNamedHost

data/test/unit/manager_pid_file_tests.rb

@@ -0,0 +1,60 @@
+require 'assert'
+require 'sanford/cli'
+
+class Sanford::Manager::PIDFile
+
+  class BaseTests < Assert::Context
+    desc "Sanford::Manager::PIDFile"
+    setup do
+      @pid_file_path = File.join(ROOT, "tmp/my.pid")
+      @pid_file = Sanford::Manager::PIDFile.new(@pid_file_path)
+    end
+    teardown do
+      FileUtils.rm_rf(@pid_file_path)
+    end
+    subject{ @pid_file }
+
+    should have_instance_methods :pid, :to_s, :write, :remove
+
+    should "return it's path with #to_s" do
+      assert_equal @pid_file_path, subject.to_s
+    end
+
+    should "write the pid file with #write" do
+      subject.write
+
+      assert_file_exists @pid_file_path
+      assert_equal "#{Process.pid}\n", File.read(@pid_file_path)
+    end
+
+    should "return the value stored in the pid value with #pid" do
+      subject.write
+
+      assert_equal Process.pid, subject.pid
+    end
+
+    should "remove the file with #remove" do
+      subject.write
+      subject.remove
+
+      assert_not File.exists?(@pid_file_path)
+    end
+
+    should "complain nicely if it can't write the pid file" do
+      pid_file_path = 'does/not/exist.pid'
+      pid_file = Sanford::Manager::PIDFile.new(pid_file_path)
+
+      err = nil
+      begin
+        pid_file.write
+      rescue Exception => err
+      end
+
+      assert err
+      assert_kind_of RuntimeError, err
+      assert_includes File.dirname(pid_file_path), err.message
+    end
+
+  end
+
+end

data/test/unit/{manager_test.rb → manager_tests.rb}

@@ -1,10 +1,9 @@
 require 'assert'
-
 require 'sanford/cli'
 
 module Sanford::Manager
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Manager"
     subject{ Sanford::Manager }
 
@@ -19,7 +18,7 @@ module Sanford::Manager
 
   end
 
-  class ServerHandlerTest < BaseTest
+  class ServerHandlerTests < BaseTests
     desc "ServerHandler"
     setup do
       @handler = Sanford::Manager::ServerHandler.new({ :host => 'TestHost' })
@@ -42,7 +41,7 @@ module Sanford::Manager
 
   end
 
-  class SignalHandlertest < BaseTest
+  class SignalHandlertests < BaseTests
     desc "SignalHandler"
     setup do
       @handler = Sanford::Manager::SignalHandler.new({ :pid => -1 })
@@ -58,7 +57,7 @@ module Sanford::Manager
     end
   end
 
-  class ConfigTest < BaseTest
+  class ConfigTests < BaseTests
     desc "Config"
     setup do
       @config = Sanford::Manager::Config.new({ :host => 'TestHost' })
@@ -115,7 +114,7 @@ module Sanford::Manager
 
   end
 
-  class EnvVarsTest < ConfigTest
+  class EnvVarsTests < ConfigTests
     desc "with env vars set"
     setup do
       ENV['SANFORD_HOST'] = 'TestHost'

data/test/unit/{runner_test.rb → runner_tests.rb}

@@ -2,7 +2,7 @@ require 'assert'
 
 module Sanford::Runner
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Runner"
     setup do
       request = Sanford::Protocol::Request.new('v1', 'test', {})

data/test/unit/{server_test.rb → server_tests.rb}

@@ -1,10 +1,9 @@
 require 'assert'
-
 require 'sanford/server'
 
 class Sanford::Server
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     desc "Sanford::Server"
     setup do
       @server = Sanford::Server.new(TestHost, { :keep_alive => true })
@@ -26,7 +25,7 @@ class Sanford::Server
 
   end
 
-  class RunTest < BaseTest
+  class RunTests < BaseTests
     desc "run"
     setup do
       @server.listen(TestHost.ip, TestHost.port)

data/test/unit/{service_handler_test.rb → service_handler_tests.rb}

@@ -1,10 +1,9 @@
 require 'assert'
-
 require 'sanford/test_runner'
 
 module Sanford::ServiceHandler
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     include Sanford::TestRunner::Helpers
 
     desc "Sanford::ServiceHandler"
@@ -31,7 +30,7 @@ module Sanford::ServiceHandler
 
   end
 
-  class RunHandlerTest < BaseTest
+  class RunHandlerTests < BaseTests
     desc "run_handler helper"
 
     should "allow easily running another handler" do
@@ -40,7 +39,7 @@ module Sanford::ServiceHandler
     end
   end
 
-  class WithMethodFlagsTest < BaseTest
+  class WithMethodFlagsTests < BaseTests
     setup do
       @handler = test_runner(FlagServiceHandler).handler
     end
@@ -67,7 +66,7 @@ module Sanford::ServiceHandler
 
   end
 
-  class HaltTest < BaseTest
+  class HaltTests < BaseTests
     desc "halt"
 
     should "return a response with the status code and the passed data" do
@@ -96,7 +95,7 @@ module Sanford::ServiceHandler
 
   end
 
-  class HaltingTest < BaseTest
+  class HaltingTests < BaseTests
     desc "halting at different points"
 
     should "not call `init!, `after_init`, `run!` or run's callbacks when `before_init` halts" do

data/test/unit/{worker_test.rb → worker_tests.rb}

@@ -1,10 +1,9 @@
 require 'assert'
-
 require 'sanford-protocol/test/helpers'
 
 class Sanford::Worker
 
-  class BaseTest < Assert::Context
+  class BaseTests < Assert::Context
     include Sanford::Protocol::Test::Helpers
 
     desc "Sanford::Worker"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-15 00:00:00 Z
+date: 2013-03-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -93,7 +93,7 @@ dependencies:
   requirement: *id005
   name: assert-mocha
   type: :development
-description: Simple hosts for Sanford services.
+description: Sanford TCP protocol server for hosting services
 email: 
 - collin.redding@me.com
 - kelly@kellyredding.com
@@ -135,20 +135,21 @@ files:
 - test/support/service_handlers.rb
 - test/support/services.rb
 - test/support/simple_client.rb
-- test/system/request_handling_test.rb
-- test/unit/config_test.rb
-- test/unit/error_handler_test.rb
-- test/unit/host_configuration_test.rb
-- test/unit/host_data_test.rb
-- test/unit/host_test.rb
-- test/unit/host_version_group_test.rb
-- test/unit/hosts_test.rb
-- test/unit/manager_pid_file_test.rb
-- test/unit/manager_test.rb
-- test/unit/runner_test.rb
-- test/unit/server_test.rb
-- test/unit/service_handler_test.rb
-- test/unit/worker_test.rb
+- test/system/request_handling_tests.rb
+- test/unit/config_tests.rb
+- test/unit/error_handler_tests.rb
+- test/unit/host_configuration_tests.rb
+- test/unit/host_data_tests.rb
+- test/unit/host_tests.rb
+- test/unit/host_version_group_tests.rb
+- test/unit/hosts_tests.rb
+- test/unit/manager_pid_file_tests.rb
+- test/unit/manager_tests.rb
+- test/unit/runner_tests.rb
+- test/unit/server_tests.rb
+- test/unit/service_handler_tests.rb
+- test/unit/worker_tests.rb
+- tmp/.gitkeep
 homepage: https://github.com/redding/sanford
 licenses: []
 
@@ -181,7 +182,7 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Simple hosts for Sanford services.
+summary: Sanford TCP protocol server for hosting services
 test_files: 
 - test/helper.rb
 - test/support/fake_connection.rb
@@ -189,17 +190,17 @@ test_files:
 - test/support/service_handlers.rb
 - test/support/services.rb
 - test/support/simple_client.rb
-- test/system/request_handling_test.rb
-- test/unit/config_test.rb
-- test/unit/error_handler_test.rb
-- test/unit/host_configuration_test.rb
-- test/unit/host_data_test.rb
-- test/unit/host_test.rb
-- test/unit/host_version_group_test.rb
-- test/unit/hosts_test.rb
-- test/unit/manager_pid_file_test.rb
-- test/unit/manager_test.rb
-- test/unit/runner_test.rb
-- test/unit/server_test.rb
-- test/unit/service_handler_test.rb
-- test/unit/worker_test.rb
+- test/system/request_handling_tests.rb
+- test/unit/config_tests.rb
+- test/unit/error_handler_tests.rb
+- test/unit/host_configuration_tests.rb
+- test/unit/host_data_tests.rb
+- test/unit/host_tests.rb
+- test/unit/host_version_group_tests.rb
+- test/unit/hosts_tests.rb
+- test/unit/manager_pid_file_tests.rb
+- test/unit/manager_tests.rb
+- test/unit/runner_tests.rb
+- test/unit/server_tests.rb
+- test/unit/service_handler_tests.rb
+- test/unit/worker_tests.rb

data/test/unit/manager_pid_file_test.rb

@@ -1,45 +0,0 @@
-require 'assert'
-
-require 'sanford/cli'
-
-class Sanford::Manager::PIDFile
-
-  class BaseTest < Assert::Context
-    desc "Sanford::Manager::PIDFile"
-    setup do
-      @pid_file = Sanford::Manager::PIDFile.new("tmp/my.pid")
-    end
-    teardown do
-      FileUtils.rm_rf("tmp/my.pid")
-    end
-    subject{ @pid_file }
-
-    should have_instance_methods :pid, :to_s, :write, :remove
-
-    should "return it's path with #to_s" do
-      assert_equal "tmp/my.pid", subject.to_s
-    end
-
-    should "write the pid file with #write" do
-      subject.write
-
-      assert File.exists?("tmp/my.pid")
-      assert_equal "#{Process.pid}\n", File.read("tmp/my.pid")
-    end
-
-    should "return the value stored in the pid value with #pid" do
-      subject.write
-
-      assert_equal Process.pid, subject.pid
-    end
-
-    should "remove the file with #remove" do
-      subject.write
-      subject.remove
-
-      assert_not File.exists?("tmp/my.pid")
-    end
-
-  end
-
-end