mirage 2.3.0 → 2.4.0

data/HISTORY

@@ -1,3 +1,4 @@
+V2.4.0 - Adding ability to set defaults
 V2.3.0 - Enhanced commandline/programmatic api
 V2.2.3 - fix bug where mirage is already running a client calls exit.
 V2.2.1/2 - Code tidy up

data/README.md

@@ -15,4 +15,28 @@ P.s. Mirage runs on Linux,MacOSX and Windows; Rubies 1.8.7, 1.9 and JRuby.
 Installation
 ------------
     gem install mirage 
- 
+    
+What's New?
+----------- 
+### 2.3.0
+---------
+#### What do I get?
+##### 1: Run more than one instance of Mirage per machine.
+##### 2: Programmatic interface for starting and stopping Mirage
+The client API now includes the ability to start and stop Mirage locally. No more calling out to the command line.  
+
+**Example Usage:** (See rdoc for full details)  
+
+    mirage_client = Mirage.start :port => 9001 #with out args start mirage on 7001 by default
+    Mirage.stop # stops the current running instance as long as only one is running  
+    
+##### 3: Updated command line interface
+Now powered by the mighty Thor, the stop subcommand has been enhanced.  
+**Usage:**  
+
+    mirage stop -> As it always did, stops the current instances of Mirage as long as there is only one running instance.  
+    mirage stop -p port -> stops Mirage on a given port.    
+    mirage stop -p port1, port2... -> stop multiple instances of Mirage.  
+    mirage stop -p all -> stop all instances of mirage.  
+#### What do I have to do to upgrade?
+You shouldn't have to do anything to move from the last version of Mirage to this one. Let me know if something stops working!

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/features/client/configure.feature

@@ -0,0 +1,74 @@
+Feature: The client can be configured with default settings to keep your mocking 'DRY'
+
+  Background:
+    Given the following gems are required to run the Mirage client test code:
+    """
+    require 'rubygems'
+    require 'rspec'
+    require 'mirage/client'
+    """
+
+  Scenario: configuring the client on instance
+    Given I run
+    """
+    client = Mirage::Client.new do |defaults|
+      defaults.method = :post
+      defaults.status = 202
+      defaults.default = true
+      defaults.delay = 2
+      defaults.content_type = "text/xml"
+    end
+
+    client.put('greeting','hello')
+    """
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting/for/someone'
+    Then 'hello' should be returned
+    And a 202 should be returned
+    Then it should take at least '2' seconds
+    And the response 'content-type' should be 'text/xml'
+
+  Scenario: Configuring a client after it has been created
+    Given I run
+    """
+    client = Mirage::Client.new
+    client.configure do |defaults|
+      defaults.method = :post
+      defaults.status = 202
+      defaults.default = true
+      defaults.delay = 2
+      defaults.content_type = "text/xml"
+    end
+
+    client.put('greeting','hello')
+    """
+    When I send POST to 'http://localhost:7001/mirage/responses/greeting/for/someone'
+    Then 'hello' should be returned
+    And a 202 should be returned
+    Then it should take at least '2' seconds
+    And the response 'content-type' should be 'text/xml'
+
+  Scenario: resetting defaults
+    Given I run
+    """
+    client = Mirage::Client.new
+    client.configure do |defaults|
+      defaults.method = :post
+      defaults.status = 202
+      defaults.default = true
+      defaults.delay = 2
+      defaults.content_type = "text/xml"
+    end
+
+    client.reset
+
+    client.configure do |defaults|
+      defaults.method.should == nil
+      defaults.status.should == nil
+      defaults.default.should == nil
+      defaults.delay.should == nil
+      defaults.content_type.should == nil
+    end
+    """
+
+
+

data/lib/mirage/client.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
 require 'client/web'
 require 'client/error'
+require 'client/cli_bridge'
 require 'client/runner'
 require 'client/response'
 require 'client/client'

data/lib/mirage/client/cli_bridge.rb

@@ -0,0 +1,32 @@
+module Mirage
+module CLIBridge
+  def mirage_process_ids *ports
+    ports.flatten!
+    mirage_instances = {}
+    ["Mirage Server", "mirage_server", "mirage server"].each do |process_name|
+      processes_with_name(process_name).lines.collect { |line| line.chomp }.each do |process_line|
+        pid = process_line.split(' ')[1]
+        port = process_line[/port (\d+)/, 1]
+        mirage_instances[port] = pid
+      end
+    end
+
+    return mirage_instances if ports.first.to_s.downcase == "all"
+    Hash[mirage_instances.find_all { |port, pid| ports.include?(port.to_i) }]
+  end
+
+  def kill pid
+    ChildProcess.windows? ? `taskkill /F /T /PID #{pid}` : `kill -9 #{pid}`
+  end
+
+  def processes_with_name name
+    if ChildProcess.windows?
+
+      `tasklist /V | findstr "#{name.gsub(" ", '\\ ')}"`
+    else
+      IO.popen("ps aux | grep '#{name}' | grep -v grep | grep -v #{$$}")
+    end
+  end
+
+end
+end

data/lib/mirage/client/client.rb

@@ -1,15 +1,27 @@
 require 'uri'
 module Mirage
   class Client
+    Defaults = Struct.new(:method, :status, :delay, :content_type, :default)
     include Mirage::Web
     attr_reader :url
 
+
     # Creates an instance of the Mirage client that can be used to interact with the Mirage Server
     #
     #   Client.new => a client that is configured to connect to Mirage on http://localhost:7001/mirage (the default settings for Mirage)
     #   Client.new(URL) => a client that is configured to connect to an instance of Mirage running on the specified url.
-    def initialize url="http://localhost:7001/mirage"
+    def initialize url="http://localhost:7001/mirage", &block
       @url = url
+      @defaults = Defaults.new
+      configure &block if block_given?
+    end
+
+    def configure &block
+      yield @defaults
+    end
+
+    def reset
+      @defaults = Defaults.new
     end
 
     def stop
@@ -31,7 +43,7 @@ module Mirage
     # end
     def put endpoint, response_value, &block
       response = Mirage::Response.new response_value
-
+      @defaults.each_pair{|key, value|response.send("#{key}=", value) if value}
       yield response if block_given?
 
       build_response(http_put("#{@url}/templates/#{endpoint}", response.value, response.headers))

data/lib/mirage/client/response.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 module Mirage
   class Response
 
-    attr_accessor :content_type,:method, :response_code, :pattern, :default, :status, :delay
+    attr_accessor :content_type,:method, :pattern, :default, :status, :delay
     attr_reader :value
 
     def initialize response

data/lib/mirage/client/runner.rb

@@ -50,6 +50,7 @@ module Mirage
 
   class Runner < Thor
     include ::Mirage::Web
+    include CLIBridge
     RUBY_CMD = ChildProcess.jruby? ? 'jruby' : 'ruby'
 
     desc "start", "Starts mirage"
@@ -104,7 +105,7 @@ module Mirage
               end
 
       mirage_process_ids(ports).values.each do |process_id|
-        ChildProcess.windows? ? `taskkill /F /T /PID #{process_id}` : IO.popen("kill -9 #{process_id}")
+        kill process_id
       end
 
       wait_until do
@@ -112,31 +113,5 @@ module Mirage
       end
     end
 
-    private
-
-    def processes_with_name name
-      if ChildProcess.windows?
-
-        `tasklist /V | findstr "#{name.gsub(" ", '\\ ')}"`
-      else
-        IO.popen("ps aux | grep '#{name}' | grep -v grep | grep -v #{$$}")
-      end
-    end
-
-    def mirage_process_ids *ports
-      ports.flatten!
-      mirage_instances = {}
-      ["Mirage Server", "mirage_server", "mirage server"].each do |process_name|
-        processes_with_name(process_name).lines.collect { |line| line.chomp }.each do |process_line|
-          pid = process_line.split(' ')[1]
-          port = process_line[/port (\d+)/, 1]
-          mirage_instances[port] = pid
-        end
-      end
-
-      return mirage_instances if ports.first.to_s.downcase == "all"
-      Hash[mirage_instances.find_all { |port, pid| ports.include?(port.to_i) }]
-    end
-
   end
 end

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2012-08-26"
+  s.date = "2012-09-11"
   s.description = "Mirage aids testing of your applications by hosting mock responses so that your applications do not have to talk to real endpoints. Its accessible via HTTP and has a RESTful interface."
   s.executables = ["mirage"]
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/mirage",
     "features/client/clear.feature",
+    "features/client/configure.feature",
     "features/client/preview_responses.feature",
     "features/client/put.feature",
     "features/client/requests.feature",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
     "features/support/mirage.rb",
     "full_build.sh",
     "lib/mirage/client.rb",
+    "lib/mirage/client/cli_bridge.rb",
     "lib/mirage/client/client.rb",
     "lib/mirage/client/error.rb",
     "lib/mirage/client/response.rb",
@@ -66,8 +68,9 @@ Gem::Specification.new do |s|
     "server/extensions/hash.rb",
     "server/extensions/object.rb",
     "server/mock_response.rb",
-    "spec/running_via_api_spec.rb",
-    "spec/running_via_api_windows_spec.rb",
+    "spec/cli_bridge_spec.rb",
+    "spec/runner_spec.rb",
+    "spec/spec_helper.rb",
     "test.rb",
     "views/index.erb"
   ]

data/spec/cli_bridge_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'mirage/client'
+
+describe Mirage::CLIBridge do
+
+  include Mirage::CLIBridge
+
+  describe 'Windows' do
+
+    include_context :windows
+
+    it 'should find the pids of mirage instances for given ports' do
+
+      tasklist_output = "#{process_string_for_mirage(7001, 18903)}
+      #{process_string_for_mirage(7002, 18904)}
+      #{process_string_for_mirage(7003, 18905)}"
+
+      self.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(tasklist_output)
+      mirage_process_ids([7001, 7002]).should == {"7001" => "18903", "7002" => "18904"}
+    end
+
+    it 'should find the pids of mirage instances for all ports' do
+      tasklist_output = "#{process_string_for_mirage(7001, 18903)}
+      #{process_string_for_mirage(7002, 18904)}
+      #{process_string_for_mirage(7003, 18905)}"
+
+      self.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(tasklist_output)
+      mirage_process_ids([:all]).should == {"7001" => "18903", "7002" => "18904", "7003" => "18905"}
+    end
+
+    it 'should kill the given process id' do
+      self.should_receive(:`).with(/taskkill \/F \/T \/PID 18903/)
+      kill(18903)
+    end
+  end
+
+  describe 'Linux/MacOSX' do
+
+    include_context :linux
+
+    it 'should find the pids of mirage instances for given ports' do
+      ps_aux_output = "#{process_string_for_mirage(7001, 18903)}
+      #{process_string_for_mirage(7002, 18904)}
+      #{process_string_for_mirage(7003, 18905)}"
+
+      IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
+      mirage_process_ids([7001, 7002]).should == {"7001" => "18903", "7002" => "18904"}
+    end
+
+    it 'should find the pids of mirage instances for all ports' do
+      ps_aux_output = "#{process_string_for_mirage(7001, 18903)}
+      #{process_string_for_mirage(7002, 18904)}
+      #{process_string_for_mirage(7003, 18905)}"
+
+      IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
+      mirage_process_ids([:all]).should == {"7001" => "18903", "7002" => "18904", "7003" => "18905"}
+    end
+
+    it 'should kill the given process id' do
+      self.should_receive(:`).with(/kill -9 18903/)
+      kill(18903)
+    end
+  end
+end

data/spec/runner_spec.rb

@@ -0,0 +1,130 @@
+require 'spec_helper'
+require 'mirage/client'
+
+include Mirage
+
+describe Mirage do
+
+  describe 'starting' do
+    before(:each) do
+      @runner = mock
+      Runner.should_receive(:new).and_return(@runner)
+    end
+
+    it 'should start Mirage on port 7001 by default' do
+      @runner.should_receive(:invoke).with(:start, [], {:port => 7001})
+      Mirage.start
+    end
+
+    it 'should start mirage on the given port' do
+      options = {:port => 9001}
+      @runner.should_receive(:invoke).with(:start, [], options)
+      Mirage.start options
+    end
+  end
+
+  describe 'stopping' do
+    before(:each) do
+      @runner = mock
+      Runner.stub(:new).and_return(@runner)
+    end
+
+    it 'should supply single port argument in an array to the runner' do
+      port = 7001
+      @runner.should_receive(:invoke).with(:stop, [], :port => [port])
+      @runner.should_receive(:invoke).with(:stop, [], :port => [:all])
+      Mirage.stop(:port => port)
+      Mirage.stop(:all)
+    end
+
+    it 'should stop multiple instances of Mirage' do
+      ports = 7001, 7002
+      @runner.should_receive(:invoke).with(:stop, [], :port => ports)
+      Mirage.stop(:port => ports)
+    end
+
+  end
+
+  describe Mirage::Runner do
+    it 'should stop the running instance of Mirage' do
+
+      runner = Mirage::Runner.new
+      runner.should_receive(:mirage_process_ids).with([:all]).any_number_of_times.and_return({"7001" => "18901"})
+
+      runner.should_receive(:kill).with("18901") do
+        runner.rspec_reset
+        runner.should_receive(:mirage_process_ids).with([:all]).any_number_of_times.and_return({})
+      end
+
+      runner.stop
+    end
+
+    it 'should not stop any instances when more than one is running' do
+      runner = Mirage::Runner.new
+      runner.should_receive(:mirage_process_ids).with([:all]).any_number_of_times.and_return({"7001" => "18901", "7002" => "18902", "7003" => "18903"})
+      runner.should_not_receive(:kill)
+
+      lambda { runner.stop }.should raise_error(Mirage::ClientError)
+    end
+
+
+    it 'should stop the instance running on the given port' do
+      options = {:port => [7001]}
+      runner = Mirage::Runner.new
+      runner.options = options
+
+      runner.should_receive(:mirage_process_ids).with([7001]).and_return({"7001" => "18901"})
+      runner.should_receive(:kill).with("18901") do
+        runner.rspec_reset
+        runner.stub(:mirage_process_ids).with([7001]).and_return({})
+      end
+
+      Mirage::Runner.should_receive(:new).and_return(runner)
+      runner.invoke(:stop, [], options)
+    end
+
+    it 'should stop the instance running on the given ports' do
+      options = {:port => [7001, 7002]}
+      runner = Mirage::Runner.new
+      runner.options = options
+
+      runner.should_receive(:mirage_process_ids).with([7001, 7002]).and_return({"7001" => "18901", "7002" => "18902"})
+      runner.should_receive(:kill).with("18901")
+      runner.should_receive(:kill).with("18902") do
+        runner.rspec_reset
+        runner.stub(:mirage_process_ids).with([7001, 7002]).and_return({})
+      end
+
+      Mirage::Runner.should_receive(:new).and_return(runner)
+      runner.invoke(:stop, [], options)
+    end
+
+    it 'should stop all running instances' do
+      options = {:port => [:all]}
+      runner = Mirage::Runner.new
+      runner.options = options
+
+      runner.should_receive(:mirage_process_ids).with([:all]).and_return({"7001" => "18901", "7002" => "18902"})
+      runner.should_receive(:kill).with("18901")
+      runner.should_receive(:kill).with("18902") do
+        runner.rspec_reset
+        runner.stub(:mirage_process_ids).with([:all]).and_return({})
+      end
+
+      Mirage::Runner.should_receive(:new).and_return(runner)
+      runner.invoke(:stop, [], options)
+
+    end
+
+    it 'should not error when asked to stop Mirage on a port that it is not running on' do
+      options = {:port => [7001]}
+      runner = Mirage::Runner.new
+      runner.options = options
+      runner.should_receive(:mirage_process_ids).with([7001]).any_number_of_times.and_return({})
+
+      Mirage::Runner.should_receive(:new).and_return(runner)
+      lambda { runner.invoke(:stop, [], options) }.should_not raise_error(Mirage::ClientError)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+$LOAD_PATH.unshift "../lib"
+require 'rspec'
+
+shared_context :windows do
+  def process_string_for_mirage(mirage_port, pid)
+    %Q{ruby.exe                      #{pid} Console                    1      6,076 K Running         WIN-ATPGMMC0218\\\\leon        0:01:58 mirage server port #{mirage_port}}
+  end
+
+  before :each do
+    ChildProcess.should_receive(:windows?).any_number_of_times.and_return(true)
+  end
+end
+
+shared_context :linux do
+
+  def process_string_for_mirage(mirage_port, pid)
+    "team     #{pid}  6.2  0.4  84328 20760 pts/1    Sl   22:15   0:00 Mirage Server port #{mirage_port}"
+  end
+
+  before :each do
+    ChildProcess.should_receive(:windows?).any_number_of_times.and_return(false)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000Z
+date: 2012-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17467000 !ruby/object:Gem::Requirement
+  requirement: &13798800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17467000
+  version_requirements: *13798800
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &17465480 !ruby/object:Gem::Requirement
+  requirement: &13797620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0.rc.4
   type: :runtime
   prerelease: false
-  version_requirements: *17465480
+  version_requirements: *13797620
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &17441940 !ruby/object:Gem::Requirement
+  requirement: &13789700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17441940
+  version_requirements: *13789700
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &17440560 !ruby/object:Gem::Requirement
+  requirement: &13788460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17440560
+  version_requirements: *13788460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17439580 !ruby/object:Gem::Requirement
+  requirement: &13787080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17439580
+  version_requirements: *13787080
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &17437920 !ruby/object:Gem::Requirement
+  requirement: &13786060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17437920
+  version_requirements: *13786060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17436460 !ruby/object:Gem::Requirement
+  requirement: &13784820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17436460
+  version_requirements: *13784820
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &17434960 !ruby/object:Gem::Requirement
+  requirement: &13783980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17434960
+  version_requirements: *13783980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17428620 !ruby/object:Gem::Requirement
+  requirement: &13732180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17428620
+  version_requirements: *13732180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17427700 !ruby/object:Gem::Requirement
+  requirement: &13729860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17427700
+  version_requirements: *13729860
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &17426800 !ruby/object:Gem::Requirement
+  requirement: &13727620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17426800
+  version_requirements: *13727620
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &17425900 !ruby/object:Gem::Requirement
+  requirement: &13725580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17425900
+  version_requirements: *13725580
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &17425340 !ruby/object:Gem::Requirement
+  requirement: &13680160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17425340
+  version_requirements: *13680160
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  requirement: &17424280 !ruby/object:Gem::Requirement
+  requirement: &13678600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17424280
+  version_requirements: *13678600
 description: Mirage aids testing of your applications by hosting mock responses so
   that your applications do not have to talk to real endpoints. Its accessible via
   HTTP and has a RESTful interface.
@@ -183,6 +183,7 @@ files:
 - VERSION
 - bin/mirage
 - features/client/clear.feature
+- features/client/configure.feature
 - features/client/preview_responses.feature
 - features/client/put.feature
 - features/client/requests.feature
@@ -213,6 +214,7 @@ files:
 - features/support/mirage.rb
 - full_build.sh
 - lib/mirage/client.rb
+- lib/mirage/client/cli_bridge.rb
 - lib/mirage/client/client.rb
 - lib/mirage/client/error.rb
 - lib/mirage/client/response.rb
@@ -225,8 +227,9 @@ files:
 - server/extensions/hash.rb
 - server/extensions/object.rb
 - server/mock_response.rb
-- spec/running_via_api_spec.rb
-- spec/running_via_api_windows_spec.rb
+- spec/cli_bridge_spec.rb
+- spec/runner_spec.rb
+- spec/spec_helper.rb
 - test.rb
 - views/index.erb
 homepage: https://github.com/lashd/mirage
@@ -246,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3403539479088578528
+      hash: 943352209253188731
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/running_via_api_spec.rb

@@ -1,147 +0,0 @@
-$LOAD_PATH.unshift "../lib"
-require 'rspec'
-require 'mirage/client'
-
-def process_string_for_mirage(mirage_port, pid)
-  "team     #{pid}  6.2  0.4  84328 20760 pts/1    Sl   22:15   0:00 Mirage Server port #{mirage_port}"
-end
-
-include Mirage
-
-unless ChildProcess.windows?
-  describe Mirage do
-
-    describe 'starting' do
-      before(:each) do
-        @runner = mock
-        Runner.should_receive(:new).and_return(@runner)
-      end
-
-      it 'should start Mirage on port 7001 by default' do
-        @runner.should_receive(:invoke).with(:start, [], {:port => 7001})
-        Mirage.start
-      end
-
-      it 'should start mirage on the given port' do
-        options = {:port => 9001}
-        @runner.should_receive(:invoke).with(:start, [], options)
-        Mirage.start options
-      end
-    end
-
-    describe 'stopping' do
-      before(:each) do
-        @runner = mock
-        Runner.stub(:new).and_return(@runner)
-      end
-
-      it 'should supply single port argument in an array to the runner' do
-        port = 7001
-        @runner.should_receive(:invoke).with(:stop, [], :port => [port])
-        @runner.should_receive(:invoke).with(:stop, [], :port => [:all])
-        Mirage.stop(:port => port)
-        Mirage.stop(:all)
-      end
-
-      it 'should stop multiple instances of Mirage' do
-        ports = 7001, 7002
-        @runner.should_receive(:invoke).with(:stop, [], :port => ports)
-        Mirage.stop(:port => ports)
-      end
-
-    end
-
-    describe Mirage::Runner do
-      it 'should stop the running instance of Mirage' do
-        IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(process_string_for_mirage(7001, 18903))
-
-        IO.should_receive(:popen).with("kill -9 18903") do
-          IO.rspec_reset
-          IO.stub(:popen).and_return("")
-        end
-        Mirage::Runner.new.stop
-      end
-
-      it 'should not stop any instances when more than one is running' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-        #{process_string_for_mirage(7003, 18903)}
-PS
-        IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-        IO.should_not_receive(:popen).with(/kill.*/)
-
-        lambda { Mirage::Runner.new.stop }.should raise_error(Mirage::ClientError)
-
-      end
-
-
-      it 'should stop the instance running on the given port' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-PS
-        IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-        IO.should_receive(:popen).with(/kill -9 18901/) do
-          IO.rspec_reset
-          IO.stub(:popen).and_return(process_string_for_mirage(7002, 18902))
-        end
-
-        Mirage::Runner.new.invoke(:stop, [], {:port => [7001]})
-      end
-
-      it 'should stop the instance running on the given ports' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-        #{process_string_for_mirage(7003, 18903)}
-PS
-        IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-        IO.should_receive(:popen).with(/kill -9 18901/)
-        IO.should_receive(:popen).with(/kill -9 18902/) do
-          IO.rspec_reset
-          IO.stub(:popen).and_return(process_string_for_mirage("7003", 18903))
-        end
-
-        Mirage::Runner.new.invoke(:stop, [], {:port => [7001, 7002]})
-      end
-
-      it 'should stop all running instances' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-        #{process_string_for_mirage(7003, 18903)}
-PS
-        IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-        IO.should_receive(:popen).with(/kill -9 18901/)
-        IO.should_receive(:popen).with(/kill -9 18902/)
-        IO.should_receive(:popen).with(/kill -9 18903/) do
-          IO.rspec_reset
-          IO.stub(:popen).and_return("")
-        end
-
-        Mirage::Runner.new.invoke(:stop, [], {:port => [:all]})
-
-      end
-
-      it 'should not error when asked to stop Mirage on a port that it is not running on' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-PS
-        IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-        IO.should_not_receive(:popen).with(/kill -9 18901/)
-        lambda { Mirage::Runner.new.invoke(:stop, [], {:port => [7002]}) }.should_not raise_error(Mirage::ClientError)
-      end
-
-#  it 'should not start mirage on the same port' do
-#    ps_aux_output =<<PS
-##{process_string_for_mirage(7001, 18901)}
-#PS
-#    IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-#    lambda{Mirage::Runner.new.invoke(:start, [], {:port => 7001})}.should raise_error(Mirage::ClientError)
-#  end
-
-
-    end
-  end
-end

data/spec/running_via_api_windows_spec.rb

@@ -1,187 +0,0 @@
-$LOAD_PATH.unshift "../lib"
-require 'rspec'
-require 'mirage/client'
-
-if ChildProcess.windows?
-
-
-  def process_string_for_mirage(mirage_port, pid)
-    %Q{ruby.exe                      #{pid} Console                    1      6,076 K Running         WIN-ATPGMMC0218\\\\leon        0:01:58 mirage server port #{mirage_port}}
-  end
-
-  include Mirage
-
-  describe Mirage do
-
-    describe 'starting' do
-      before(:each) do
-        @runner = mock
-        Runner.should_receive(:new).and_return(@runner)
-      end
-
-      it 'should start Mirage on port 7001 by default' do
-        @runner.should_receive(:invoke).with(:start, [], {:port => 7001})
-        Mirage.start
-      end
-
-      it 'should start mirage on the given port' do
-        options = {:port => 9001}
-        @runner.should_receive(:invoke).with(:start, [], options)
-        Mirage.start options
-      end
-    end
-
-    describe 'stopping' do
-      before(:each) do
-        @runner = mock
-        Runner.stub(:new).and_return(@runner)
-      end
-
-      it 'should supply single port argument in an array to the runner' do
-        port = 7001
-        @runner.should_receive(:invoke).with(:stop, [], :port => [port])
-        @runner.should_receive(:invoke).with(:stop, [], :port => [:all])
-        Mirage.stop(:port => port)
-        Mirage.stop(:port => :all)
-      end
-
-      it 'should stop multiple instances of Mirage' do
-        ports = 7001, 7002
-        @runner.should_receive(:invoke).with(:stop, [], :port => ports)
-        Mirage.stop(:port => ports)
-      end
-
-    end
-
-    describe Mirage::Runner do
-      it 'should stop the running instance of Mirage' do
-
-        runner = Mirage::Runner.new
-
-        runner.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(process_string_for_mirage(7001, 18903))
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18903/) do
-          runner.rspec_reset
-          runner.stub(:`).and_return("")
-        end
-
-        Mirage::Runner.should_receive(:new).with([], {}, anything).and_return(runner)
-        runner.invoke(:stop, [], nil)
-      end
-
-      it 'should not stop any instances when more than one is running' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-        #{process_string_for_mirage(7003, 18903)}
-PS
-
-        runner = Mirage::Runner.new
-
-        runner.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(ps_aux_output)
-        runner.should_not_receive(:`).with(/taskkill.*/)
-
-        Mirage::Runner.should_receive(:new).with([], {}, anything).and_return(runner)
-
-        lambda { runner.invoke(:stop, [], nil) }.should raise_error(Mirage::ClientError)
-
-      end
-
-
-      it 'should stop the instance running on the given port' do
-
-        task_list_output =<<TASKLIST
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-TASKLIST
-
-        options = {:port => [7001]}
-        runner = Mirage::Runner.new
-        runner.options = options
-
-        runner.should_receive(:`).with(/tasklist.*/).at_least(1).and_return(task_list_output)
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18901/) do
-          runner.rspec_reset
-          runner.stub(:`).and_return(process_string_for_mirage(7002, 18902))
-        end
-
-        Mirage::Runner.should_receive(:new).with([], options, anything).and_return(runner)
-
-        runner.invoke(:stop, [], options)
-      end
-
-      it 'should stop the instance running on the given ports' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-        #{process_string_for_mirage(7003, 18903)}
-PS
-
-        options = {:port => [7001,7002]}
-        runner = Mirage::Runner.new
-        runner.options = options
-
-        runner.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(ps_aux_output)
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18901/)
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18902/) do
-          runner.rspec_reset
-          runner.stub(:`).and_return(process_string_for_mirage("7003", 18903))
-        end
-
-        Mirage::Runner.should_receive(:new).with([], options, anything).and_return(runner)
-        runner.invoke(:stop, [], options)
-      end
-
-      it 'should stop all running instances' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-        #{process_string_for_mirage(7002, 18902)}
-        #{process_string_for_mirage(7003, 18903)}
-PS
-
-        options = {:port => [:all]}
-        runner = Mirage::Runner.new
-        runner.options = options
-
-
-        runner.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(ps_aux_output)
-
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18901/)
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18902/)
-        runner.should_receive(:`).with(/taskkill \/F \/T \/PID 18903/) do
-          runner.rspec_reset
-          runner.stub(:`).and_return("")
-        end
-
-        Mirage::Runner.should_receive(:new).with([], options, anything).and_return(runner)
-        runner.invoke(:stop, [], options)
-
-      end
-
-      it 'should not error when asked to stop Mirage on a port that it is not running on' do
-        ps_aux_output =<<PS
-#{process_string_for_mirage(7001, 18901)}
-PS
-
-        options = {:port => [7002]}
-        runner = Mirage::Runner.new
-
-        runner.should_receive(:`).with(/tasklist.*/).any_number_of_times.and_return(ps_aux_output)
-        runner.should_not_receive(:`).with(/taskkill \/F \/T \/PID 18901/)
-
-        Mirage::Runner.should_receive(:new).with([], options, anything).and_return(runner)
-
-        lambda { runner.invoke(:stop, [], options) }.should_not raise_error(Mirage::ClientError)
-      end
-
-#  it 'should not start mirage on the same port' do
-#    ps_aux_output =<<PS
-##{process_string_for_mirage(7001, 18901)}
-#PS
-#    IO.should_receive(:popen).with(/ps aux.*/).any_number_of_times.and_return(ps_aux_output)
-#    lambda{Mirage::Runner.new.invoke(:start, [], {:port => 7001})}.should raise_error(Mirage::ClientError)
-#  end
-
-
-    end
-  end
-end