mirage 1.0.2 → 1.1.0

data/bin/mirage

@@ -15,8 +15,10 @@ def start_mirage(args, mirage)
 end
 
 def mirage_process_ids
-  mirage_cmdline_files = Dir['/proc/*/cmdline'].find_all { |cmdline_file| File.read(cmdline_file) =~ /Mirage Server|start_mirage/ }
-  mirage_cmdline_files.collect{|mirage_cmdline_file| File.read("#{File.dirname(mirage_cmdline_file)}/stat").split(' ').first.to_i }
+  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
 end
 
 if ARGV.include?('start')
@@ -42,9 +44,8 @@ elsif ARGV.include?('stop')
   begin
     mirage_process_ids.each do |id|
       puts "killing #{id}"
-      Process.kill(9, id)
+      `kill -9 #{id}`
     end
-
   rescue
     puts 'Mirage is not running'
   end

data/features/support/env.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 require 'rubygems'
-require 'bundler/setup'
-Bundler.setup(:test)
+#require 'bundler/setup'
+#Bundler.setup(:test)
 require 'mirage'
 require 'cucumber'
 require 'rspec'
@@ -36,12 +36,12 @@ end
 
 module Regression
   def stop_mirage
-    `export RUBYOPT='' && cd #{SCRATCH} && mirage stop`
+    system "export RUBYOPT='' && cd #{SCRATCH} && mirage stop"
   end
 
   def start_mirage
-    `truncate mirage.log --size 0`
-    `export RUBYOPT='' && cd #{SCRATCH} && mirage start`
+    system "truncate mirage.log --size 0"
+    system "export RUBYOPT='' && cd #{SCRATCH} && mirage start"
   end
 end
 
@@ -57,7 +57,7 @@ module IntelliJ
 
   def start_mirage
     puts "starting mirage"
-    `truncate mirage.log --size 0`
+    system "truncate mirage.log --size 0"
     system "cd #{SCRATCH} && ../bin/mirage start"
 
     wait_until do
@@ -81,8 +81,8 @@ Before do
     start_mirage
   end
   
-  `cd #{SCRATCH}/ && ls | grep -v mirage.log | xargs rm -rf`
-  `truncate -s 0 #{SCRATCH}/mirage.log`
+  system "cd #{SCRATCH}/ && ls | grep -v mirage.log | xargs rm -rf"
+  system "truncate -s 0 #{SCRATCH}/mirage.log"
 end
 
 at_exit do

data/full_build.sh

@@ -89,7 +89,7 @@ then
 else
     run_build_for_ruby 'ruby-1.8.6'
     run_build_for_ruby 'ruby-1.8.7'
-    run_build_for_ruby 'ruby-1.9.1'
+    run_build_for_ruby 'ruby-1.9.1-p378'
     run_build_for_ruby 'ruby-1.9.2'
     run_build_for_ruby 'jruby'
 fi

data/lib/mirage/client.rb

@@ -36,6 +36,9 @@ module Mirage
     # If a response is not found a ResponseNotFound exception is thrown
     #
     #   Examples:
+    #   Getting a response without any parameters or body content
+    #   Mirage::Client.get(endpoint)
+    #
     #   Getting a response, passing request parameters
     #   Mirage::Client.new.get('greeting', :param1 => 'value1', param2=>'value2')
     #

data/mirage.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'mirage'
-  s.version = '1.0.2'
+  s.version = '1.1.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.'

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Leon Davis
@@ -144,7 +144,7 @@ licenses: []
 
 post_install_message: "\n\
   ===============================================================================\n\
-  Thanks you for installing mirage-1.0.2.   \n\n\
+  Thanks you for installing mirage-1.1.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 +171,7 @@ rubyforge_project:
 rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: mirage-1.0.2
+summary: mirage-1.1.0
 test_files: 
 - features/client/clear.feature
 - features/client/get.feature