codersdojo 1.1.11 → 1.1.12

data/app/argument_parser.rb

@@ -8,7 +8,7 @@ class ArgumentParser
 		@controller = controller
 	end
 	
-	def parse params
+	def parse params		
 		command = params[0] ? params[0].downcase : ""
 		if command == "help" then
 			@controller.help params[1]

data/app/console_view.rb

@@ -135,10 +135,28 @@ helptext
 		show "Encountered network error while <#{command}>. Is http://www.codersdojo.com down?"
 	end
 	
+	def show_kata_exit_message
+		show <<-msg 
+
+You finished your kata. Choose your next action:
+  u) Upload the kata to http://www.codersdojo.com.
+  e) Exit without uploading.
+  r) Resume the kata.
+msg
+	end
+		
+	def show_kata_upload_hint
+		show "You finished your kata. Now upload it with 'codersdojo upload'."
+	end
+		
 	def show text
 		puts @template_machine.render(text)
 	end
 
+	def read_user_input
+		STDIN.gets
+	end
+
 	def current_command_path
 		$0.gsub '/', '%/%'
 	end

data/app/controller.rb

@@ -37,8 +37,11 @@ class Controller
 	  dojo = Runner.new @shell, SessionIdGenerator.new
 	  dojo.file = file
 	  dojo.run_command = command
-	  scheduler = Scheduler.new dojo
+	  scheduler = Scheduler.new dojo, @view
 	  scheduler.start
+		if scheduler.last_action_was_upload? then
+			upload nil
+		end
 	end
 
 	# merge with 'upload_with_framework' when the framework parameter is removed

data/app/scheduler.rb

@@ -1,19 +1,49 @@
 class Scheduler
 
-  def initialize runner
+  def initialize runner, view
     @runner = runner
+		@view = view
+		@last_action = ""
   end
 
   def start
-		trap("INT") { 
-			puts "\nYou finished your kata. Now upload it with 'codersdojo upload'."
-			exit 
-		}
+		@last_action = ""
+		register_interrupt_listener
     @runner.start
-    while true do
+    while continue? do
       sleep 1
       @runner.execute
     end
   end
 
+	def register_interrupt_listener
+		trap("INT") {
+			interrupt_kata
+		}
+	end
+
+	def interrupt_kata
+		@view.show_kata_exit_message 
+		@last_action = @view.read_user_input.downcase
+		if last_action_was_exit? then
+			@view.show_kata_upload_hint
+		end
+	end
+	
+	def continue?
+		@last_action == '' or last_action_was_resume?
+	end
+
+	def last_action_was_resume?
+		@last_action.start_with? 'r'
+	end
+
+	def last_action_was_exit?
+		@last_action.start_with? 'e'
+	end
+
+	def last_action_was_upload?
+		@last_action.start_with? 'u'
+	end
+
 end

data/app/shell_wrapper.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'shell_process'
+require 'yaml'
 
 class ShellWrapper
 

data/templates/any/README

@@ -1,10 +1,11 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
 run-once.%sh% is not implemented by now. You have to implement it appropriately.
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.

data/templates/any/run-once.%sh%

@@ -1 +1,5 @@
-echo "Modify shell script run-once.%sh% so that it runs your tests once."
+echo "Modify shell script run-once.%sh% so that it runs your tests once."
+echo "Shell script may look similar to the one for Java with JUnit:"
+echo "  %rm% bin/%Kata_file%Test.class                        <- you don't need this if the language is interpreted"
+echo "  javac -cp lib/junit.jar -d bin %Kata_file%Test.java   <- you don't need this if the language is interpreted"
+echo "  java -cp lib/junit.jar:bin org.junit.runner.JUnitCore %Kata_file%Test"

data/templates/clojure.is-test/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.sh and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.clj.

data/templates/csharp.nunit/%kata_file%.cs

@@ -0,0 +1,20 @@
+using System;
+using NUnit.Framework;
+
+[TestFixture]
+public class %Kata_file%Test
+{
+    [Test]
+    public void testFoo()
+    {
+        Test object_under_test = new Test();
+        Assert.AreEqual("foo", object_under_test.foo());
+    }
+}
+
+public class %Kata_file%
+{
+    public String foo(){
+        return "fixme";
+    }
+}

data/templates/csharp.nunit/README

@@ -0,0 +1,14 @@
+These files were created:
+  README is what you are currently reading
+  run-once.%sh% runs your tests once
+  run-endless.%sh% runs your tests endlessly via run-once.%sh%
+
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
+
+Assumptions:
+  - The .Net Framework is installed (from www.microsoft.com).
+  - in the Path variable:
+      csc              (possible path=C:\Windows\Microsoft.NET\Framework\v4.0.30319\)
+      nunit-console    (possible path=C:\Programme\NUnit 2.5.9\bin\net-2.0\)
+  - nunit.framework.dll is in the same directory as %kata_file%.cs.
+  - The whole kata source code is in the one %kata_file%.cs.

data/templates/csharp.nunit/run-endless.%sh%

@@ -0,0 +1 @@
+codersdojo start run-once.cmd %KataFile%.cs

data/templates/csharp.nunit/run-once.%sh%

@@ -0,0 +1,2 @@
+csc /nologo /target:library /reference:nunit.framework.dll %KataFile%.cs
+nunit-console %KataFile%.dll /nologo

data/templates/forth.tester/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.fth.

data/templates/java.junit/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.sh and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - A Java JDK is installed on your system and 'java' and 'javac' are in the path.

data/templates/java.junit/run-once.%sh%

@@ -1,3 +1,3 @@
-rm bin/%Kata_file%Test.class
+%rm% bin/%Kata_file%Test.class
 javac -cp lib/junit.jar -d bin %Kata_file%Test.java
 java -cp lib/junit.jar:bin org.junit.runner.JUnitCore %Kata_file%Test

data/templates/javascript.jspec/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.js.

data/templates/javascript.vows/README

@@ -1,7 +1,8 @@
-One shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-endless.%sh% runs your tests endlessly.
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.js.

data/templates/python.pytest/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.py.

data/templates/python.pyunit/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.py.

data/templates/ruby.test-unit/README

@@ -1,8 +1,9 @@
-Two shell scripts were created:
+These files were created:
+  README is what you are currently reading
   run-once.%sh% runs your tests once
   run-endless.%sh% runs your tests endlessly via run-once.%sh%
 
-Run run-endless.%sh% and start your kata.
+Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
   - The whole kata source code is in the one %kata_file%.rb.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 1
-  - 11
-  version: 1.1.11
+  - 12
+  version: 1.1.12
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 0
+        - 5
+        version: 1.0.5
+  type: :runtime
+  version_requirements: *id002
 description: Client executes tests in an endless loop and logs source code and test result for later uplaod.
 email: codersdojo@it-agile.de
 executables: 
@@ -70,6 +86,10 @@ files:
 - templates/clojure.is-test/README
 - templates/clojure.is-test/run-endless.%sh%
 - templates/clojure.is-test/run-once.%sh%
+- templates/csharp.nunit/%kata_file%.cs
+- templates/csharp.nunit/README
+- templates/csharp.nunit/run-endless.%sh%
+- templates/csharp.nunit/run-once.%sh%
 - templates/forth.tester/%kata_file%.fth
 - templates/forth.tester/README
 - templates/forth.tester/run-endless.%sh%