mirage 2.2.3 → 2.3.0

data/spec/running_via_api_windows_spec.rb

@@ -0,0 +1,187 @@
+$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

data/test.rb

@@ -1,6 +1,23 @@
-require 'rubygems'
-require './lib/mirage/client'
+require 'sinatra'
+require 'async_sinatra'
 
-client = Mirage.start :port => 9001
+#class App < Sinatra::Base
 
-client.stop
+#class App < Sinatra::Base
+  configure do |config|
+    config.register Sinatra::Async
+    #alias :get :aget
+
+  end
+
+
+
+aget '/' do
+  #EM.add_timer(5) do
+  #  body "hello"
+  #end
+  status 201
+  body "hello"
+end
+#end
+#run App

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000Z
+date: 2012-08-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &26104860 !ruby/object:Gem::Requirement
+  requirement: &17467000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26104860
+  version_requirements: *17467000
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &17465480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *17465480
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &26104180 !ruby/object:Gem::Requirement
+  requirement: &17441940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26104180
+  version_requirements: *17441940
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &26103560 !ruby/object:Gem::Requirement
+  requirement: &17440560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17440560
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &17439580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26103560
+  version_requirements: *17439580
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &26102980 !ruby/object:Gem::Requirement
+  requirement: &17437920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26102980
+  version_requirements: *17437920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &25937820 !ruby/object:Gem::Requirement
+  requirement: &17436460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25937820
+  version_requirements: *17436460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &25937120 !ruby/object:Gem::Requirement
+  requirement: &17434960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25937120
+  version_requirements: *17434960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25936520 !ruby/object:Gem::Requirement
+  requirement: &17428620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25936520
+  version_requirements: *17428620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25935760 !ruby/object:Gem::Requirement
+  requirement: &17427700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25935760
+  version_requirements: *17427700
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &25934980 !ruby/object:Gem::Requirement
+  requirement: &17426800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25934980
+  version_requirements: *17426800
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &25934120 !ruby/object:Gem::Requirement
+  requirement: &17425900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25934120
+  version_requirements: *17425900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &25933360 !ruby/object:Gem::Requirement
+  requirement: &17425340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25933360
+  version_requirements: *17425340
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  requirement: &25932440 !ruby/object:Gem::Requirement
+  requirement: &17424280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25932440
+  version_requirements: *17424280
 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.
@@ -161,13 +183,16 @@ files:
 - VERSION
 - bin/mirage
 - features/client/clear.feature
-- features/client/command_line_interface.feature
-- features/client/mirage_client.feature
+- features/client/preview_responses.feature
 - features/client/put.feature
-- features/client/request.feature
-- features/client/response.feature
+- features/client/requests.feature
+- features/client/running.feature
 - features/client/save_and_revert.feature
-- features/server/command_line_iterface.feature
+- features/client/start.feature
+- features/client/stop.feature
+- features/server/commandline_interface/help.feature
+- features/server/commandline_interface/start.feature
+- features/server/commandline_interface/stop.feature
 - features/server/logging.feature
 - features/server/prime.feature
 - features/server/requests/delete.feature
@@ -182,10 +207,16 @@ files:
 - features/server/templates/put/put_with_substitutions.feature
 - features/server/web_user_interface.feature
 - features/step_definitions/my_steps.rb
+- features/support/command_line.rb
 - features/support/env.rb
+- features/support/hooks.rb
+- features/support/mirage.rb
 - full_build.sh
-- lib/mirage/cli.rb
 - lib/mirage/client.rb
+- lib/mirage/client/client.rb
+- lib/mirage/client/error.rb
+- lib/mirage/client/response.rb
+- lib/mirage/client/runner.rb
 - lib/mirage/client/web.rb
 - mirage.gemspec
 - mirage_server.rb
@@ -194,6 +225,8 @@ 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
 - test.rb
 - views/index.erb
 homepage: https://github.com/lashd/mirage
@@ -213,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2550697504653464882
+      hash: 3403539479088578528
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/features/client/mirage_client.feature

@@ -1,36 +0,0 @@
-@command_line
-Feature: Interacting with Mirage is done via HTTP using  REST style URLs and therefore you can interact with it in any language.
-  If however you are using Ruby, and you want to, you can use the Mirage Client that comes in the Mirage distribution.
-
-  By default the client is configured to connect to an instance of the Mirage server on localhost:7001 which is where
-  the Mirage server starts on by default.
-
-  Background:
-    Given the following gems are required to run the Mirage client test code:
-    """
-    require 'rubygems'
-    require 'rspec'
-    require 'mirage/client'
-    """
-
-
-  Scenario: checking if mirage is running
-    Then I run
-    """
-      Mirage::Client.new.running?.should == false
-    """
-    Given Mirage is running
-    Then I run
-    """
-      Mirage::Client.new.running?.should == true
-    """
-
-
-  Scenario: connecting to mirage running on a different url
-    Given I run 'mirage start -p 9001'
-    Then I run
-    """
-      Mirage::Client.new("http://localhost:9001/mirage").running?.should == true
-    """
-
-

data/features/server/command_line_iterface.feature

@@ -1,45 +0,0 @@
-@command_line
-Feature: Mirage is started from the command line.
-  Mirage logs to mirage.log at the path where Mirage is started from
-
-
-  Background: Mirage usage
-    Given usage information:
-      | Usage: mirage start\|stop [options] |
-      | -p, --port PORT                     |
-      | -d, --defaults DIR                  |
-
-
-  Scenario: Starting with help option
-    Given I run 'mirage --help'
-    Then the usage information should be displayed
-
-
-  Scenario: Starting with an invalid option
-    Given I run 'mirage start --invalid-option'
-    Then the usage information should be displayed
-
-
-  Scenario: Starting mirage
-    Given Mirage is not running
-    When I run 'mirage start'
-    Then mirage should be running on 'http://localhost:7001/mirage'
-    And 'mirage.log' should exist
-
-
-  Scenario: Stopping Mirage
-    Given Mirage is running
-    When I run 'mirage stop'
-    Then Connection should be refused to 'http://localhost:7001/mirage'
-
-
-  Scenario: Starting Mirage on a custom port
-    Given Mirage is not running
-    When I run 'mirage start -p 9001'
-    Then mirage should be running on 'http://localhost:9001/mirage'
-
-  Scenario: Starting Mirage when it is already running
-    Given Mirage is running
-    When I run 'mirage start -p 7001'
-    Then I should see 'Mirage is already running' on the command line
-    Then Connection should be refused to 'http://localhost:9001/mirage' 

data/lib/mirage/cli.rb

@@ -1,69 +0,0 @@
-module Mirage
-  class CLI
-    RUBY_CMD = RUBY_PLATFORM == 'java' ? 'jruby' : 'ruby'
-    class << self
-
-
-      def parse_options args
-        options = {:port => 7001, :defaults => 'responses', :root_directory => '.'}
-
-        opt_parser = OptionParser.new do |opts|
-          opts.banner = "Usage: mirage start|stop [options]"
-          opts.on("-p", "--port PORT", "the port to start Mirage on") do |port|
-            options[:port] = port.to_i
-          end
-
-          opts.on("-d", "--defaults DIR", "location to load default responses from") do |directory|
-            options[:defaults] = directory
-          end
-
-          opts.on('--debug', 'run in debug mode') do
-            options[:debug] = true
-          end
-        end
-        opt_parser.parse args
-
-        options
-      rescue
-        puts opt_parser
-        exit 1
-      end
-
-      def run args
-        unless mirage_process_ids.empty?
-          puts "Mirage is already running"
-          return
-        end
-
-        mirage_server_file = "#{File.dirname(__FILE__)}/../../mirage_server.rb"
-        if windows?
-          command = ["cmd", "/C", "start", "mirage server", RUBY_CMD, mirage_server_file]
-        else
-          command = [RUBY_CMD, mirage_server_file]
-        end
-
-        ChildProcess.build(*(command.concat(args))).start
-      end
-
-      def stop
-        mirage_process_ids.each { |process_id| windows? ? `taskkill /F /T /PID #{process_id}` : `kill -9 #{process_id}` }
-        wait_until { mirage_process_ids.size == 0 }
-      end
-
-      private
-      def mirage_process_ids
-        if windows?
-          [`tasklist /V | findstr "mirage\\ server"`.split(' ')[1]].compact
-        else
-          ["Mirage Server", 'mirage_server'].collect do |process_name|
-            `ps aux | grep "#{process_name}" | grep -v grep`.split(' ')[1]
-          end.find_all { |process_id| process_id != $$.to_s }.compact
-        end
-      end
-
-      def windows?
-        ENV['OS'] == 'Windows_NT'
-      end
-    end
-  end
-end