mirage 1.3.4 → 1.3.5

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

data/features/server/command_line_iterface.feature

@@ -11,7 +11,7 @@ Feature: Mirage is started from the command line.
 
 
   Scenario: Starting with help option
-    Given I run 'mirage start --help'
+    Given I run 'mirage --help'
     Then the usage information should be displayed
 
 

data/features/support/env.rb

@@ -4,18 +4,43 @@ require 'mirage'
 require 'cucumber'
 require 'rspec'
 require 'mechanize'
+require 'childprocess'
+
+ENV['RUBYOPT'] =''
 
 include Mirage::Util
 SCRATCH = './scratch'
 RUBY_CMD = RUBY_PLATFORM == 'JAVA' ? 'jruby' : 'ruby'
+
+
 BLANK_RUBYOPT_CMD = windows? ? 'set RUBYOPT=' : "export RUBYOPT=''"
-$log_file_marker = 0
+
+if 'regression' == ENV['mode']
+  MIRAGE_CMD = windows? ? `where mirage.bat`.chomp : 'mirage'
+else
+  MIRAGE_CMD = "#{RUBY_CMD} ../bin/mirage"
+end
 
 module CommandLine
-  def execute command
-    command_line_output_path = "#{SCRATCH}/commandline_output.txt"
-    system "#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && #{command} > #{File.basename(command_line_output_path)}"
-    File.read(command_line_output_path)
+  COMAND_LINE_OUTPUT_PATH = "#{File.dirname(__FILE__)}/../../#{SCRATCH}/commandline_output.txt"
+  module Windows
+    def run command
+      command = "#{MIRAGE_CMD} #{command.split(' ').drop(1).join(' ')}" if command =~ /^mirage/
+      command = "#{command} > #{COMAND_LINE_OUTPUT_PATH}"
+      Dir.chdir(SCRATCH)
+      `#{BLANK_RUBYOPT_CMD}`
+      process = ChildProcess.build(*(command.split(' ')))
+      process.start
+      sleep 0.5 until process.exited?
+      Dir.chdir('../')
+      File.read(COMAND_LINE_OUTPUT_PATH)
+    end
+  end
+
+  module Linux
+    def run command
+      `#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && #{command}`
+    end
   end
 end
 
@@ -46,40 +71,52 @@ end
 module Regression
   include CommandLine
 
-  def stop_mirage
-    system "#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && mirage stop"
-  end
-
-  def start_mirage
-    system "#{BLANK_RUBYOPT_CMD} && cd #{SCRATCH} && mirage start"
-  end
-
   def run command
     execute(command)
   end
 end
 
+module Mirage
+  module Runner
+    include Mirage::Util
+
+    def stop_mirage
+      system "cd #{SCRATCH} && #{MIRAGE_CMD} stop"
+    end
+
+    def start_mirage
+      if windows?
+
+        puts "starting mirage"
+        Dir.chdir(SCRATCH)
+        process = ChildProcess.build(MIRAGE_CMD, "start")
+        process.start
+        sleep 0.5 until process.exited?
+        Dir.chdir '../'
+        puts "finished starting mirage"
+      else
+        system "cd #{SCRATCH} && #{MIRAGE_CMD} start"
+      end
+    end
+  end
+end
+
+
 module IntelliJ
   include CommandLine
   include Mirage::Util
 
-  def stop_mirage
-    system "cd #{SCRATCH} && #{RUBY_CMD}  ../bin/mirage stop"
-  end
-
-  def start_mirage
-    system "cd #{SCRATCH} && #{RUBY_CMD} ../bin/mirage start"
-  end
-
   def run command
     execute "#{RUBY_CMD} #{command}"
   end
 end
 
-'regression' == ENV['mode'] ? World(Regression) : World(IntelliJ)
-'regression' == ENV['mode'] ? include(Regression) : include(IntelliJ)
+include Mirage::Runner
 
 World(Web)
+World(Mirage::Runner)
+windows? ? World(CommandLine::Windows) : World(CommandLine::Linux)
+
 
 
 Before do

data/lib/mirage/web.rb

@@ -13,16 +13,9 @@ module Mirage
     def http_get url, params={}
       uri = URI.parse(url)
       if params[:body]
-        response = Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP::Get.new(uri.path)
-          request.body=params[:body]
-          http.request(request)
-        end
-
-        def response.code
-          @code.to_i
+        response = using_mechanize do |browser|
+          browser.put(url, params[:body])
         end
-
       else
         response = using_mechanize do |browser|
           browser.get(url, params)

data/mirage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mirage}
-  s.version = "1.3.4"
+  s.version = "1.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - Leon Davis
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2550934964107386131
+      hash: -4386511618372435286
       segments: 
       - 0
       version: "0"