mirage 2.0.0.alpha1 → 2.0.0.alpha2

data/VERSION

@@ -1 +1 @@
-2.0.0.alpha1
+2.0.0.alpha2

data/features/server/command_line_iterface.feature

@@ -6,8 +6,9 @@ Feature: Mirage is started from the command line.
   Background: Mirage usage
     Given usage information:
       | Usage: mirage start\|stop [options] |
-      | -p, --port PORT     |
-      | -d, --defaults DIR  |
+      | -p, --port PORT                     |
+      | -d, --defaults DIR                  |
+      | --debug                             |
 
 
   Scenario: Starting with help option
@@ -37,9 +38,9 @@ Feature: Mirage is started from the command line.
     Given Mirage is not running
     When I run 'mirage start -p 9001'
     Then mirage should be running on 'http://localhost:9001/mirage'
-    
-    Scenario: Starting Mirage when it is already running
-      Given Mirage is running
-      When I run 'mirage start -p 9001'
-      Then I should see 'Mirage is already running' on the command line
-      Then Connection should be refused to 'http://localhost:9001/mirage' 
+
+  Scenario: Starting Mirage when it is already running
+    Given Mirage is running
+    When I run 'mirage start -p 9001'
+    Then I should see 'Mirage is already running' on the command line
+    Then Connection should be refused to 'http://localhost:9001/mirage' 

data/lib/mirage/util.rb

@@ -1,7 +1,7 @@
 require 'optparse'
 module Mirage
   module Util
-    
+
     def wait_until time=45
       start_time = Time.now
       until Time.now >= start_time + time
@@ -23,6 +23,10 @@ module Mirage
         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

data/lib/start_mirage.rb

@@ -5,8 +5,12 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'sinatra'
 require 'sinatra/base'
-require 'sinatra/reloader'
 
+require 'mirage/util'
+include Mirage::Util
+options = parse_options(ARGV)
+
+$debug = options[:debug]
 
 module Mirage
   class MirageServer < Sinatra::Base
@@ -16,16 +20,19 @@ module Mirage
       log_file = File.open('mirage.log', 'a')
       log_file.sync=true
       use Rack::CommonLogger, log_file
-      register Sinatra::Reloader
-      also_reload "**/*.rb"
+
+      if $debug
+        require 'sinatra/reloader'
+        register Sinatra::Reloader
+        also_reload "**/*.rb"
+      end
       set :views, File.dirname(__FILE__) + '/views'
     end
   end
 end
+
+
 require 'mirage'
-include Mirage::Util
-#
-options = parse_options(ARGV)
 
 
 DEFAULT_RESPONSES_DIR = "#{options[:defaults_directory]}"

metadata

@@ -2,7 +2,7 @@
 name: mirage
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.alpha1
+  version: 2.0.0.alpha2
 platform: ruby
 authors: 
 - Leon Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 +01:00
+date: 2011-06-08 00:00:00 +01:00
 default_executable: mirage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,7 +181,6 @@ files:
 - features/step_definitions/my_steps.rb
 - features/support/env.rb
 - full_build.sh
-- lib/config.ru
 - lib/mirage.rb
 - lib/mirage/client.rb
 - lib/mirage/core.rb
@@ -214,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 122609927051635249
+      hash: 3094995407678883381
       segments: 
       - 0
       version: "0"

data/lib/config.ru

@@ -1,5 +0,0 @@
-require 'rubygems'
-require "#{::File.expand_path("#{::File.dirname(__FILE__)}/mirage/core")}"
-Ramaze.start(:root => __DIR__, :started => true)
-run Ramaze
-