clucumber 0.3.2 → 0.4.0

data/README.md

@@ -13,7 +13,7 @@ First, install the clucumber gem via rubygems:
 
 	gem install clucumber
 
-On the lisp side, clucumber depends on cl-interpol, cl-ppcre, trivial-backtrace, usocket and st-json. All of these are available in clbuild, and I recommend you use this to manage your lisp libraries.
+On the lisp side, clucumber depends on cl-interpol, cl-ppcre, trivial-backtrace, usocket and st-json. All of these are available in [quicklisp](http://quicklisp.org), and I recommend you use this to manage your lisp libraries.
 
 Getting started
 ---------------
@@ -30,19 +30,20 @@ Files in support and step_definitions/ are loaded (not file-compiled)
 in alphabetical order, with support/ files being loaded before step
 definitions.
 
+Put a .wire file into your step_definitions dir; I like to name it `features/step_definitions/clucumber.wire`. See [examples/clucumber.wire](//github.com/antifuchs/clucumber/tree/master/examples/clucumber.wire) for one that works for me.
+
 In your `features/support/env.rb`, you use something like this:
 
 	require 'clucumber'
 	begin
-	  ClucumberSubprocess.launch(File.expand_path("../", File.dirname(__FILE__)),
-	                             :port => 42428).listen <<-LISP
+	  ClucumberSubprocess.launch(File.expand_path("../", File.dirname(__FILE__))).listen <<-LISP
             ;; Put code here that loads your application.
 	  LISP
 	rescue PTY::ChildExited
 	  STDERR.puts(@main_clucumber && @main_clucumber.output)
 	end
 
-This will launch a lisp with clucumber loaded (pass :lisp parameter to `ClucumberSubprocess.new` to specify which lisp, it defaults to sbcl), and start listening on port 42428.
+This will launch a lisp with clucumber loaded (pass :lisp parameter to `ClucumberSubprocess.new` to specify which lisp, it defaults to sbcl), and (if you used the [examples/clucumber.wire](//github.com/antifuchs/clucumber/tree/master/examples/clucumber.wire) file) start listening on port 42428.
 
 Then, on the command line, you run cucumber:
 

data/lib/clucumber.rb

@@ -1,4 +1,5 @@
 require 'pty'
+require 'erb'
 require 'fileutils'
 
 class ClucumberSubprocess
@@ -18,19 +19,19 @@ class ClucumberSubprocess
   def initialize(dir, options={})
     @dir = dir
     @lisp = options[:lisp] || ENV['LISP'] || 'sbcl --disable-debugger'
-    @port = options[:port] || raise("Need a port to run clucumber on.")
+    @port = options[:port]
     @output = ""
   end
 
   def run
-    set_port_from_wire_file and return if wire_file_exists?
+    set_port
     
     Dir.chdir(@dir) do
       @out, @in, @pid = PTY.spawn(@lisp)
     end
     @reader = Thread.start {
       record_output
-    } 
+    }
     cluke_dir = File.expand_path("clucumber/", File.dirname(__FILE__))
     Dir[cluke_dir + '/**/*.fasl'].each do |fasl|
       FileUtils.rm(fasl)
@@ -46,21 +47,24 @@ class ClucumberSubprocess
       (asdf:oos 'asdf:load-op :clucumber)
       (clucumber-external:start #p"./" "localhost" #{@port})
     LISP
+    sleep 1
   end
   
   def listen(additional_forms="")
-    start_clucumber_server(additional_forms) unless wire_file_exists?
-
-    until socket = TCPSocket.new("localhost", @port) rescue nil
+    start_clucumber_server(additional_forms) unless connectable?
+    until connectable?
       raise LaunchFailed, "Couldn't start clucumber:\n#{@output}" unless alive?
-      sleep 0.01
+      sleep 0.5
     end
-    socket.close
+    sleep 1
+  end
 
-    unless wire_file_exists?
-      File.open(wire_file, "w") do |out|
-        YAML.dump({'host' => "localhost", 'port' => @port}, out)
-      end
+  def connectable?
+    if socket = TCPSocket.new("127.0.0.1", @port) rescue nil
+      socket.close
+      true
+    else
+      false
     end
   end
 
@@ -77,7 +81,6 @@ class ClucumberSubprocess
 
   def kill
     if @pid
-      FileUtils.rm_f wire_file
       @reader.terminate!
       Process.kill("TERM", @pid)
       Process.waitpid(@pid)
@@ -110,7 +113,12 @@ class ClucumberSubprocess
     File.exist?(wire_file)
   end
   
-  def set_port_from_wire_file
-    @port = YAML.parse_file(wire_file)['port']
+  def set_port
+    unless @port
+      @port = YAML.load(ERB.new(File.read(wire_file)).result)['port'] ||
+        ENV['CLUCUMBER_PORT'] || 
+        raise("Need a port to run clucumber on.")
+      @port = @port.to_i
+    end
   end
 end

data/lib/clucumber/clucumber-bootstrap.lisp

@@ -29,4 +29,4 @@
                                                      :type "asd")
                            vendor-dir)))
 
-(load (merge-pathnames #p"clucumber.asd" *load-truename*))
+(push (make-pathname :name nil :type nil :version nil :defaults *load-truename*) asdf:*central-registry*)

data/lib/clucumber/server.lisp

@@ -34,15 +34,27 @@
 (defvar *stream*)
 
 (defun serve-cucumber-requests (socket &aux (*stream* (socket-stream socket)))
-  (handler-case
-      (loop
-        (let* ((line (read-line *stream*))
-               (message (read-json line nil))
-               (reply (call-wire-protocol-method message)))
-          (st-json:write-json reply *stream*)
-          (terpri *stream*)
-          (finish-output *stream*)))
-    (end-of-file nil nil)))
+  (handler-case 
+   (loop
+     (let* ((line (handler-case (read-line *stream*)
+                    (error ()
+                      (close *stream*)
+                      (return :socket-error))))
+            (message (read-json line nil))
+            (reply (call-wire-protocol-method message)))
+       (format *trace-output* "Read json message ~s -> ~s~%" line message)
+       (handler-case (progn (st-json:write-json reply *stream*)
+                            (terpri *stream*)
+                            (finish-output *stream*))
+         (error ()
+           (close *stream*)
+           (return :socket-error)))))
+    (error ()
+      (close *stream*)
+      (format t "OHAI ich bin ein scheissprogramm~%")
+      (force-output *standard-output*)
+      (sleep 10)
+      (return-from serve-cucumber-requests :socket-error))))
 
 
 ;;; Step definitions
@@ -89,8 +101,9 @@
   (let ((server (usocket:socket-listen host port :reuse-address t)))
     (unwind-protect
         (loop
+(with-open-file (*trace-output* #p"/tmp/trace.out" :direction :output :if-exists :append :if-does-not-exist :create)
           (let ((socket (usocket:socket-accept server :element-type 'character)))
-            (serve-cucumber-requests socket))
+             (serve-cucumber-requests socket)))
           (when quit (return)))
       (usocket:socket-close server))))
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clucumber
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Andreas Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 +02:00
+date: 2011-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -199,15 +199,13 @@ files:
 - lib/clucumber/vendor/usocket/vendor/split-sequence.lisp
 - LICENSE
 - README.md
-- test/helper.rb
-- test/test_clucumber.rb
 has_rdoc: true
 homepage: http://github.com/antifuchs/clucumber
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -235,6 +233,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Test drive your Common Lisp application from Cucumber
-test_files: 
-- test/helper.rb
-- test/test_clucumber.rb
+test_files: []
+

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'clucumber'
-
-class Test::Unit::TestCase
-end

data/test/test_clucumber.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestClucumber < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end