mirage 2.1.2 → 2.2.2

data/Gemfile

@@ -5,6 +5,7 @@ gem 'childprocess'
 gem "waitforit"
 
 group :development do
+  gem "thin"
   gem 'rake'
   gem 'cucumber'
   gem 'rspec'

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
       gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
+    daemons (1.1.8)
     diff-lcs (1.1.3)
     domain_name (0.5.1)
       unf (~> 0.0.3)
@@ -70,6 +71,10 @@ GEM
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
     term-ansicolor (1.0.7)
+    thin (1.4.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     tilt (1.3.3)
     unf (0.0.4)
       unf_ext
@@ -93,4 +98,5 @@ DEPENDENCIES
   rspec
   sinatra
   sinatra-contrib
+  thin
   waitforit

data/HISTORY

@@ -1,3 +1,5 @@
+V2.2.1/2 - Code tidy up
+V2.2.0 - Api for starting and stopping Mirage locally
 V2.1.2 - rename status_code to status
 V2.1.1 - Set response code and tidy ups
 V2.0.16 - minor typo fix for window command window title in windows

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.2

data/bin/mirage

@@ -1,68 +1,16 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'childprocess'
-ROOT_DIR = File.dirname(__FILE__)
-$LOAD_PATH.unshift("#{ROOT_DIR}/../lib")
-$LOAD_PATH.unshift("#{ROOT_DIR}/../server")
 
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 require 'mirage/client'
-require 'waitforit'
-require 'util'
 
 
-include Mirage::Util
-RUBY_CMD = RUBY_PLATFORM == 'java' ? 'jruby' : 'ruby'
-
-def start_mirage(args)
-  puts "Starting Mirage"
-
-  if windows?
-    command = ["cmd", "/C", "start", "mirage server", RUBY_CMD, "#{File.dirname(__FILE__)}/../mirage_server.rb"]
-  else
-    command = [RUBY_CMD, "#{File.dirname(__FILE__)}/../mirage_server.rb"]
-  end
-  ChildProcess.build(*(command.concat(args))).start
-  Mirage::Client.new "http://localhost:#{parse_options(ARGV)[:port]}/mirage"
-end
-
-
-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 stop_mirage
-  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
 
 if ARGV.include?('start')
-
-  unless mirage_process_ids.empty?
-    puts "Mirage is already running"
-    exit 1
-  end
-
-  mirage_client = start_mirage(ARGV)
-  wait_until :timeout_after => 30.seconds do
-    mirage_client.running?
-  end
-
-  begin
-    mirage_client.prime
-  rescue Mirage::InternalServerException => e
-    puts "WARN: #{e.message}"
-  end
-  
+  Mirage.start ARGV
 elsif ARGV.include?('stop')
-  puts "Stopping Mirage"
-  stop_mirage
+  Mirage.stop
 else
-  parse_options ['--help']
+  Mirage::CLI.parse_options ['--help']
   exit 1
 end

data/features/client/command_line_interface.feature

@@ -0,0 +1,48 @@
+@command_line
+Feature: The Mirage client provides a programmatic interface equivalent to the command line interface. This gives an
+  easy method for bringing a local instance of Mirage in situ inside a test suite.
+
+  The client can only be used to stop Mirage if it is was used to start the running instance.
+
+  Background:
+    Given the following gems are required to run the Mirage client test code:
+    """
+    require 'rubygems'
+    require 'rspec'
+    require 'mirage/client'
+    """
+
+
+  Scenario: Starting mirage with defaults
+    Given Mirage is not running
+    When I run
+    """
+    Mirage.start
+    """
+    Then mirage should be running on 'http://localhost:7001/mirage'
+
+
+  Scenario: Stopping Mirage
+    Given Mirage is not running
+    When I run
+    """
+    Mirage.start
+    Mirage.stop
+    """
+    Then Connection should be refused to 'http://localhost:7001/mirage'
+
+
+  Scenario: Starting Mirage on a custom port
+    Given Mirage is not running
+    And the file './custom_responses_location/default_greetings.rb' contains:
+    """
+    prime do |mirage|
+      mirage.put('greeting', 'hello')
+    end
+    """
+    When I run
+    """
+    Mirage.start :port => 9001, :defaults => './custom_responses_location'
+    """
+    And I send GET to 'http://localhost:9001/mirage/responses/greeting'
+    Then 'hello' should be returned

data/features/client/put.feature

@@ -114,12 +114,16 @@ Feature: the Mirage client provides methods for setting responses and loading de
     """
 
   Scenario: Setting a file as a response
-    Given I run
+    Given the file 'test_file.txt' contains:
+    """
+    test content
+    """
+    And I run
     """
-    Mirage::Client.new.put('download', File.open('README.md'))
+    Mirage::Client.new.put('download', File.open('test_file.txt'))
     """
     When I send GET to 'http://localhost:7001/mirage/responses/download'
-    Then the response should be the same as the content of 'README.md'
+    Then the response should be the same as the content of 'test_file.txt'
 
   Scenario: Setting a response status code
     Given I run

data/features/server/templates/get.feature

@@ -13,11 +13,15 @@ Feature: If you want to see the content of a particular response without trigger
 
 
   Scenario: Peeking a file based response
-    Given I send PUT to 'http://localhost:7001/mirage/templates/some/location/download' with file: README.md and headers:
+    Given the file 'test_file.txt' contains:
+    """
+    test content
+    """
+    And I send PUT to 'http://localhost:7001/mirage/templates/some/location/download' with file: test_file.txt and headers:
       | X-mirage-file | true |
 
     When I send GET to 'http://localhost:7001/mirage/templates/1'
-    Then the response should be the same as the content of 'README.md'
+    Then the response should be the same as the content of 'test_file.txt'
 
 
   Scenario: Peeking a response that does not exist

data/features/step_definitions/my_steps.rb

@@ -36,7 +36,7 @@ Given /^Mirage (is|is not) running$/ do |running|
   if running == 'is'
     start_mirage unless $mirage.running?
   else
-    stop_mirage if $mirage.running?                                                   
+    stop_mirage if $mirage.running?
   end
 end
 
@@ -54,9 +54,10 @@ Given /^the file '(.*)' contains:$/ do |file_path, content|
   FileUtils.rm_rf(file_path) if File.exists?(file_path)
   FileUtils.mkdir_p(File.dirname(file_path))
 
-  file = File.new("#{file_path}", 'w')
-  file.write(content)
-  file.close
+  File.open("#{file_path}", 'w') do |file|
+    file.write(content)
+  end
+
 end
 
 Then /^the usage information should be displayed$/ do
@@ -64,11 +65,13 @@ Then /^the usage information should be displayed$/ do
 end
 Given /^usage information:$/ do |table|
   @usage = table.raw.flatten.collect { |line| normalise(line) }
-end                                                                                                                                                                         
+end
 
 Then /^I run$/ do |text|
   text.gsub!("\"", "\\\\\"")
-  raise "run failed" unless system "#{RUBY_CMD} -e \"#{@code_snippet}\n#{text}\""
+  Dir.chdir SCRATCH do
+    raise "run failed" unless system "#{RUBY_CMD} -e \"#{@code_snippet}\n#{text}\""
+  end
 end
 
 Given /^the following gems are required to run the Mirage client test code:$/ do |text|
@@ -87,7 +90,7 @@ When /^I send (POST|PUT) to '(http:\/\/localhost:7001\/mirage\/(.*?))' with requ
               end
 end
 
-When /^I send (GET|PUT|POST|OPTIONS|HEAD|DELETE) to '(http:\/\/localhost:7001\/mirage([^']*))'$/ do |method, url, endpoint|
+When /^I send (GET|PUT|POST|OPTIONS|HEAD|DELETE) to '(http:\/\/localhost:\d{4}\/mirage([^']*))'$/ do |method, url, endpoint|
   start_time = Time.now
   @response = case method
                 when 'GET' then
@@ -174,7 +177,10 @@ Given /^I send PUT to '(http:\/\/localhost:7001\/mirage\/(.*?))' with file: ([^'
     parameter, value = row[0], row[1]
     headers[parameter]=value
   end
-  http_put(url, File.new(path), headers)
+
+  Dir.chdir SCRATCH do
+    http_put(url, File.new(path), headers)
+  end
 end
 
 When /^the response '([^']*)' should be '([^']*)'$/ do |header, value|
@@ -182,5 +188,7 @@ When /^the response '([^']*)' should be '([^']*)'$/ do |header, value|
 end
 
 Then /^the response should be the same as the content of '([^']*)'$/ do |path|
-  @response.body.should == File.read(path)
+  Dir.chdir SCRATCH do
+    @response.body.should == File.read(path)
+  end
 end

data/features/support/env.rb

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../server")
 require 'rubygems'
 require 'mirage/client'
-require 'util'
 require 'cucumber'
 require 'rspec'
 require 'mechanize'
@@ -10,7 +9,14 @@ require 'childprocess'
 
 ENV['RUBYOPT'] =''
 
-include Mirage::Util
+module OsSupport
+  def windows?
+    ENV['OS'] == 'Windows_NT'
+  end
+end
+World OsSupport
+include OsSupport
+
 SCRATCH = './scratch'
 RUBY_CMD = RUBY_PLATFORM == 'JAVA' ? 'jruby' : 'ruby'
 
@@ -23,6 +29,8 @@ else
   MIRAGE_CMD = "#{RUBY_CMD} ../bin/mirage"
 end
 
+
+
 module CommandLine
   COMAND_LINE_OUTPUT_PATH = "#{File.dirname(__FILE__)}/../../#{SCRATCH}/commandline_output.txt"
   module Windows
@@ -66,8 +74,6 @@ end
 
 module Mirage
   module Runner
-    include Mirage::Util
-
     def stop_mirage
       system "cd #{SCRATCH} && #{MIRAGE_CMD} stop"
     end
@@ -92,8 +98,6 @@ end
 
 module IntelliJ
   include CommandLine
-  include Mirage::Util
-
   def run command
     execute "#{RUBY_CMD} #{command}"
   end

data/lib/mirage/cli.rb

@@ -0,0 +1,69 @@
+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"
+          exit 1
+        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

data/lib/mirage/client.rb

@@ -1,10 +1,47 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}"
 require 'uri'
+require 'waitforit'
+require 'childprocess'
 require 'client/web'
+require 'cli'
 require 'ostruct'
+require 'optparse'
 
 module Mirage
 
+  class << self
+
+    def start args={}
+      puts "Starting Mirage"
+      args = convert_to_command_line_argument_array(args) if args.is_a? Hash
+
+      Mirage::CLI.run args
+      mirage_client = Mirage::Client.new "http://localhost:#{Mirage::CLI.parse_options(args)[:port]}/mirage"
+      wait_until(:timeout_after => 30.seconds) { mirage_client.running? }
+
+      begin
+        mirage_client.prime
+      rescue Mirage::InternalServerException => e
+        puts "WARN: #{e.message}"
+      end
+      mirage_client
+    end
+
+    def stop
+      puts "Stopping Mirage"
+      Mirage::CLI.stop
+    end
+
+    private
+    def convert_to_command_line_argument_array(args)
+      command_line_arguments = {}
+      args.each do |key, value|
+        command_line_arguments["--#{key}"] = "#{value}"
+      end
+      command_line_arguments.to_a.flatten
+    end
+  end
+
   class MirageError < ::Exception
     attr_reader :code
 
@@ -13,11 +50,12 @@ module Mirage
       @code = message, code
     end
   end
-  
+
   class Response < OpenStruct
 
     attr_accessor :content_type
     attr_reader :value
+
     def initialize response
       @content_type = 'text/plain'
       @value = response
@@ -27,7 +65,7 @@ module Mirage
     def headers
       headers = {}
 
-      @table.each{|header, value| headers["X-mirage-#{header.to_s.gsub('_', '-')}"] = value}
+      @table.each { |header, value| headers["X-mirage-#{header.to_s.gsub('_', '-')}"] = value }
       headers['Content-Type']=@content_type
       headers['X-mirage-file'] = 'true' if @response.kind_of?(IO)
 
@@ -69,10 +107,10 @@ module Mirage
     # end
     def put endpoint, response_value, &block
       response = Response.new response_value
-      
+
       yield response if block_given?
 
-      build_response(http_put("#{@url}/templates/#{endpoint}",response.value, response.headers))
+      build_response(http_put("#{@url}/templates/#{endpoint}", response.value, response.headers))
     end
 
     # Use to look at what a response contains without actually triggering it.
@@ -85,7 +123,7 @@ module Mirage
         when Mirage::Web::FileResponse then
           return response.response.body
       end
-      
+
     end
 
     # Clear Content from Mirage
@@ -98,7 +136,7 @@ module Mirage
     #   Client.new.clear(:requests) # Clear all tracked request information
     #   Client.new.clear(:request => response_id) # Clear the tracked request for a given response id
     def clear thing=nil
-      
+
       case thing
         when :requests
           http_delete("#{@url}/requests")
@@ -107,10 +145,11 @@ module Mirage
         when Hash then
           puts "deleteing request #{thing[:request]}"
           http_delete("#{@url}/requests/#{thing[:request]}") if thing[:request]
-        else NilClass
+        else
+          NilClass
           http_delete("#{@url}/templates")
       end
-      
+
     end
 
 
@@ -125,14 +164,14 @@ module Mirage
 
     # Save the state of the Mirage server so that it can be reverted back to that exact state at a later time.
     def save
-      http_put("#{@url}/backup",'').code == 200
+      http_put("#{@url}/backup", '').code == 200
     end
 
 
     # Revert the state of Mirage back to the state that was last saved
     # If there is no snapshot to rollback to, nothing happens
     def revert
-      http_put("#{@url}",'').code == 200
+      http_put("#{@url}", '').code == 200
     end
 
 
@@ -148,7 +187,7 @@ module Mirage
     # Clear down the Mirage Server and load any defaults that are in Mirages default responses directory.
     def prime
       puts "#{@url}/defaults"
-      build_response(http_put("#{@url}/defaults",''))
+      build_response(http_put("#{@url}/defaults", ''))
     end
 
     private

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "2.1.2"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2012-04-29"
+  s.date = "2012-07-10"
   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/command_line_interface.feature",
     "features/client/mirage_client.feature",
     "features/client/put.feature",
     "features/client/request.feature",
@@ -46,15 +47,16 @@ Gem::Specification.new do |s|
     "features/step_definitions/my_steps.rb",
     "features/support/env.rb",
     "full_build.sh",
+    "lib/mirage/cli.rb",
     "lib/mirage/client.rb",
     "lib/mirage/client/web.rb",
     "mirage.gemspec",
     "mirage_server.rb",
     "rakefile",
+    "responses/default_responses.rb",
     "server/extensions/hash.rb",
     "server/extensions/object.rb",
     "server/mock_response.rb",
-    "server/util.rb",
     "test.rb",
     "views/index.erb"
   ]
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<childprocess>, [">= 0"])
       s.add_runtime_dependency(%q<waitforit>, [">= 0"])
+      s.add_development_dependency(%q<thin>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -84,6 +87,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<childprocess>, [">= 0"])
       s.add_dependency(%q<waitforit>, [">= 0"])
+      s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -97,6 +101,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<childprocess>, [">= 0"])
     s.add_dependency(%q<waitforit>, [">= 0"])
+    s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/mirage_server.rb

@@ -9,19 +9,16 @@ require 'sinatra/base'
 require 'extensions/object'
 require 'extensions/hash'
 require 'mock_response'
-require 'util'
 
 require 'mirage/client'
 
-include Mirage::Util
-
 module Mirage
 
   class Server < Sinatra::Base
 
     configure do
-      options = parse_options(ARGV)
-      set :defaults_directory, options[:defaults_directory]
+      options = Mirage::CLI.parse_options(ARGV)
+      set :defaults, options[:defaults]
       set :port, options[:port]
       set :show_exceptions, false
       set :logging, true
@@ -113,7 +110,7 @@ module Mirage
     put '/mirage/defaults' do
       MockResponse.delete_all
 
-      Dir["#{settings.defaults_directory}/**/*.rb"].each do |default|
+      Dir["#{settings.defaults}/**/*.rb"].each do |default|
         begin
           eval File.read(default)
         rescue Exception => e

data/test.rb

@@ -1 +1,6 @@
-a change another
+require 'rubygems'
+require './lib/mirage/client'
+
+client = Mirage.start :port => 9001
+
+client.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000Z
+date: 2012-07-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &16709080 !ruby/object:Gem::Requirement
+  requirement: &22006800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16709080
+  version_requirements: *22006800
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &16708560 !ruby/object:Gem::Requirement
+  requirement: &22006260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16708560
+  version_requirements: *22006260
 - !ruby/object:Gem::Dependency
   name: waitforit
-  requirement: &16708060 !ruby/object:Gem::Requirement
+  requirement: &22005560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16708060
+  version_requirements: *22005560
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &22004900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22004900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16673860 !ruby/object:Gem::Requirement
+  requirement: &22004220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16673860
+  version_requirements: *22004220
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &16673060 !ruby/object:Gem::Requirement
+  requirement: &22003340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16673060
+  version_requirements: *22003340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16672340 !ruby/object:Gem::Requirement
+  requirement: &22002640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16672340
+  version_requirements: *22002640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16671580 !ruby/object:Gem::Requirement
+  requirement: &22001680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16671580
+  version_requirements: *22001680
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &16670800 !ruby/object:Gem::Requirement
+  requirement: &22000860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16670800
+  version_requirements: *22000860
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &16670040 !ruby/object:Gem::Requirement
+  requirement: &21998380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16670040
+  version_requirements: *21998380
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &16669340 !ruby/object:Gem::Requirement
+  requirement: &21997720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16669340
+  version_requirements: *21997720
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
-  requirement: &16668600 !ruby/object:Gem::Requirement
+  requirement: &21997140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16668600
+  version_requirements: *21997140
 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.
@@ -150,6 +161,7 @@ files:
 - VERSION
 - bin/mirage
 - features/client/clear.feature
+- features/client/command_line_interface.feature
 - features/client/mirage_client.feature
 - features/client/put.feature
 - features/client/request.feature
@@ -172,15 +184,16 @@ files:
 - features/step_definitions/my_steps.rb
 - features/support/env.rb
 - full_build.sh
+- lib/mirage/cli.rb
 - lib/mirage/client.rb
 - lib/mirage/client/web.rb
 - mirage.gemspec
 - mirage_server.rb
 - rakefile
+- responses/default_responses.rb
 - server/extensions/hash.rb
 - server/extensions/object.rb
 - server/mock_response.rb
-- server/util.rb
 - test.rb
 - views/index.erb
 homepage: https://github.com/lashd/mirage
@@ -200,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2084322877409170050
+      hash: -518118911155639654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/server/util.rb

@@ -1,38 +0,0 @@
-require 'optparse'
-module Mirage
-  module Util
-
-    def parse_options args
-      options = {:port => 7001, :defaults_directory => '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] = directory
-        end
-
-        opts.on('--debug', 'run in debug mode') do
-          options[:debug] = true
-        end
-      end
-
-      begin
-        opt_parser.parse args
-      rescue
-        puts opt_parser
-        exit 1
-      end
-
-      options
-    end
-
-    def windows?
-      ENV['OS'] == 'Windows_NT'
-    end
-  end
-
-end