mirage 1.1.0 → 1.2.0

data/README.md

@@ -10,7 +10,7 @@ I hope you find it useful,
 
 Leon
 
-P.s. Currently Mirage only runs on Linux; Rubies 1.8, 1.9 and JRuby. I plan to add support for Windows and MacOsX very soon.
+P.s. Mirage runs on Linux,MacOSX and Windows; Rubies 1.8, 1.9 and JRuby.
 
 Installation
 ------------

data/bin/mirage

@@ -2,28 +2,46 @@
 require 'rubygems'
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 require 'mirage'
+require 'childprocess'
 include Mirage::Util
-RUBY_CMD = RUBY_PLATFORM == 'JAVA' ? 'jruby' : 'ruby'
+RUBY_CMD = RUBY_PLATFORM == 'java' ? 'jruby' : 'ruby'
 
 
 def start_mirage(args, mirage)
   puts "Starting Mirage"
-  system "(#{RUBY_CMD} #{File.dirname(__FILE__)}/../lib/start_mirage.rb #{args.join(' ')}) > /dev/null 2>&1 &"
+
+  if windows?
+    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"]
+  end
+  ChildProcess.build(*(command.concat(args))).start
+
   wait_until do
     mirage.running?
   end
 end
 
-def mirage_process_ids
-  process_ids = []
-  process_ids <<  `ps aux | grep "Mirage Server" | grep -v grep`.split(' ')[1]
-  process_ids <<  `ps aux | grep "start_mirage" | grep -v grep`.split(' ')[1]
-  return process_ids.compact
+
+def stop_mirage
+  if windows?
+    process_id = `tasklist /V | findstr "mirage\\ server"`.split(' ')[1]
+    `taskkill /F /T /PID #{process_id}` if process_id
+  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
+  end
 end
 
 if ARGV.include?('start')
 
-  options =  parse_options(ARGV)
+  options = parse_options(ARGV)
   mirage_client = Mirage::Client.new "http://localhost:#{options[:port]}/mirage"
 
   if mirage_client.running?
@@ -38,17 +56,9 @@ if ARGV.include?('start')
     puts "WARN: #{e.message}"
   end
 
-
 elsif ARGV.include?('stop')
-  puts "Stoping Mirage"
-  begin
-    mirage_process_ids.each do |id|
-      puts "killing #{id}"
-      `kill -9 #{id}`
-    end
-  rescue
-    puts 'Mirage is not running'
-  end
+  puts "Stopping Mirage"
+  stop_mirage
 else
   parse_options ['--help']
   exit 1

data/features/client/set.feature

@@ -73,7 +73,7 @@ Feature: the Mirage client provides methods for setting responses and loading de
   Scenario: Setting a file as a response
     Given I run
     """
-    Mirage::Client.new.set('download', File.open('features/resources/test.zip'))
+    Mirage::Client.new.set('download', File.open('README.md'))
     """
     When I hit 'http://localhost:7001/mirage/get/download'
-    Then the response should be a file the same as 'features/resources/test.zip'
+    Then the response should be a file the same as 'README.md'

data/features/server/command_line_iterface.feature

@@ -28,7 +28,7 @@ Feature: Mirage is started from the command line.
 
 
   Scenario: Stopping Mirage
-    Given I run 'mirage start'
+    Given Mirage is running
     When I run 'mirage stop'
     Then Connection should be refused to 'http://localhost:7001/mirage'
 

data/features/server/file_responses.feature

@@ -1,9 +1,8 @@
 Feature: Mirage can also be used to host files.
 
-  #TODO - generate zip file or move resources directory
   Scenario: A file is set as a response
     Given I hit 'http://localhost:7001/mirage/set/some/location/download' with parameters:
-      | response | features/resources/test.zip |
+      | response | README.md |
 
     When I hit 'http://localhost:7001/mirage/get/some/location/download'
-    Then the response should be a file the same as 'features/resources/test.zip'
+    Then the response should be a file the same as 'README.md'

data/features/server/logging.feature

@@ -4,4 +4,4 @@ Feature: Output from Mirage is stored in mirage.log.
   Scenario: response is set.
     Given I post to 'http://localhost:7001/mirage/set/greeting' with parameters:
       | response | Hello |
-    Then 'mirage.log' should contain '/mirage/set/greeting?response=Hello'
+    Then mirage.log should contain '/mirage/set/greeting?response=Hello'

data/features/server/peek.feature

@@ -12,9 +12,10 @@ Feature: If you want to see the content of a particular response without trigger
 
   Scenario: Peeking a file based response
     Given I hit 'http://localhost:7001/mirage/set/download' with parameters:
-      | response | features/resources/test.zip |
+      | response | README.md |
+
     When I hit 'http://localhost:7001/mirage/peek/1'
-    Then the response should be a file the same as 'features/resources/test.zip'
+    Then the response should be a file the same as 'README.md'
 
 
   Scenario: Peeking a response that does not exist

data/features/step_definitions/my_steps.rb

@@ -37,7 +37,7 @@ end
 
 Given /^I run '(.*)'$/ do |command|
   path = ENV['mode'] == 'regression' ? '' : "../bin/"
-  @commandline_output = normalise(IO.popen("export RUBYOPT='' && cd #{SCRATCH} && #{path}#{command}").read)
+  @commandline_output = normalise(run("#{path}#{command}"))
 end
 
 Given /^Mirage (is|is not) running$/ do |running|
@@ -62,9 +62,9 @@ Given /^the file '(.*)' contains:$/ do |file_path, content|
   file_path = "#{SCRATCH}/#{file_path}" unless file_path =~ /^\//
 
   FileUtils.rm_rf(file_path) if File.exists?(file_path)
-  directory = File.dirname(file_path)
-  FileUtils.mkdir_p(directory)
-  file = File.new("#{directory}/#{File.basename(file_path)}", 'w')
+  FileUtils.mkdir_p(File.dirname(file_path))
+
+  file = File.new("#{file_path}", 'w')
   file.write(content)
   file.close
 end
@@ -94,7 +94,7 @@ When /^I (hit|get|post to) '(http:\/\/localhost:7001\/mirage\/(.*?))' with param
   parameters = {}
   table.raw.each do |row|
     parameter, value = row[0].to_sym, row[1]
-    value = File.exists?(value) ? File.open(value) : value
+    value = File.exists?(value) ? File.open(value, 'rb') : value
     parameters[parameter]=value
   end
 
@@ -113,15 +113,19 @@ Then /^'(.*)' should exist$/ do |path|
   File.exists?("#{SCRATCH}/#{path}").should == true
 end
 
-Then /^'(.*)' should contain '(.*)'$/ do |file, content|
-  fail("#{content} not found in: #{File.read(file)}") unless File.read("#{SCRATCH}/#{file}").index(content)
+Then /^mirage.log should contain '(.*)'$/ do |content|
+  log_file_content = @mirage_log_file.readlines.to_s
+  fail("#{content} not found in mirage.log: #{log_file_content}") unless log_file_content.index(content)
 end
+
 Given /^I goto '(.*)'$/ do |url|
   @page = Mechanize.new.get url
 end
+
 Then /^I should see '(.*)'$/ do |text|
   @page.body.index(text).should_not == nil
 end
+
 When /^I click '(.*)'$/ do |thing|
-  @page = @page.links.find{|link| link.attributes['id'] == thing}.click
+  @page = @page.links.find { |link| link.attributes['id'] == thing }.click
 end

data/features/support/env.rb

@@ -1,7 +1,5 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 require 'rubygems'
-#require 'bundler/setup'
-#Bundler.setup(:test)
 require 'mirage'
 require 'cucumber'
 require 'rspec'
@@ -9,6 +7,16 @@ require 'mechanize'
 
 SCRATCH = './scratch'
 RUBY_CMD = RUBY_PLATFORM == 'JAVA' ? 'jruby' : 'ruby'
+$log_file_marker = 0
+
+
+module CommandLine
+  def execute command
+    command_line_output_path = "#{SCRATCH}/commandline_output.txt"
+    system "cd #{SCRATCH} && #{command} > #{File.basename(command_line_output_path)}"
+    File.read(command_line_output_path)
+  end
+end
 
 
 module Web
@@ -22,7 +30,7 @@ module Web
 
   def hit_mirage(url, parameters={})
     start_time = Time.now
-    file = parameters.values.find{|value| value.is_a?(File)}
+    file = parameters.values.find { |value| value.is_a?(File) }
     response = (file ? http_post(url, parameters) : http_get(url, parameters))
     @response_time = Time.now - start_time
     response
@@ -35,34 +43,36 @@ end
 
 
 module Regression
+  include CommandLine
+
   def stop_mirage
-    system "export RUBYOPT='' && cd #{SCRATCH} && mirage stop"
+    system "cd #{SCRATCH} && mirage stop"
   end
 
   def start_mirage
-    system "truncate mirage.log --size 0"
-    system "export RUBYOPT='' && cd #{SCRATCH} && mirage start"
+    system "cd #{SCRATCH} && mirage start"
+  end
+
+  def run command
+    execute(command)
   end
 end
 
 module IntelliJ
+  include CommandLine
   include Mirage::Util
 
   def stop_mirage
-    system "cd #{SCRATCH} && ../bin/mirage stop"
-    wait_until do
-      !$mirage.running?
-    end
+    system "cd #{SCRATCH} && #{RUBY_CMD}  ../bin/mirage stop"
   end
 
   def start_mirage
     puts "starting mirage"
-    system "truncate mirage.log --size 0"
-    system "cd #{SCRATCH} && ../bin/mirage start"
+    system "cd #{SCRATCH} && #{RUBY_CMD} ../bin/mirage start"
+  end
 
-    wait_until do
-      $mirage.running?
-    end
+  def run command
+    execute "#{RUBY_CMD} #{command}"
   end
 end
 
@@ -74,17 +84,21 @@ World(Web)
 Before do
   FileUtils.mkdir_p(SCRATCH)
   $mirage = Mirage::Client.new
-
   if $mirage.running?
     $mirage.clear
   else
     start_mirage
   end
-  
-  system "cd #{SCRATCH}/ && ls | grep -v mirage.log | xargs rm -rf"
-  system "truncate -s 0 #{SCRATCH}/mirage.log"
+
+  Dir["#{SCRATCH}/*"].each do |file|
+      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)
 end
 
+
 at_exit do
-  stop_mirage
-end
+  stop_mirage if $mirage.running?
+end

data/lib/mirage/client.rb

@@ -22,6 +22,7 @@ module Mirage
 
   class Client
     include ::Mirage::Web
+    attr_reader :url
 
     # Creates an instance of the MIrage client that can be used to interact with the Mirage Server
     #
@@ -58,7 +59,7 @@ module Mirage
     #  Client.set('greeting', 'hello', :pattern => 'regex or plain text':)
     #  Client.set('greeting', 'hello', :delay => 5) # number of seconds
     def set endpoint, response, params={}
-      params[:response] = response
+      params[:response] = response.is_a?(File) ? File.open(response.path, 'rb') : response
       response(http_post("#{@url}/set/#{endpoint}", params))
     end
 

data/lib/mirage/core.rb

@@ -91,6 +91,7 @@ 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)
 
@@ -196,7 +197,8 @@ module Mirage
     def send_response(response, body='', request={}, query_string='')
       if response.file?
         tempfile, filename, type = response.value.values_at(:tempfile, :filename, :type)
-        send_file(tempfile.path, type, "Content-Disposition: attachment; filename=#{filename}")
+        tempfile.binmode
+        send_file(tempfile.path, type, "Content-Length: #{tempfile.size}; Content-Disposition: attachment; filename=#{filename}")
       else
         response.value(body, request, query_string)
       end

data/lib/mirage/util.rb

@@ -2,7 +2,7 @@ require 'optparse'
 module Mirage
   module Util
     
-    def wait_until time=30
+    def wait_until time=45
       start_time = Time.now
       until Time.now >= start_time + time
         sleep 0.1
@@ -28,13 +28,16 @@ module Mirage
       begin
         opt_parser.parse args
       rescue
-        puts "mirage start|stop [OPTIONS]"
         puts opt_parser
         exit 1
       end
 
       options
     end
+
+    def windows?
+      ENV['OS'] == 'Windows_NT'
+    end
   end
 
 end

data/lib/start_mirage.rb

@@ -1,9 +1,10 @@
 require 'rubygems'
 $0='Mirage Server'
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mirage'
 include Mirage::Util
 
+#puts "ARGV is " + ARGV
 options = parse_options(ARGV)
 
 DEFAULT_RESPONSES_DIR = "#{options[:defaults_directory]}"

data/mirage.gemspec

@@ -1,6 +1,8 @@
 Gem::Specification.new do |s|
+
+  windows = ENV['OS'] == 'Windows_NT'
   s.name = 'mirage'
-  s.version = '1.1.0'
+  s.version = '1.2.0'
   s.authors = ["Leon Davis"]
   s.homepage = 'https://github.com/lashd/mirage'
   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.'
@@ -22,9 +24,13 @@ For more information go to: https://github.com/lashd/mirage/wiki
   
   s.has_rdoc = 'true' 
 
-  s.add_dependency 'rack', "~> 1.1.0"
-  s.add_dependency 'ramaze', ">= 2011.01.30"
-  s.add_dependency "mechanize", ">= 1.0.0"
+  s.add_dependency 'rack', '~> 1.1.0'
+  s.add_dependency 'ramaze', '>= 2011.01.30'
+  s.add_dependency 'mechanize', '>= 1.0.0'
+  s.add_dependency 'childprocess', '~> 0.1'
+  
+  s.add_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
+
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'cucumber'

data/rakefile

@@ -1,16 +1,11 @@
 $LOAD_PATH.unshift('lib')
 require 'rubygems'
-require 'bundler/setup'
-
-require 'mirage/client'
 require 'rake'
-require 'open-uri'
 require 'cucumber'
 require 'cucumber/rake/task'
-require 'mechanize'
 
 def run_command command
-  system "export RUBYOPT='' && #{command}"
+  system "#{command}"
 end
 
 task :gem => :clean do
@@ -25,19 +20,7 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "mode=regression features --format pretty"
 end
 
-task :start_mirage => :stop_mirage do
-  run_command "mirage start"
-  task.reenable
-end
-
-task :stop_mirage do |task|
-  run_command "mirage stop"
-  task.reenable
-end
-
-
 task :clean do |task|
-
   if run_command "gem list -i mirage"
     puts "cleaning"
     run_command "gem uninstall -x mirage"
@@ -47,4 +30,4 @@ task :clean do |task|
 end
 
 
-task :default => [:install, :start_mirage, :features, :stop_mirage, :clean]
+task :default => [:install,:features,:clean]

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Leon Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +01:00
+date: 2011-04-04 00:00:00 +01:00
 default_executable: mirage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,18 +47,18 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: childprocess
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: "0.1"
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -69,7 +69,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: cucumber
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -80,7 +80,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -90,6 +90,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id008
 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.
 email: 
 executables: 
@@ -110,7 +121,6 @@ files:
 - features/client/save_and_revert.feature
 - features/client/set.feature
 - features/client/track.feature
-- features/resources/test.zip
 - features/server/clear.feature
 - features/server/command_line_iterface.feature
 - features/server/file_responses.feature
@@ -144,7 +154,7 @@ licenses: []
 
 post_install_message: "\n\
   ===============================================================================\n\
-  Thanks you for installing mirage-1.1.0.   \n\n\
+  Thanks you for installing mirage-1.2.0.   \n\n\
   Run Mirage with:\n\n\
   mirage start                                   \n\n\
   For more information go to: https://github.com/lashd/mirage/wiki\n\
@@ -171,7 +181,7 @@ rubyforge_project:
 rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: mirage-1.1.0
+summary: mirage-1.2.0
 test_files: 
 - features/client/clear.feature
 - features/client/get.feature
@@ -180,7 +190,6 @@ test_files:
 - features/client/save_and_revert.feature
 - features/client/set.feature
 - features/client/track.feature
-- features/resources/test.zip
 - features/server/clear.feature
 - features/server/command_line_iterface.feature
 - features/server/file_responses.feature