http_server_manager 0.1.1 → 0.2.0

data/lib/http_server_manager/rake/server_tasks.rb

@@ -17,6 +17,11 @@ module HttpServerManager
           server.stop!
         end
 
+        desc "Restart an potentially running #{server.name}"
+        task :restart do
+          server.restart!
+        end
+
         desc "Displays the status of a #{server.name} process"
         task :status do
           puts "#{server.name} is #{server.status}"

data/lib/http_server_manager/server.rb

@@ -32,6 +32,11 @@ module HttpServerManager
       end
     end
 
+    def restart!
+      stop!
+      start!
+    end
+
     def status
       running? ? :started : :stopped
     end

data/lib/http_server_manager/version.rb

@@ -1,3 +1,3 @@
 module HttpServerManager
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/lib/http_server_manager/rake/server_tasks_spec.rb

@@ -0,0 +1,66 @@
+describe HttpServerManager::Rake::ServerTasks do
+  include_context "managed http server integration utilities"
+  include ::Rake::DSL
+
+  let(:task_namespace) { :test_server_namespace }
+  let(:server) { double(HttpServerManager::Server, name: "test_server") }
+
+  let(:server_tasks) { HttpServerManager::Rake::ServerTasks.new(server) }
+
+  before(:each) do
+    namespace task_namespace do
+      server_tasks
+    end
+  end
+
+  after(:each) { Rake.application.tasks_in_scope([task_namespace]).each(&:clear) }
+
+  describe "start task" do
+
+    let(:task) { ::Rake::Task["#{task_namespace}:start"] }
+
+    it "should start the server" do
+      server.should_receive(:start!)
+
+      task.execute
+    end
+
+  end
+
+  describe "stop task" do
+
+    let(:task) { ::Rake::Task["#{task_namespace}:stop"] }
+
+    it "should stop the server" do
+      server.should_receive(:stop!)
+
+      task.execute
+    end
+
+  end
+
+  describe "restart task" do
+
+    let(:task) { ::Rake::Task["#{task_namespace}:restart"] }
+
+    it "should restart the server" do
+      server.should_receive(:restart!)
+      task.execute
+    end
+
+  end
+
+  describe "status task" do
+
+    let(:task) { ::Rake::Task["#{task_namespace}:status"] }
+
+    it "should write the server name and it's status to stdout" do
+      server.stub!(:status).and_return("stopped")
+      server_tasks.should_receive(:puts).with("test_server is stopped")
+
+      task.execute
+    end
+
+  end
+
+end

data/spec/lib/http_server_manager/server_integration_spec.rb

@@ -1,4 +1,4 @@
-describe HttpServerManager::Server do
+describe HttpServerManager::Server, "managing a real server" do
   include_context "managed http server integration utilities"
 
   let(:server) { RackServer.new(port: 4001) }

data/spec/lib/http_server_manager/server_spec.rb

@@ -0,0 +1,29 @@
+describe HttpServerManager::Server do
+
+  class HttpServerManager::TestableServer < HttpServerManager::Server
+
+    def start_command
+      "some command"
+    end
+
+  end
+
+  let(:server) { HttpServerManager::TestableServer.new(name: "Test Server", port: 8888) }
+
+  before(:each) do
+    server.stub!(:start!)
+    server.stub!(:stop!)
+  end
+
+  describe "#restart!" do
+
+    it "should first stop the server and then start the server" do
+      server.should_receive(:stop!).ordered
+      server.should_receive(:start!).ordered
+
+      server.restart!
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_server_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,8 +155,9 @@ files:
 - ./spec/support/http_server_manager/test/server_integration_utilities_spec_context.rb
 - ./spec/support/http_server_manager/test/silent_logger.rb
 - ./spec/support/http_server_manager/test_support.rb
-- ./spec/lib/http_server_manager/rake/server_tasks_integration_spec.rb
+- ./spec/lib/http_server_manager/rake/server_tasks_spec.rb
 - ./spec/lib/http_server_manager/server_integration_spec.rb
+- ./spec/lib/http_server_manager/server_spec.rb
 - ./spec/lib/http_server_manager/stdout_logger_spec.rb
 - ./spec/lib/http_server_manager_spec.rb
 - ./spec/spec_helper.rb
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -64425714173566742
+      hash: 4335751342114545117
 requirements: []
 rubyforge_project: http_server_manager
 rubygems_version: 1.8.25
@@ -190,8 +191,9 @@ signing_key:
 specification_version: 3
 summary: Manages the lifecycle of HTTP server processes
 test_files:
-- ./spec/lib/http_server_manager/rake/server_tasks_integration_spec.rb
+- ./spec/lib/http_server_manager/rake/server_tasks_spec.rb
 - ./spec/lib/http_server_manager/server_integration_spec.rb
+- ./spec/lib/http_server_manager/server_spec.rb
 - ./spec/lib/http_server_manager/stdout_logger_spec.rb
 - ./spec/lib/http_server_manager_spec.rb
 - ./spec/spec_helper.rb

data/spec/lib/http_server_manager/rake/server_tasks_integration_spec.rb

@@ -1,61 +0,0 @@
-describe HttpServerManager::Rake::ServerTasks do
-  include_context "managed http server integration utilities"
-  include ::Rake::DSL
-
-  before(:all) do
-    namespace :rack_server do
-      server_tasks
-    end
-  end
-
-  describe "start task" do
-
-    let(:task) { ::Rake::Task["rack_server:start"] }
-
-    after(:each) { force_stop! }
-
-    it "should start a stopped server" do
-      task.execute
-
-      wait_until_started!
-    end
-
-  end
-
-  describe "stop task" do
-
-    let(:task) { ::Rake::Task["rack_server:stop"] }
-
-    before(:each) { force_start! }
-
-    after(:each) { force_stop! } # Ensure server has completely stopped
-
-    it "should stop a started server" do
-      task.execute
-
-      wait_until_stopped!
-    end
-
-  end
-
-  describe "status task" do
-
-    let(:task) { ::Rake::Task["rack_server:status"] }
-
-    it "should write the server name and it's status to stdout" do
-      server_tasks.should_receive(:puts).with("rack_server is stopped")
-
-      task.execute
-    end
-
-  end
-
-  def server_tasks
-    @server_tasks ||= HttpServerManager::Rake::ServerTasks.new(server)
-  end
-
-  def server
-    @server ||= RackServer.new(port: 4001)
-  end
-
-end