mirage 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e58c3eac183631006bdd36e2d7ba619d46e805
-  data.tar.gz: b0193298986161038a60c3b93bcdc5fbd7bd55f0
+  metadata.gz: 2a243991a8b8aaa8643ddc35f9e4b817d4fd1642
+  data.tar.gz: 7ff22557aaf2b0d086595945bc44334c2c50a425
 SHA512:
-  metadata.gz: 6279f2660b94299109de7effa803276cd96421b13144759e464d5df5719a57683cb1699e224739d5f8dcb433e1f418ca40337f97969fbb0cb8714a209bec5a60
-  data.tar.gz: a956b41c885c0a7719c97dec4742113acf4edf44aa23aef486f90de3cb1b6e963b2b8e83fdaad356c55db5cf3078c4222e6a40668307a79ea374553026ddfe83
+  metadata.gz: bbe396329fc373749c1d9bb3c62a704a9e1acfd2b0a0f97e2f19561029d7a31a6b40fe6e62e0f76d1527172f1e154e1dc0be58ecc559e736e1b6b376f661e4c4
+  data.tar.gz: 1da9a76e891b9a7e682bd6bf757569a4aa700f924203bb16908310a8853392e27ca53c79ab50158ac6b8f696469c20a243d948b8e43633b632c72e1e46749441

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - '1.9.3'
-  - '2.0.0'
+  - '2.0.0'
+  - '2.1.5'

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'sinatra'
 gem 'childprocess'
-gem "waitforit"
 gem "thor"
 gem "ptools"
 gem "httparty"

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
-    backports (3.3.5)
+    backports (3.6.8)
     bouncy-castle-java (1.5.0147)
     builder (3.2.2)
     childprocess (0.3.9)
@@ -106,7 +106,6 @@ GEM
       tilt (~> 1.3)
     thor (0.18.1)
     tilt (1.4.1)
-    waitforit (0.0.1)
     win32-api (1.5.0-x86-mingw32)
     win32-file (0.6.8)
       win32-api (>= 1.2.1)
@@ -141,4 +140,3 @@ DEPENDENCIES
   sinatra
   sinatra-contrib
   thor
-  waitforit

data/README.md

@@ -1,4 +1,3 @@
-[![Build Status](https://travis-ci.org/lashd/mirage.png)](https://travis-ci.org/lashd/mirage)
 Mirage
 ======
 Mirage aids testing of your applications by hosting mock responses so that your applications do not have to talk to real endpoints. It's accessible via HTTP and has a RESTful interface.    

data/VERSION

@@ -1 +1 @@
-3.0.10
+3.0.11

data/features/support/command_line.rb

@@ -1,5 +1,9 @@
 require 'tempfile'
+require 'wait_methods'
+
 module CommandLine
+  include Mirage::WaitMethods
+
   def run command
     output = Tempfile.new("child")
     Dir.chdir SCRATCH do
@@ -8,7 +12,7 @@ module CommandLine
       process.io.stdout = output
       process.io.stderr = output
       process.start
-      wait_until(:timeout_after => 30.seconds) { process.exited? }
+      wait_until(:timeout_after => 30) { process.exited? }
     end
     File.read(output.path)
   end
@@ -30,4 +34,4 @@ module CommandLine
 end
 
 World CommandLine
-include CommandLine
+include CommandLine

data/lib/mirage/client.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
+require 'wait_methods'
 require 'client/template'
 require 'client/error'
 require 'client/cli_bridge'
@@ -7,4 +8,4 @@ require 'client/template'
 require 'client/templates'
 require 'client/requests'
 require 'client/request'
-require 'client/client'
+require 'client/client'

data/lib/mirage/client/runner.rb

@@ -1,8 +1,8 @@
 require 'thor'
-require 'waitforit'
 require 'childprocess'
 require 'uri'
 require 'httparty'
+
 module Mirage
   class << self
 
@@ -30,7 +30,7 @@ module Mirage
       end
 
       Runner.new.invoke(:stop, [], options)
-    rescue ClientError => e
+    rescue ClientError
       raise ClientError.new("Mirage is running multiple ports, please specify the port(s) see api/tests for details")
     end
 
@@ -52,6 +52,8 @@ module Mirage
 
   class Runner < Thor
     include CLIBridge
+    include Mirage::WaitMethods
+
     RUBY_CMD = ChildProcess.jruby? ? 'jruby' : 'ruby'
 
     desc "start", "Starts mirage"
@@ -79,7 +81,7 @@ module Mirage
       command = command.concat(options.to_a).flatten.collect { |arg| arg.to_s }
       ChildProcess.build(*command).start
 
-      wait_until(:timeout_after => 30.seconds) { Mirage.running?(options) }
+      wait_until(:timeout_after => 30) { Mirage.running?(options) }
 
       begin
         Mirage::Client.new(options).prime
@@ -100,4 +102,4 @@ module Mirage
     end
 
   end
-end
+end

data/lib/mirage/wait_methods.rb

@@ -0,0 +1,24 @@
+module Mirage
+
+  class TimeoutException < Exception
+  end
+
+
+  # module WaitMethods - contains methods for waiting
+  module WaitMethods
+    # Wait until a the supplied block returns true
+    # @example
+    #   wait_until do
+    #     (rand % 2) == 0
+    #   end
+    def wait_until(opts = {})
+      opts = {timeout_after: 5, retry_every: 0.1}.merge(opts)
+      start_time = Time.now
+      until Time.now > start_time + opts[:timeout_after]
+        return true if yield == true
+        sleep opts[:retry_every]
+      end
+      fail TimeoutException, 'Action took to long'
+    end
+  end
+end

data/mirage.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mirage 3.0.10 ruby lib
+# stub: mirage 3.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "3.0.10"
+  s.version = "3.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Leon Davis"]
-  s.date = "2015-04-16"
+  s.date = "2016-03-22"
   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 = [
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
     "lib/mirage/client/template/model/common_methods.rb",
     "lib/mirage/client/template/model/instance_methods.rb",
     "lib/mirage/client/templates.rb",
+    "lib/mirage/wait_methods.rb",
     "mirage.gemspec",
     "mirage_server.rb",
     "server/app.rb",
@@ -95,18 +96,19 @@ Gem::Specification.new do |s|
     "server/mock_response.rb",
     "server/mock_response_set.rb",
     "server/server.rb",
-    "spec/client/cli_bridge_spec.rb",
-    "spec/client/client_spec.rb",
-    "spec/client/helpers/method_builder_spec.rb",
-    "spec/client/request_spec.rb",
-    "spec/client/requests_spec.rb",
-    "spec/client/runner_spec.rb",
-    "spec/client/template/configuration_spec.rb",
-    "spec/client/template/model/common_methods_spec.rb",
-    "spec/client/template/model/instance_methods_spec.rb",
-    "spec/client/template/model_spec.rb",
-    "spec/client/template_spec.rb",
-    "spec/client/templates_spec.rb",
+    "spec/mirage/client/cli_bridge_spec.rb",
+    "spec/mirage/client/client_spec.rb",
+    "spec/mirage/client/helpers/method_builder_spec.rb",
+    "spec/mirage/client/request_spec.rb",
+    "spec/mirage/client/requests_spec.rb",
+    "spec/mirage/client/runner_spec.rb",
+    "spec/mirage/client/template/configuration_spec.rb",
+    "spec/mirage/client/template/model/common_methods_spec.rb",
+    "spec/mirage/client/template/model/instance_methods_spec.rb",
+    "spec/mirage/client/template/model_spec.rb",
+    "spec/mirage/client/template_spec.rb",
+    "spec/mirage/client/templates_spec.rb",
+    "spec/mirage/wait_methods_spec.rb",
     "spec/resources/binary.file",
     "spec/server/binary_data_checker_spec.rb",
     "spec/server/helpers/http_headers_spec.rb",
@@ -124,7 +126,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/lashd/mirage"
   s.licenses = ["MIT"]
   s.post_install_message = "\n===============================================================================\nMirage v3:\n\nMirage has just gone up a major version from 2 to 3. If your project uses\na previous version take a look at https://github.com/lashd/mirage to see\nwhat's changed\n===============================================================================\n"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.3.0"
   s.summary = "Mirage is a easy mock server for testing your applications"
 
   if s.respond_to? :specification_version then
@@ -133,7 +135,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<childprocess>, [">= 0"])
-      s.add_runtime_dependency(%q<waitforit>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<ptools>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
@@ -146,7 +147,6 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<childprocess>, [">= 0"])
-      s.add_dependency(%q<waitforit>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<ptools>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
@@ -160,7 +160,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<childprocess>, [">= 0"])
-    s.add_dependency(%q<waitforit>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<ptools>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])

data/spec/mirage/wait_methods_spec.rb

@@ -0,0 +1,42 @@
+require 'mirage/wait_methods'
+module Mirage
+  describe WaitMethods do
+    subject do
+      Object.new.tap do |o|
+        o.extend(described_class)
+      end
+    end
+
+    let(:default_options) { { timeout_after: 0.1, retry_every: 0.05 } }
+
+    it 'waits until the prescribed thing has happened' do
+      expect { subject.wait_until(default_options) { true } }.to_not raise_exception
+    end
+
+    it 'should keep trying for a specified period' do
+      start_time = Time.now
+
+      expect { subject.wait_until(default_options) { false } }.to raise_exception TimeoutException
+
+      expect(Time.now - default_options[:timeout_after]).to be > start_time
+    end
+
+    context 'timeout_after specified' do
+      it 'throws an exception if when the prescribed action does not happen in time' do
+        expect { subject.wait_until(default_options) { false } }.to raise_error TimeoutException
+      end
+    end
+
+    context 'retry time specified' do
+      it 'retries at the given interval' do
+        count = 0
+        expect do
+          subject.wait_until(timeout_after: default_options[:timeout_after] * 2, retry_every: 0.1) do
+            count += 1
+          end
+        end.to raise_exception TimeoutException
+        expect(count).to eq(2)
+      end
+    end
+  end
+end

metadata

@@ -1,181 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: waitforit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Mirage aids testing of your applications by hosting mock responses so
@@ -188,10 +174,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".ruby-gemset"
-- ".ruby-version"
-- ".simplecov"
-- ".travis.yml"
+- .ruby-gemset
+- .ruby-version
+- .simplecov
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - HISTORY
@@ -253,6 +239,7 @@ files:
 - lib/mirage/client/template/model/common_methods.rb
 - lib/mirage/client/template/model/instance_methods.rb
 - lib/mirage/client/templates.rb
+- lib/mirage/wait_methods.rb
 - mirage.gemspec
 - mirage_server.rb
 - server/app.rb
@@ -265,18 +252,19 @@ files:
 - server/mock_response.rb
 - server/mock_response_set.rb
 - server/server.rb
-- spec/client/cli_bridge_spec.rb
-- spec/client/client_spec.rb
-- spec/client/helpers/method_builder_spec.rb
-- spec/client/request_spec.rb
-- spec/client/requests_spec.rb
-- spec/client/runner_spec.rb
-- spec/client/template/configuration_spec.rb
-- spec/client/template/model/common_methods_spec.rb
-- spec/client/template/model/instance_methods_spec.rb
-- spec/client/template/model_spec.rb
-- spec/client/template_spec.rb
-- spec/client/templates_spec.rb
+- spec/mirage/client/cli_bridge_spec.rb
+- spec/mirage/client/client_spec.rb
+- spec/mirage/client/helpers/method_builder_spec.rb
+- spec/mirage/client/request_spec.rb
+- spec/mirage/client/requests_spec.rb
+- spec/mirage/client/runner_spec.rb
+- spec/mirage/client/template/configuration_spec.rb
+- spec/mirage/client/template/model/common_methods_spec.rb
+- spec/mirage/client/template/model/instance_methods_spec.rb
+- spec/mirage/client/template/model_spec.rb
+- spec/mirage/client/template_spec.rb
+- spec/mirage/client/templates_spec.rb
+- spec/mirage/wait_methods_spec.rb
 - spec/resources/binary.file
 - spec/server/binary_data_checker_spec.rb
 - spec/server/helpers/http_headers_spec.rb
@@ -308,17 +296,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Mirage is a easy mock server for testing your applications