mirage 1.3.3 → 1.3.4

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/bin/mirage

@@ -7,49 +7,45 @@ include Mirage::Util
 RUBY_CMD = RUBY_PLATFORM == 'java' ? 'jruby' : 'ruby'
 
 
-def start_mirage(args, mirage)
+def start_mirage(args)
   puts "Starting Mirage"
 
   if windows?
-    command = ["cmd", "/C", "start",  "\"mirage server\"", RUBY_CMD, "#{File.dirname(__FILE__)}/../lib/start_mirage.rb"]
+    command = ["cmd", "/C", "start", "\"mirage server\"", RUBY_CMD, "#{File.dirname(__FILE__)}/../lib/start_mirage.rb"]
   else
-   command = [RUBY_CMD, "#{File.dirname(__FILE__)}/../lib/start_mirage.rb"]
+    command = [RUBY_CMD, "#{File.dirname(__FILE__)}/../lib/start_mirage.rb"]
   end
   ChildProcess.build(*(command.concat(args))).start
-
-  wait_until do
-    mirage.running?
-  end
+  Mirage::Client.new "http://localhost:#{parse_options(ARGV)[:port]}/mirage"
 end
 
 
-def stop_mirage
+def mirage_process_ids
   if windows?
-    process_id = `tasklist /V | findstr "mirage\\ server"`.split(' ')[1]
-    `taskkill /F /T /PID #{process_id}` if process_id
+    [`tasklist /V | findstr "mirage\\ server"`.split(' ')[1]].compact
   else
-    begin
-      ["Mirage Server", 'mirage start', 'start_mirage'].each do |process_name|
-        process_id = `ps aux | grep "#{process_name}" | grep -v grep`.split(' ')[1]
-        system "kill -9 #{process_id}" if process_id
-      end
-    rescue
-      puts 'Mirage is not running'
-    end
+    ["Mirage Server", 'start_mirage'].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
 
-if ARGV.include?('start')
+def stop_mirage
+  mirage_process_ids.each { |process_id| windows? ? `taskkill /F /T /PID #{process_id}` : `kill -9 #{process_id}` }
+end
 
-  options = parse_options(ARGV)
-  mirage_client = Mirage::Client.new "http://localhost:#{options[:port]}/mirage"
+if ARGV.include?('start')
 
-  if mirage_client.running?
-    puts "Mirage already running"
+  unless mirage_process_ids.empty?
+    puts "Mirage is already running"
     exit 1
   end
 
-  start_mirage(ARGV, mirage_client)
+  mirage_client = start_mirage(ARGV)
+  wait_until do
+    mirage_client.running?
+  end
+
   begin
     mirage_client.prime
   rescue Mirage::InternalServerException => e

data/features/server/command_line_iterface.feature

@@ -36,4 +36,10 @@ Feature: Mirage is started from the command line.
   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'
+    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 9001'
+      Then I should see 'Mirage is already running' on the command line
+      Then Connection should be refused to 'http://localhost:9001/mirage' 

data/features/support/env.rb

@@ -5,15 +5,16 @@ require 'cucumber'
 require 'rspec'
 require 'mechanize'
 
+include Mirage::Util
 SCRATCH = './scratch'
 RUBY_CMD = RUBY_PLATFORM == 'JAVA' ? 'jruby' : 'ruby'
+BLANK_RUBYOPT_CMD = windows? ? 'set RUBYOPT=' : "export RUBYOPT=''"
 $log_file_marker = 0
 
-
 module CommandLine
   def execute command
     command_line_output_path = "#{SCRATCH}/commandline_output.txt"
-    system "export RUBYOPT='' && cd #{SCRATCH} && #{command} > #{File.basename(command_line_output_path)}"
+    system "#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && #{command} > #{File.basename(command_line_output_path)}"
     File.read(command_line_output_path)
   end
 end
@@ -46,11 +47,11 @@ module Regression
   include CommandLine
 
   def stop_mirage
-    system "export RUBYOPT='' && cd #{SCRATCH} && mirage stop"
+    system "#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && mirage stop"
   end
 
   def start_mirage
-    system "export RUBYOPT='' && cd #{SCRATCH} && mirage start"
+    system "#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && mirage start"
   end
 
   def run command
@@ -91,11 +92,13 @@ Before do
   end
 
   Dir["#{SCRATCH}/*"].each do |file|
-      FileUtils.rm_rf(file) unless file == "#{SCRATCH}/mirage.log"
+    FileUtils.rm_rf(file) unless file == "#{SCRATCH}/mirage.log"
   end
 
-  @mirage_log_file = File.open("#{SCRATCH}/mirage.log")
-  @mirage_log_file.seek(0,IO::SEEK_END)
+  if File.exists? "#{SCRATCH}/mirage.log"
+    @mirage_log_file = File.open("#{SCRATCH}/mirage.log")
+    @mirage_log_file.seek(0, IO::SEEK_END)
+  end
 end
 
 

data/lib/mirage/core.rb

@@ -91,7 +91,6 @@ module Mirage
       pattern = request['pattern'] ? /#{request['pattern']}/ : :basic
       name = args.join('/')
       is_default = request['default'] == 'true'
-      the_request = request
 
       response = MockResponse.new(name, response_value, pattern, delay.to_f, is_default)
 
@@ -189,7 +188,7 @@ module Mirage
     end
 
     def delete_response(response_id)
-      RESPONSES.each do |name, response_set|
+      RESPONSES.values.each do |response_set|
         response_set.each { |key, response| response_set.delete(key) if response.response_id == response_id }
       end
     end

data/mirage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mirage}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]

data/rakefile

@@ -35,7 +35,7 @@ end
 Jeweler::RubygemsDotOrgTasks.new
 
 
-require 'cucumber'
+require 'cucumber'                                    
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "mode=regression features --format pretty"

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Leon Davis
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1026754404301644285
+      hash: 2550934964107386131
       segments: 
       - 0
       version: "0"