sanford 0.4.0 → 0.6.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 6
   - 0
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-28 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -25,32 +25,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  requirement: *id001
-  name: daemons
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 0
-        - 1
-        version: "0.1"
-  requirement: *id002
+        - 2
+        version: "0.2"
+  requirement: *id001
   name: dat-tcp
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +45,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id003
+  requirement: *id002
   name: ns-options
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +60,12 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  requirement: *id004
+  requirement: *id003
   name: sanford-protocol
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,12 +75,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id005
+  requirement: *id004
   name: assert
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,15 +90,15 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id006
+  requirement: *id005
   name: assert-mocha
   type: :development
 description: Simple hosts for Sanford services.
 email: 
 - collin.redding@me.com
 - kelly@kellyredding.com
-executables: []
-
+executables: 
+- sanford
 extensions: []
 
 extra_rdoc_files: []
@@ -129,14 +114,13 @@ files:
 - bench/runner.rb
 - bench/services.rb
 - bench/tasks.rb
+- bin/sanford
 - lib/sanford.rb
+- lib/sanford/cli.rb
 - lib/sanford/error_handler.rb
-- lib/sanford/exceptions.rb
 - lib/sanford/host.rb
 - lib/sanford/host_data.rb
 - lib/sanford/logger.rb
-- lib/sanford/manager.rb
-- lib/sanford/rake.rb
 - lib/sanford/runner.rb
 - lib/sanford/server.rb
 - lib/sanford/service_handler.rb
@@ -160,6 +144,7 @@ files:
 - 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
@@ -214,6 +199,7 @@ test_files:
 - 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

data/lib/sanford/exceptions.rb

@@ -1,37 +0,0 @@
-module Sanford
-
-  BaseError = Class.new(RuntimeError)
-
-  NotFoundError = Class.new(RuntimeError)
-
-  class NoHostError < BaseError
-
-    def initialize(host_name)
-      message = if Sanford.hosts.empty?
-        "No hosts have been defined. Please define a host before trying to run Sanford."
-      else
-        "A host couldn't be found with the name #{host_name.inspect}. "
-      end
-      super message
-    end
-
-  end
-
-  class InvalidHostError < BaseError
-
-    def initialize(host)
-      super "A port must be configured or provided to run a server for '#{host}'"
-    end
-
-  end
-
-  class NoHandlerClassError < BaseError
-
-    def initialize(handler_class_name)
-      super "Sanford couldn't find the service handler '#{handler_class_name}'. " \
-        "It doesn't exist or hasn't been required in yet."
-    end
-
-  end
-
-end

data/lib/sanford/manager.rb

@@ -1,49 +0,0 @@
-require 'daemons'
-
-require 'sanford/host_data'
-require 'sanford/server'
-
-module Sanford
-
-  class Manager
-
-    def self.call(action, options = nil)
-      options ||= {}
-      options[:ip]    ||= ENV['SANFORD_IP']
-      options[:port]  ||= ENV['SANFORD_PORT']
-
-      name = options.delete(:host) || ENV['SANFORD_HOST']
-      service_host = name ? Sanford.hosts.find(name) : Sanford.hosts.first
-      raise(Sanford::NoHostError.new(name)) if !service_host
-
-      self.new(service_host, options).call(action)
-    end
-
-    attr_reader :host_data, :process_name
-
-    def initialize(service_host, options = {})
-      @host_data = Sanford::HostData.new(service_host, options)
-      @process_name = [ self.host_data.ip, self.host_data.port, self.host_data.name ].join('_')
-    end
-
-    def call(action)
-      daemons_options = self.default_options.merge({ :ARGV => [ action.to_s ] })
-      FileUtils.mkdir_p(daemons_options[:dir])
-      ::Daemons.run_proc(self.process_name, daemons_options) do
-        server = Sanford::Server.new(self.host_data)
-        server.start
-        server.join_thread
-      end
-    end
-
-    protected
-
-    def default_options
-      { :dir_mode   => :normal,
-        :dir        => self.host_data.pid_dir
-      }
-    end
-
-  end
-
-end

data/lib/sanford/rake.rb

@@ -1,42 +0,0 @@
-module Sanford::Rake
-
-  class Tasks
-    extend ::Rake::DSL
-
-    def self.load
-      namespace :sanford do
-
-        task :load_manager do
-          require 'sanford'
-          require 'sanford/manager'
-          Sanford.init
-        end
-
-        desc "Start a Sanford server and daemonize the process"
-        task :start => :load_manager do
-          Sanford::Manager.call :start
-        end
-
-        desc "Stop a daemonized Sanford server process"
-        task :stop => :load_manager do
-          Sanford::Manager.call :stop
-        end
-
-        desc "Restart a daemonized Sanford server process"
-        task :restart => :load_manager do
-          Sanford::Manager.call :restart
-        end
-
-        desc "Run a Sanford server (not daemonized)"
-        task :run => :load_manager do
-          Sanford::Manager.call :run
-        end
-
-      end
-    end
-
-  end
-
-end
-
-Sanford::Rake::Tasks.load