mirage 2.4.1 → 2.4.2

data/Gemfile

@@ -1,7 +1,6 @@
 source :rubygems
 
 gem 'sinatra'
-gem "eventmachine", "1.0.0.rc.4"
 gem 'childprocess'
 gem "waitforit"
 gem "thor"

data/Gemfile.lock

@@ -16,9 +16,9 @@ GEM
     diff-lcs (1.1.3)
     domain_name (0.5.1)
       unf (~> 0.0.3)
-    eventmachine (1.0.0.rc.4)
-    eventmachine (1.0.0.rc.4-java)
-    eventmachine (1.0.0.rc.4-x86-mingw32)
+    eventmachine (1.0.0)
+    eventmachine (1.0.0-java)
+    eventmachine (1.0.0-x86-mingw32)
     ffi (1.0.11)
     ffi (1.0.11-java)
     gherkin (2.7.2)
@@ -97,7 +97,6 @@ PLATFORMS
 DEPENDENCIES
   childprocess
   cucumber
-  eventmachine (= 1.0.0.rc.4)
   jeweler
   jruby-openssl
   mechanize

data/HISTORY

@@ -1,3 +1,4 @@
+V2.4.2 - update eventmachine, make sure Mirage.start always returns a client
 V2.4.1 - adding rdoc for configure method
 V2.4.0 - Adding ability to set defaults
 V2.3.0 - Enhanced commandline/programmatic api

data/README.md

@@ -20,6 +20,7 @@ What's New?
 ----------- 
 ### 2.4.0
 ---------
+#### What do I get?
 ##### 1: Configure your client with defaults for each of your responses
 Remove the repetition of setting things like the content-type each to time you put a response on to Mirage
 
@@ -31,6 +32,8 @@ Remove the repetition of setting things like the content-type each to time you p
     end  
     
     client.put("greeting", "hello") -> template put on to Mirage with a delay of 0.5 seconds and content-type text/xml configured
+#### What do I have to do to upgrade?
+Nothing, this is a new feature. Let me know if you have any problems :)
     
     
 

data/VERSION

@@ -1 +1 @@
-2.4.1
+2.4.2

data/lib/mirage/client/cli_bridge.rb

@@ -1,7 +1,6 @@
 module Mirage
 module CLIBridge
-  def mirage_process_ids *ports
-    ports.flatten!
+  def mirage_process_ids ports
     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|
@@ -11,7 +10,7 @@ module CLIBridge
       end
     end
 
-    return mirage_instances if ports.first.to_s.downcase == "all"
+    return mirage_instances if ports.first.to_s == "all" || ports.empty?
     Hash[mirage_instances.find_all { |port, pid| ports.include?(port.to_i) }]
   end
 
@@ -21,7 +20,6 @@ module CLIBridge
 
   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 #{$$}")

data/lib/mirage/client/client.rb

@@ -10,10 +10,22 @@ module Mirage
     #
     #   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.
+    #   Client.new(hash) => a client that is configured to connect to an instance of Mirage running on the specified url or localhost port.
+    #     e.g: Client.new(:url => url) or Client.new(:port => port)
     #
     #   a block can be passed to configure the client with defaults: see configure
-    def initialize url="http://localhost:7001/mirage", &block
-      @url = url
+    def initialize options={:url => "http://localhost:7001/mirage"}, &block
+      if options.is_a?(String) && options =~ URI.regexp
+        warn("Client.new(url): Deprecated usage, please use :url => url | :port => port")
+        @url = options
+      elsif options.kind_of?(Hash) && options[:port]
+        @url = "http://localhost:#{options[:port]}/mirage"
+      elsif options.kind_of?(Hash) && options[:url]
+        @url = options[:url]
+      else
+        raise "specify a valid URL or port"
+      end
+
       reset
       configure &block if block_given?
     end
@@ -57,7 +69,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}
+      @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))
@@ -135,6 +147,10 @@ module Mirage
       build_response(http_put("#{@url}/defaults", ''))
     end
 
+    def == client
+      client.is_a?(Client) && @url == client.url
+    end
+
     private
     def build_response response
       case response.code.to_i

data/lib/mirage/client/runner.rb

@@ -12,6 +12,7 @@ module Mirage
     #   Mirage.start :port => 9001 -> Configured MirageClient ready to use.
     def start options={:port => 7001}
       Runner.new.invoke(:start, [], options)
+      Mirage::Client.new(options)
     end
 
     # Stop locally running instance(s) of Mirage
@@ -20,7 +21,7 @@ module Mirage
     #   Mirage.stop -> Will stop mirage if there is only instance running. Can be running on any port.
     #   Mirage.stop :port => port -> stop mirage on a given port
     #   Mirage.stop :port => [port1, port2...] -> stops multiple running instances of Mirage
-    def stop options={}
+    def stop options={:port => []}
       options = {:port => :all} if options == :all
 
       if options[:port]
@@ -40,7 +41,7 @@ module Mirage
     #   Mirage.running? :port => port -> boolean indicating whether Mirage is running on *locally* on the given port
     #   Mirage.running? url -> boolean indicating whether Mirage is running on the given URL
     def running? options_or_url = {:port => 7001}
-      url = options_or_url.is_a?(Hash) ? "http://localhost:#{options_or_url[:port]}/mirage" : options_or_url
+      url = options_or_url.kind_of?(Hash) ? "http://localhost:#{options_or_url[:port]}/mirage" : options_or_url
       http_get(url) and return true
     rescue Errno::ECONNREFUSED
       return false
@@ -59,15 +60,17 @@ module Mirage
     method_option :debug, :type => :boolean, :default => false, :desc => "run in debug mode"
 
     def start
-      unless mirage_process_ids([options[:port]]).empty?
-        puts "Mirage is already running: #{mirage_process_ids([options[:port]]).values.join(",")}"
+      port = options[:port]
+      process_ids = mirage_process_ids([port])
+      unless process_ids.empty?
+        warn "Mirage is already running: #{process_ids.values.join(",")}"
         return
       end
 
       mirage_server_file = "#{File.dirname(__FILE__)}/../../../mirage_server.rb"
 
       if ChildProcess.windows?
-        command = ["cmd", "/C", "start", "mirage server port #{options[:port]}", RUBY_CMD, mirage_server_file]
+        command = ["cmd", "/C", "start", "mirage server port #{port}", RUBY_CMD, mirage_server_file]
       else
         command = [RUBY_CMD, mirage_server_file]
       end
@@ -76,41 +79,24 @@ module Mirage
       command = command.concat(options.to_a).flatten.collect { |arg| arg.to_s }
       ChildProcess.build(*command).start
 
-      mirage_client = Mirage::Client.new "http://localhost:#{options[:port]}/mirage"
-      wait_until(:timeout_after => 30.seconds) { mirage_client.running? }
+      wait_until(:timeout_after => 30.seconds) { Mirage.running?(options) }
 
       begin
-        mirage_client.prime
+        Mirage::Client.new(options).prime
       rescue Mirage::InternalServerException => e
         puts "WARN: #{e.message}"
       end
-      mirage_client
     end
 
     desc "stop", "Stops mirage"
-    method_option :port, :aliases => "-p", :type => :array, :banner => "[port_1 port_2|all]", :desc => "port(s) of mirage instance(s). ALL stops all running instances"
+    method_option :port, :aliases => "-p", :type => :array, :default => [], :banner => "[port_1 port_2|all]", :desc => "port(s) of mirage instance(s). ALL stops all running instances"
 
     def stop
-      ports = options[:port] || []
-      if  ports.empty?
-        mirage_process_ids = mirage_process_ids([:all])
-        raise ClientError.new("Mirage is running on ports #{mirage_process_ids.keys.sort.join(", ")}. Please run mirage stop -p [PORT(s)] instead") if mirage_process_ids.size > 1
-      end
-
-      ports = case ports
-                when %w(all), [:all], []
-                  [:all]
-                else
-                  ports.collect { |port| port.to_i }
-              end
-
-      mirage_process_ids(ports).values.each do |process_id|
-        kill process_id
-      end
-
-      wait_until do
-        mirage_process_ids(ports).empty?
-      end
+      ports = options[:port].collect{|port| port=~/\d+/ ? port.to_i : port}
+      process_ids = mirage_process_ids(ports)
+      raise ClientError.new("Mirage is running on ports #{process_ids.keys.sort.join(", ")}. Please run mirage stop -p [PORT(s)] instead") if (process_ids.size > 1 && ports.empty?)
+      process_ids.values.each { |process_id| kill process_id }
+      wait_until { mirage_process_ids(options[:port]).empty? }
     end
 
   end

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.4.1"
+  s.version = "2.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2012-09-11"
+  s.date = "2012-09-20"
   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 = [
@@ -69,6 +69,7 @@ Gem::Specification.new do |s|
     "server/extensions/object.rb",
     "server/mock_response.rb",
     "spec/cli_bridge_spec.rb",
+    "spec/client_spec.rb",
     "spec/runner_spec.rb",
     "spec/spec_helper.rb",
     "test.rb",
@@ -86,7 +87,6 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<eventmachine>, ["= 1.0.0.rc.4"])
       s.add_runtime_dependency(%q<childprocess>, [">= 0"])
       s.add_runtime_dependency(%q<waitforit>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
@@ -101,7 +101,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<eventmachine>, ["= 1.0.0.rc.4"])
       s.add_dependency(%q<childprocess>, [">= 0"])
       s.add_dependency(%q<waitforit>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
@@ -117,7 +116,6 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<eventmachine>, ["= 1.0.0.rc.4"])
     s.add_dependency(%q<childprocess>, [">= 0"])
     s.add_dependency(%q<waitforit>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])

data/spec/client_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'mirage/client'
+
+
+
+describe Mirage::Client do
+  include Mirage
+
+  before :each do
+    @response = mock('response').as_null_object
+  end
+
+
+  it 'is configured to connect to local host port 7001 by default' do
+    client = Client.new
+    client.should_receive(:http_put).with(/localhost:7001/, anything, anything).and_return(@response)
+    client.put "greeting", "hello"
+  end
+
+  it 'can be configured with a url pointing to Mirage' do
+    url = "http://url.for.mirage"
+    client = Client.new url
+    client.should_receive(:http_put).with(/#{url}/, anything, anything).and_return(@response)
+    client.put "greeting", "hello"
+  end
+
+  it 'can be configured with a port refering to which port Mirage is running on on localhost' do
+    port = 9001
+    client = Client.new :port => port
+    client.should_receive(:http_put).with(/localhost:#{port}/, anything, anything).and_return(@response)
+    client.put "greeting", "hello"
+  end
+
+  it 'raises an error if neither a port or url specified in the argument' do
+    expect{Client.new({})}.should raise_error()
+    expect{Client.new("rubbish")}.should raise_error()
+  end
+end

data/spec/runner_spec.rb

@@ -13,7 +13,8 @@ describe Mirage do
 
     it 'should start Mirage on port 7001 by default' do
       @runner.should_receive(:invoke).with(:start, [], {:port => 7001})
-      Mirage.start
+      client = Mirage.start
+      client.should == Mirage::Client.new
     end
 
     it 'should start mirage on the given port' do
@@ -47,24 +48,31 @@ describe Mirage do
 
   describe Mirage::Runner do
     it 'should stop the running instance of Mirage' do
-
+      options = {:port => []}
       runner = Mirage::Runner.new
-      runner.should_receive(:mirage_process_ids).with([:all]).any_number_of_times.and_return({"7001" => "18901"})
+      runner.options = options
+
+      runner.should_receive(:mirage_process_ids).with([]).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({})
+        runner.should_receive(:mirage_process_ids).with([]).any_number_of_times.and_return({})
       end
 
-      runner.stop
+      Mirage::Runner.should_receive(:new).and_return(runner)
+      runner.invoke(:stop, [], options)
     end
 
     it 'should not stop any instances when more than one is running' do
+      options = {:port => []}
       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.options = options
+
+      runner.should_receive(:mirage_process_ids).with([]).any_number_of_times.and_return({"7001" => "18901", "7002" => "18902", "7003" => "18903"})
       runner.should_not_receive(:kill)
+      Mirage::Runner.should_receive(:new).and_return(runner)
 
-      lambda { runner.stop }.should raise_error(Mirage::ClientError)
+      lambda { runner.invoke(:stop, [], options) }.should raise_error(Mirage::ClientError)
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000Z
+date: 2012-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17771380 !ruby/object:Gem::Requirement
+  requirement: &25392540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17771380
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &17770580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *17770580
+  version_requirements: *25392540
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &17769600 !ruby/object:Gem::Requirement
+  requirement: &25391440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17769600
+  version_requirements: *25391440
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &17768660 !ruby/object:Gem::Requirement
+  requirement: &25390580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17768660
+  version_requirements: *25390580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17767820 !ruby/object:Gem::Requirement
+  requirement: &25389580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17767820
+  version_requirements: *25389580
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &17766980 !ruby/object:Gem::Requirement
+  requirement: &25384880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17766980
+  version_requirements: *25384880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17765980 !ruby/object:Gem::Requirement
+  requirement: &25383820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17765980
+  version_requirements: *25383820
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &17765040 !ruby/object:Gem::Requirement
+  requirement: &25382520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17765040
+  version_requirements: *25382520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17764080 !ruby/object:Gem::Requirement
+  requirement: &25381620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17764080
+  version_requirements: *25381620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17759740 !ruby/object:Gem::Requirement
+  requirement: &25380220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17759740
+  version_requirements: *25380220
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &17759060 !ruby/object:Gem::Requirement
+  requirement: &25379320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17759060
+  version_requirements: *25379320
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &17758100 !ruby/object:Gem::Requirement
+  requirement: &25378420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17758100
+  version_requirements: *25378420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &17757280 !ruby/object:Gem::Requirement
+  requirement: &25377700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17757280
+  version_requirements: *25377700
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  requirement: &17756480 !ruby/object:Gem::Requirement
+  requirement: &25375700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17756480
+  version_requirements: *25375700
 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.
@@ -228,6 +217,7 @@ files:
 - server/extensions/object.rb
 - server/mock_response.rb
 - spec/cli_bridge_spec.rb
+- spec/client_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 - test.rb
@@ -249,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2060049518291107890
+      hash: -1894067030623386639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: