communist 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+0.2.0 (Aug  , 2012)
+===================
+
+* Add NullServer.
+* Add Constants.
+* Add server specs.
+* Change code logic for setting up server ports.
+* Change server start up logic.
+* Change code logic for stopping a server.

data/README.md

@@ -4,7 +4,9 @@ The Manifesto:
 
 >It is Communist prime role to serve community by providing Cucumber steps for
 >testing external API calls from command line applications. To meet this aim
->the Communist employees Sinatra DSL for mocking server responses.
+>the Communist employees Sinatra DSL for mocking server responses. The Communist
+>server receives requests from CLI and provides an API to respond to those
+>requests. Canned answers/expectations have to be provided upfront.
 
 ## Installation
 

data/lib/communist/const.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+module Communist
+  module Const
+
+    DEFAULT_TIMEOUT = 30
+    DEFAULT_HOST = '127.0.0.1'
+
+  end # Const
+end # Communist

data/lib/communist/cucumber.rb

@@ -2,6 +2,7 @@ require 'communist/server'
 
 Before do
   ENV['TEST_HOST'] = '127.0.0.1:0'
+  puts 'RUNNING LOCALLY'
 end
 
 After do

data/lib/communist/null_server.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Communist
+
+  # Provides a dummy server.
+  class NullServer
+    def method_missing(*)
+      return nil
+    end
+  end
+
+end # Communist

data/lib/communist/server.rb

@@ -7,6 +7,8 @@ require 'communist'
 module Communist
   class Server
 
+    include Communist::Const
+
     class ServerError < StandardError; end
 
     class Identify
@@ -35,10 +37,13 @@ module Communist
       @app  = app
       @host = options[:host]
       @server_thread = nil
+      @port = options[:port] || Communist.server_port
+      @port ||= Communist::Server.ports[@app.object_id]
+      @port ||= find_available_port
     end
 
     def host
-      "127.0.0.1"
+      Communist.server_host || DEFAULT_HOST
     end
 
     def responsive?
@@ -47,28 +52,26 @@ module Communist
       res = Net::HTTP.start(host, @port) { |http| http.get('/__identify__') }
 
       if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
-        return res.body == @app.object_id.to_s
+        return res.body == app.object_id.to_s
       end
     rescue Errno::ECONNREFUSED, Errno::EBADF
       return false
     end
 
     def start(&block)
-      if @app
-        @port = Server.ports[@app.object_id]
+      raise ArgumentError, 'app required' unless app
 
-        if not @port or not responsive?
-          @port = find_available_port
-          Server.ports[@pp.object_id] = @port
+      unless responsive?
+        Communist::Server.ports[app.object_id] = port
 
-          @server_thread = Thread.new do
-            Communist.run_default_server(Identify.new(app), @port) do |server|
-              Communist.server = server
-            end
+        @server_thread = Thread.new do
+          Communist.run_default_server(Identify.new(app), port) do |server|
+            Communist.servers[app.object_id] = server
+            trap "INT" do server.shutdown end
           end
-
-          Timeout.timeout(5) { @server_thread.join(0.1) until responsive? }
         end
+
+        Timeout.timeout(DEFAULT_TIMEOUT) { @server_thread.join(0.1) until responsive? }
       end
     rescue TimeoutError
       raise ServerError, "Rack application timed out during start"
@@ -76,13 +79,24 @@ module Communist
       self
     end
 
+    # Stops the server after handling the connection.
+    # Attempts to stop the server gracefully, otherwise
+    # shuts current connection right away.
     def stop
-      Communist.server.respond_to?(:stop!) ? Communist.server.stop! : Communist.server.stop
+      server = Communist.servers.delete(app.object_id) { |s| NullServer.new }
+      if Communist.server.respond_to?(:shutdown)
+        server.shutdown
+      elsif Communist.server.respond_to?(:stop!)
+        server.stop!
+      else
+        server.stop
+      end
       @server_thread.join
     end
 
     def self.run(&block)
       app = Sinatra.new do
+        set :show_exceptions, true
         set :environment, :test
         disable :protection
 
@@ -102,7 +116,7 @@ module Communist
   private
 
     def find_available_port
-      server = TCPServer.new('127.0.0.1', 0)
+      server = TCPServer.new(DEFAULT_HOST, 0)
       server.addr[Socket::Constants::SOCK_STREAM]
     ensure
       server.close if server

data/lib/communist/version.rb

@@ -1,3 +1,3 @@
 module Communist
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/communist.rb

@@ -2,13 +2,21 @@ require 'communist/version'
 require 'rack'
 
 module Communist
+
+  class CommunistError < StandardError; end
+
   class << self
     attr_accessor :app_host
     attr_accessor :default_host
+    attr_accessor :server_host, :server_port
     attr_accessor :run_server
     attr_accessor :app
 
-    # Possible options
+    # Configure Communist options
+    #
+    #  Communist.configure do |config|
+    #    config.server_host = 'http://localhost'
+    #  end
     #
     def configure
       yield self
@@ -26,6 +34,12 @@ module Communist
       end
     end
 
+    # Stores server instances.
+    #
+    def servers
+      @servers ||= {}
+    end
+
     # By default run thin or fall back on webrick
     #
     def run_default_server(app, port, &block)
@@ -41,7 +55,9 @@ module Communist
 
   end
 
-  autoload :Server,   'communist/server'
+  autoload :Server,     'communist/server'
+  autoload :Const,      'communist/const'
+  autoload :NullServer, 'communist/null_server'
 
 end # Communist
 

data/spec/server_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Communist::Server do
+
+  let(:app) { proc { |env| [200, {}, "Hello Server!"] } }
+
+  context 'initialization' do
+    it 'sets application' do
+      server = Communist::Server.new(app)
+      server.app.should == app
+    end
+
+    it "sets port" do
+      server = Communist::Server.new(app).start
+      server.port.should == Communist::Server.ports[app.object_id]
+    end
+  end
+
+  it "spins up a server" do
+    server = Communist::Server.new(app).start
+    res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
+    res.body.should include("Hello Server!")
+  end
+
+  it "binds to specified host" do
+    Communist.server_host = "0.0.0.0"
+    server = Communist::Server.new(app).start
+    server.host.should == "0.0.0.0"
+    Communist.server_host = nil
+  end
+
+end # Communist::Server

data/spec/spec_helper.rb

@@ -4,7 +4,27 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
+require 'communist'
+
+DEFAULT_TEST_HOST = '0.0.0.0'
+DEFAULT_TEST_PORT = 3333
+
+module Helpers
+  def start_server(app, options, &block)
+    @server = Communist::Server.new(app, options)
+    @thread = Thread.new { @server.start }
+  end
+
+  def stop_server
+    @server.stop!
+    @thread.kill
+  end
+end
 
 RSpec.configure do |config|
   config.order = :rand
+  config.color_enabled = true
+  config.tty = true
+
+  config.include Helpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: communist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152389780 !ruby/object:Gem::Requirement
+  requirement: &2152389520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152389780
+  version_requirements: *2152389520
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152389340 !ruby/object:Gem::Requirement
+  requirement: &2152389080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152389340
+  version_requirements: *2152389080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152388880 !ruby/object:Gem::Requirement
+  requirement: &2152388600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152388880
+  version_requirements: *2152388600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152388400 !ruby/object:Gem::Requirement
+  requirement: &2152388160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152388400
+  version_requirements: *2152388160
 description: Library for mocking CLI calls to external APIs
 email:
 - ''
@@ -64,15 +64,19 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - communist.gemspec
 - lib/communist.rb
+- lib/communist/const.rb
 - lib/communist/cucumber.rb
+- lib/communist/null_server.rb
 - lib/communist/server.rb
 - lib/communist/version.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -99,4 +103,5 @@ signing_key:
 specification_version: 3
 summary: Library for mocking CLI calls to external APIs
 test_files:
+- spec/server_spec.rb
 - spec/spec_helper.rb