http_stub 0.9.7 → 0.11.0

data/lib/http_stub.rb

@@ -8,6 +8,7 @@ require 'haml'
 require 'sass'
 require 'net/http'
 require 'json'
+require 'http_server_manager'
 
 require File.expand_path('../http_stub/hash_extensions', __FILE__)
 require File.expand_path('../http_stub/models/response', __FILE__)
@@ -27,6 +28,7 @@ require File.expand_path('../http_stub/models/request_pipeline', __FILE__)
 require File.expand_path('../http_stub/controllers/stub_controller', __FILE__)
 require File.expand_path('../http_stub/controllers/stub_activator_controller', __FILE__)
 require File.expand_path('../http_stub/server', __FILE__)
+require File.expand_path('../http_stub/daemon', __FILE__)
 require File.expand_path('../http_stub/configurer/request/omittable', __FILE__)
 require File.expand_path('../http_stub/configurer/request/regexpable', __FILE__)
 require File.expand_path('../http_stub/configurer/request/controllable_value', __FILE__)

data/lib/http_stub/daemon.rb

@@ -0,0 +1,36 @@
+module HttpStub
+
+  class Daemon < HttpServerManager::Server
+
+    class << self
+
+      def pid_dir=(dir)
+        HttpServerManager.pid_dir = dir
+      end
+
+      def log_dir=(dir)
+        HttpServerManager.log_dir = dir
+      end
+
+    end
+
+    def initialize(options)
+      super({ host: "localhost" }.merge(options))
+      @configurer = options[:configurer]
+    end
+
+    def start!
+      super
+      if @configurer
+        @configurer.initialize!
+        logger.info "#{@name} initialized"
+      end
+    end
+
+    def start_command
+      "rake #{@name}:start:foreground"
+    end
+
+  end
+
+end

data/lib/http_stub/rake/daemon_tasks.rb

@@ -0,0 +1,14 @@
+module HttpStub
+  module Rake
+
+    class DaemonTasks < ::Rake::TaskLib
+
+      def initialize(options)
+        HttpStub::Rake::ServerTasks.new(options)
+        namespace(options[:name]) { HttpServerManager::Rake::ServerTasks.new(HttpStub::Daemon.new(options)) }
+      end
+
+    end
+
+  end
+end

data/lib/http_stub/rake/server_tasks.rb

@@ -1,34 +1,36 @@
 module HttpStub
-
   module Rake
 
     class ServerTasks < ::Rake::TaskLib
 
       def initialize(options)
-        define_start_task(options)
-        define_initialize_task(options) if options[:configurer]
+        namespace options[:name] do
+          define_start_task(options)
+          define_initialize_task(options) if options[:configurer]
+        end
       end
 
       private
 
       def define_start_task(options)
-        desc "Starts stub #{options[:name]}"
-        task "start_#{options[:name]}" do
-          HttpStub::Server.instance_eval do
-            set :environment, :test
-            set :port, options[:port]
-            run!
+        namespace :start do
+          desc "Starts stub #{options[:name]} in the foreground"
+          task(:foreground) do
+            HttpStub::Server.instance_eval do
+              set :environment, :test
+              set :port, options[:port]
+              run!
+            end
           end
         end
       end
 
       def define_initialize_task(options)
         desc "Configures stub #{options[:name]}"
-        task("configure_#{options[:name]}") { options[:configurer].initialize! }
+        task(:configure) { options[:configurer].initialize! }
       end
 
     end
 
   end
-
 end

data/lib/http_stub/rake/task_generators.rb

@@ -1,4 +1,7 @@
 require File.expand_path('../../../http_stub', __FILE__)
 require 'rake/tasklib' unless defined? (::Rake::TaskLib)
 
+require 'http_server_manager/rake/task_generators'
+
 require File.expand_path('../server_tasks', __FILE__)
+require File.expand_path('../daemon_tasks', __FILE__)

data/lib/http_stub/version.rb

@@ -1,3 +1,3 @@
 module HttpStub
-  VERSION = "0.9.7"
+  VERSION = "0.11.0"
 end

data/spec/lib/http_stub/daemon_integration_spec.rb

@@ -0,0 +1,7 @@
+describe HttpStub::Daemon do
+
+  let(:server) { HttpStub::Daemon.new(name: :example_daemon, port: 8002) }
+
+  it_should_behave_like "a managed http server"
+
+end

data/spec/lib/http_stub/daemon_spec.rb

@@ -0,0 +1,71 @@
+describe HttpStub::Daemon do
+
+  let(:configurer) { nil }
+
+  let(:daemon) { HttpStub::Daemon.new(name: :sample_daemon, port: 8888, configurer: configurer) }
+
+  before(:each) { daemon.logger.stub(:info) }
+
+  describe ".log_dir" do
+
+    before(:each) { @original_log_dir = HttpServerManager.log_dir }
+
+    after(:each) { HttpServerManager.log_dir = @original_log_dir }
+
+    it "should establish the HttpServerManager log_dir" do
+      HttpStub::Daemon.log_dir = "/some/log/dir"
+
+      HttpServerManager.log_dir.should eql("/some/log/dir")
+    end
+
+  end
+
+  describe ".pid_dir" do
+
+    before(:each) { @original_pid_dir = HttpServerManager.pid_dir }
+
+    after(:each) { HttpServerManager.pid_dir = @original_pid_dir }
+
+    it "should establish the HttpServerManager pid_dir" do
+      HttpStub::Daemon.pid_dir = "/some/pid/dir"
+
+      HttpServerManager.pid_dir.should eql("/some/pid/dir")
+    end
+
+  end
+
+  describe "#start!" do
+
+    before(:each) { daemon.stub(:running?).and_return(true) }
+
+    context "when a configurer is provided" do
+
+      let(:configurer) { double(HttpStub::Configurer).as_null_object }
+
+      it "should initialize the configurer" do
+        configurer.should_receive(:initialize!)
+
+        daemon.start!
+      end
+
+      it "should log that the daemon with the provided name has been initialized" do
+        daemon.logger.should_receive(:info).with("sample_daemon initialized")
+
+        daemon.start!
+      end
+
+    end
+
+    context "when no configurer is provided" do
+
+      it "should not log that the daemon has been initialized" do
+        daemon.logger.should_not_receive(:info).with("sample_daemon initialized")
+
+        daemon.start!
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/http_stub/rake/daemon_tasks_smoke_spec.rb

@@ -0,0 +1,31 @@
+describe HttpStub::Rake::DaemonTasks do
+  include Rake::DSL
+
+  before(:all) { HttpStub::Rake::DaemonTasks.new(name: :example_daemon, port: 8002) }
+
+  describe "start task" do
+
+    context "when invoked" do
+
+      before(:all) { @exit_flag = Rake::Task["example_daemon:start"].invoke("--trace") }
+
+      after(:all) { Rake::Task["example_daemon:stop"].invoke("--trace") }
+
+      it "should exit with a status code of 0" do
+        @exit_flag.should be_true
+      end
+
+      it "should start a stub server that responds to stub requests" do
+        request = Net::HTTP::Post.new("/stubs")
+        request.body = { "response" => { "status" => 302, "body" => "Some Body" } }.to_json
+
+        response = Net::HTTP.new("localhost", 8002).start { |http| http.request(request) }
+
+        response.code.should eql("200")
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/http_stub/rake/server_tasks_smoke_spec.rb

@@ -0,0 +1,30 @@
+describe HttpStub::Rake::ServerTasks do
+  include Rake::DSL
+
+  before(:all) { HttpStub::Rake::ServerTasks.new(name: :test_server, port: 8003) }
+
+  describe "start task" do
+
+    context "when invoked" do
+
+      before(:all) do
+        @server_thread = Thread.new { Rake::Task["test_server:start:foreground"].invoke("--trace") }
+        ::Wait.until!("http stub server started") { Net::HTTP.get_response("localhost", "/", 8003) }
+      end
+
+      after(:all) { @server_thread.kill }
+
+      it "should start a stub server that responds to stub requests" do
+        request = Net::HTTP::Post.new("/stubs")
+        request.body = { "response" => { "status" => 302, "body" => "Some Body" } }.to_json
+
+        response = Net::HTTP.new("localhost", 8003).start { |http| http.request(request) }
+
+        response.code.should eql("200")
+      end
+
+    end
+
+  end
+
+end

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

@@ -16,7 +16,7 @@ describe HttpStub::Rake::ServerTasks do
         it "should initialize the provided configurer" do
           configurer.should_receive(:initialize!)
 
-          Rake::Task[:configure_tasks_configurer_provided_test].execute
+          Rake::Task["tasks_configurer_provided_test:configure"].execute
         end
 
       end
@@ -28,7 +28,7 @@ describe HttpStub::Rake::ServerTasks do
       let(:options) { { name: :tasks_configurer_not_provided_test } }
 
       it "should not generate a task" do
-        lambda { Rake::Task[:configure_tasks_configurer_not_provided_test] }.should
+        lambda { Rake::Task["tasks_configurer_not_provided_test:configure"] }.should
           raise_error(/Don't know how to build task/)
       end
 

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'simplecov'
 SimpleCov.start do
   add_filter "/spec/"
   add_filter "/vendor/"
-  minimum_coverage 98.3
+  minimum_coverage 99.2
   refuse_coverage_drop
 end if ENV["coverage"]
 
@@ -11,6 +11,8 @@ require 'nokogiri'
 require 'rack/test'
 require 'wait_until'
 
+require 'http_server_manager/test_support'
+
 require File.expand_path('../../lib/http_stub/rake/task_generators', __FILE__)
 require File.expand_path('../../lib/http_stub', __FILE__)
 require File.expand_path('../../examples/configurer_with_class_activator', __FILE__)
@@ -19,4 +21,9 @@ require File.expand_path('../../examples/configurer_with_initialize_callback', _
 require File.expand_path('../../examples/configurer_with_complex_initializer', __FILE__)
 require File.expand_path('../../examples/configurer_with_many_class_activators', __FILE__)
 
+HttpStub::Daemon.log_dir = File.expand_path('../../tmp/log', __FILE__)
+HttpStub::Daemon.pid_dir = File.expand_path('../../tmp/pids', __FILE__)
+
+HttpServerManager.logger = HttpServerManager::Test::SilentLogger
+
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |file| require file }

data/spec/support/server_integration.rb

@@ -1,7 +1,7 @@
 shared_context "server integration" do
 
   before(:all) do
-    @pid = Process.spawn("rake start_example_server --trace")
+    @pid = Process.spawn("rake example_server:start:foreground --trace")
     ::Wait.until!("http stub server started") { Net::HTTP.get_response(server_host, "/", server_port) }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_stub
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -92,6 +92,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: http_server_manager
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +163,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +171,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +243,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,7 +251,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +286,7 @@ files:
 - ./lib/http_stub/configurer.rb
 - ./lib/http_stub/controllers/stub_activator_controller.rb
 - ./lib/http_stub/controllers/stub_controller.rb
+- ./lib/http_stub/daemon.rb
 - ./lib/http_stub/hash_extensions.rb
 - ./lib/http_stub/models/exact_value_matcher.rb
 - ./lib/http_stub/models/hash_with_value_matchers.rb
@@ -285,6 +302,7 @@ files:
 - ./lib/http_stub/models/stub_parameters.rb
 - ./lib/http_stub/models/stub_uri.rb
 - ./lib/http_stub/models/value_matcher.rb
+- ./lib/http_stub/rake/daemon_tasks.rb
 - ./lib/http_stub/rake/server_tasks.rb
 - ./lib/http_stub/rake/task_generators.rb
 - ./lib/http_stub/server.rb
@@ -309,6 +327,8 @@ files:
 - ./spec/lib/http_stub/configurer_spec.rb
 - ./spec/lib/http_stub/controllers/stub_activator_controller_spec.rb
 - ./spec/lib/http_stub/controllers/stub_controller_spec.rb
+- ./spec/lib/http_stub/daemon_integration_spec.rb
+- ./spec/lib/http_stub/daemon_spec.rb
 - ./spec/lib/http_stub/hash_extensions_spec.rb
 - ./spec/lib/http_stub/models/exact_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/hash_with_value_matchers_spec.rb
@@ -324,7 +344,8 @@ files:
 - ./spec/lib/http_stub/models/stub_spec.rb
 - ./spec/lib/http_stub/models/stub_uri_spec.rb
 - ./spec/lib/http_stub/models/value_matcher_spec.rb
-- ./spec/lib/http_stub/rake/server_tasks_integration_spec.rb
+- ./spec/lib/http_stub/rake/daemon_tasks_smoke_spec.rb
+- ./spec/lib/http_stub/rake/server_tasks_smoke_spec.rb
 - ./spec/lib/http_stub/rake/server_tasks_spec.rb
 - ./spec/lib/http_stub/server_integration_spec.rb
 - ./spec/lib/http_stub/server_spec.rb
@@ -351,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1462084841205828236
+      hash: 244872953293739403
 requirements: []
 rubyforge_project: http_stub
 rubygems_version: 1.8.25
@@ -373,6 +394,8 @@ test_files:
 - ./spec/lib/http_stub/configurer_spec.rb
 - ./spec/lib/http_stub/controllers/stub_activator_controller_spec.rb
 - ./spec/lib/http_stub/controllers/stub_controller_spec.rb
+- ./spec/lib/http_stub/daemon_integration_spec.rb
+- ./spec/lib/http_stub/daemon_spec.rb
 - ./spec/lib/http_stub/hash_extensions_spec.rb
 - ./spec/lib/http_stub/models/exact_value_matcher_spec.rb
 - ./spec/lib/http_stub/models/hash_with_value_matchers_spec.rb
@@ -388,7 +411,8 @@ test_files:
 - ./spec/lib/http_stub/models/stub_spec.rb
 - ./spec/lib/http_stub/models/stub_uri_spec.rb
 - ./spec/lib/http_stub/models/value_matcher_spec.rb
-- ./spec/lib/http_stub/rake/server_tasks_integration_spec.rb
+- ./spec/lib/http_stub/rake/daemon_tasks_smoke_spec.rb
+- ./spec/lib/http_stub/rake/server_tasks_smoke_spec.rb
 - ./spec/lib/http_stub/rake/server_tasks_spec.rb
 - ./spec/lib/http_stub/server_integration_spec.rb
 - ./spec/lib/http_stub/server_spec.rb

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

@@ -1,21 +0,0 @@
-describe HttpStub::Rake::ServerTasks do
-  include_context "server integration"
-
-  describe "the start task" do
-
-    context "when invoked" do
-
-      it "should start a stub server that responds to stub requests" do
-        request = Net::HTTP::Post.new("/stubs")
-        request.body = { "response" => { "status" => 302, "body" => "Some Body" } }.to_json
-
-        response = Net::HTTP.new("localhost", 8001).start { |http| http.request(request) }
-
-        response.code.should eql("200")
-      end
-
-    end
-
-  end
-
-end