cuke4php 0.9.3 → 0.9.4

data/Gemfile

@@ -5,5 +5,4 @@ group :development do
   gem 'jeweler'
 end
 
-gem 'cucumber'
-# TODO: once the patch for erb templating in the .wire files is released, we should set a minimum version for it
+gem 'cucumber', '>= 0.10.2'

data/HISTORY

@@ -12,4 +12,9 @@
 
 2011-01-30
   * use magic setters and getters to allow assignment and retrieval of properties on steps
-  * implement step argument transformations
+  * implement step argument transformations
+
+2011-03-23 -- 0.9.3
+  * utilizes cucumber 0.10.2's ability to use erb templates in .wire files to listen to a specific port
+  * release 0.9.3
+  * modify cuke4php runner script to dynamically pick an unused port

data/README.md

@@ -21,7 +21,7 @@ Usage
 * make sure your cucumber features has a 'Cuke4Php.wire' file in step_definitions containing something like:
 
 		host: localhost
-		port: 16816
+		port: <%= ENV['CUKE4PHP_PORT'] %>
 	
 * you can write both Ruby and PHP steps
 * you __must__ require the PHPUnit library from a file in your features/support/ directory (e.g., features/support/Env.php) for cuke4php to work
@@ -32,13 +32,8 @@ Roadmap
 ### bin/cuke4php
 
 * support an option like 'cuke4php --init' which will generate the directory structure and support files necessary to use cuke4php with a php project.
-* autodetect an available port and then use it to run the cuke4php server pass this on to cucumber by setting an environment variable (requires a modification to cucumber)
 * lint check all php files in features directory before starting the cuke4php server
 
-### Gemfile
-
-* once the patch for erb templating in .wire files in cucumber is released, we should set a minimum version for it
-
 Dependencies
 ------------
 * PHPUnit >= 3.0 (see http://www.phpunit.de/)

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/bin/cuke4php

@@ -2,21 +2,53 @@
 
 # TODO: support an option like 'cuke4php --init' which will generate the directory structure and support files necessary to use cuke4php with a php project.
 
-# TODO: autodetect an available port and then use it to run the cuke4php server pass this on to cucumber by setting an environment variable (requires a modification to cucumber)
-# see https://github.com/olbrich/cucumber/commit/0c11d206e08e8d5647e03bf78be93723d59529ef
-
 # TODO: lint check all php files before starting the cuke4php server
 
-# Note that changing the port number currently requires updating the Cuke4Php.wire file in your project's step_definitions
-# or cucumber will look for the cuke4php server on the wrong port.
-CUKE4PHP_PORT=ENV['CUKE4PHP_PORT'] || 16816
+# This script will autodetect the first free port starting at 16816 and pass it to cucumber in the 
+# CUKE4PHP_PORT environment variable.  Versions of cucumber > 0.10.2 can use erb in the .wire protocol file
+# to dynamically pick up this port number at runtime, which allows multiple instances of a cuke4php server
+# to be run on the same machine without conflicting
+
+require 'socket'
+require 'timeout'
+
+def port_in_use?(_port)
+  begin
+    Timeout::timeout(1) do
+      
+      begin
+        s = TCPSocket.new('localhost', _port)
+        s.close
+        return true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        return false
+      end
+      
+    end
+    
+  rescue Timeout::Error
+  end
+
+  return false
+end
+
+def autodetect_free_port
+  port = 16816
+  while port_in_use?(port) && port < 65536 do
+    port+=1
+  end
+  raise RuntimeError, "No free port detected" if port == 65536
+  return port
+end
+
+cuke4php_port=ENV['CUKE4PHP_PORT'] || autodetect_free_port
 
 server = fork do
-  exec "#{File.dirname(__FILE__)}/../php_bin/cuke4php_server -p #{CUKE4PHP_PORT} #{ARGV.last ? ARGV.last : 'features'}"  
+  exec "#{File.dirname(__FILE__)}/../php_bin/cuke4php_server -p #{cuke4php_port} #{ARGV.last ? ARGV.last : 'features'}"  
 end
 sleep 1
 cucumber = fork do
-  exec "CUKE4PHP_PORT=#{CUKE4PHP_PORT} && cucumber #{ARGV.join(' ')}"
+  exec "export CUKE4PHP_PORT=#{cuke4php_port} && cucumber #{ARGV.join(' ')}"
 end
 pid, status = Process.wait2(cucumber,0)
 Process.kill("TERM",server)

data/cuke4php.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cuke4php}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Olbrich", "Alessandro Dal Grande"]
@@ -70,16 +70,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cucumber>, [">= 0"])
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.10.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0.10.2"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0.10.2"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

data/features/step_definitions/Cuke4Php.wire

@@ -1,4 +1,4 @@
 host: localhost
-port: 16816
+port: <%= ENV['CUKE4PHP_PORT'] || 16816 %>
 invoke:
     timeout: 0.1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuke4php
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Kevin Olbrich
@@ -25,10 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 51
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
   name: cucumber
   prerelease: false