codersdojo 1.2.20 → 1.3.00

data/app/capture_single_run_command.rb

@@ -16,7 +16,7 @@ class CaptureSingleRunCommand
 	end
 
 	def capture_single_run run_command, kata_file
-		runner = Runner.new @shell, SessionIdGenerator.new
+		runner = Runner.new @shell, SessionIdGenerator.new, @view
 		runner.run_command = run_command
 		session_id = @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace) 
 		filename_formatter = FilenameFormatter.new

data/app/console_view.rb

@@ -153,15 +153,25 @@ helptext
 		show_usage
 	end
 	
-	def show_start_kata command, file, framework
-	  show "Starting CodersDojo-Client with command #{command} and kata file #{file} with framework #{framework}. Use Ctrl+C to finish the kata."		
-	end
-	
 	def show_missing_command_argument_error command, missing_argument
 		show "Command <#{command}> recognized but argument <#{missing_argument}> was missing.\n"
 		show_detailed_help command
 	end
 	
+	def show_deprecated_command_argument_warning command, deprecated_argument
+		show "Argument #{deprecated_argument} is deprecated for command #{command}. Please remove it."
+	end
+	
+	def show_start_kata command, file, framework
+	  show "Starting CodersDojo-Client with command #{command} and kata file #{file} with framework #{framework}. Use Ctrl+C to finish the kata."		
+	end
+
+	def show_run_once_message modified_file, modification_time
+		time = modification_time.strftime("%X")
+		date = modification_time.strftime("%x")
+		show "\nFile #{modified_file} was modified at #{time} on #{date}. Run tests."
+	end
+	
 	def show_upload_start session_directory, hostname, framework
 		show "Start upload from #{session_directory} with framework #{framework} to #{hostname}"
 	end

data/app/filename_formatter.rb

@@ -13,10 +13,10 @@ class FilenameFormatter
 		CODERSDOJO_WORKSPACE
 	end
 
-  def source_code_file state_dir
-    Dir.entries(state_dir).each { |file|
-      return state_file state_dir, file unless file =='..' || file == '.' || file == INFO_FILE || file == RESULT_FILE }
-  end
+	def source_file_in_state_dir? file
+		file = extract_last_path_item file
+		file != '..' and file != '.' and file != INFO_FILE and file != RESULT_FILE
+	end
 
   def result_file state_dir
     state_file state_dir, RESULT_FILE

data/app/init_session_command.rb

@@ -12,7 +12,7 @@ class InitSessionCommand
 	end
 
 	def init_session
-		runner = Runner.new @shell, SessionIdGenerator.new
+		runner = Runner.new @shell, SessionIdGenerator.new, @view
 	  session_dir = runner.init_session
 	  @view.show_init_session_result session_dir
 	end

data/app/meta_config_file.rb

@@ -1,6 +1,6 @@
 class MetaConfigFile
 
-	PROPERTY_FILENAME = '.meta'	
+	PROPERTY_FILENAME = '.meta'
 	
 	def initialize shell
 		@shell = shell
@@ -9,9 +9,14 @@ class MetaConfigFile
 	def framework_property
 		properties['framework']
 	end
+	
+	def source_files
+		properties['source_files']
+	end
 
 	def properties
-	  @shell.read_properties PROPERTY_FILENAME
+	  @properties = @shell.read_properties PROPERTY_FILENAME unless @properties
+	  @properties
 	end
 	
 end

data/app/runner.rb

@@ -4,12 +4,15 @@ require "text_converter"
 
 class Runner
 
-  attr_accessor :file, :run_command
+  attr_accessor :source_files, :run_command
 
-  def initialize shell, session_provider
+	WORKING_DIR = '.'
+
+  def initialize shell, session_provider, view
     @filename_formatter = FilenameFormatter.new
     @shell = shell
     @session_provider = session_provider
+		@view = view
   end
 
   def start
@@ -26,23 +29,26 @@ class Runner
   end
 
   def execute
-    change_time = @shell.modification_time @file
+		files = @shell.files_in_dir_tree WORKING_DIR, @source_files
+		newest_dir_entry = @shell.newest_dir_entry WORKING_DIR, files
+    change_time = @shell.modification_time newest_dir_entry
     if change_time == @previous_change_time then
 	 	  Progress.next
       return
     end
     Progress.end
-		execute_once @file, @session_id, @step
+		@view.show_run_once_message newest_dir_entry, change_time
+		execute_once files, @session_id, @step
     @step += 1
     @previous_change_time = change_time
   end
 
-	def execute_once file, session_id, step
+	def execute_once files, session_id, step
 		process = @shell.execute @run_command
 		result = TextConverter.new.remove_escape_sequences process.output
     state_dir = @filename_formatter.state_dir session_id, step
     @shell.mkdir state_dir
-    @shell.cp file, state_dir
+    @shell.cp_r files, state_dir
     @shell.write_file @filename_formatter.result_file(state_dir), result
     @shell.write_file @filename_formatter.info_file(state_dir), "#{InfoPropertyFile.RETURN_CODE_PROPERTY}: #{process.return_code}"
 	end

data/app/shell_wrapper.rb

@@ -68,17 +68,29 @@ class ShellWrapper
 	
 	def files_in_dir dir, regexp_pattern=nil
 		Dir.new(dir).entries.find_all{|entry|
-			File.file?(entry) and (not regexp_pattern or entry =~ Regexp.new(regexp_pattern))
+			file_matches_regexp? entry, regexp_pattern
 		}
 	end
+	
+	def files_in_dir_tree dir, regexp_pattern=nil
+		Dir.glob("#{dir}/**/*").find_all{|entry|
+			file_matches_regexp? entry, regexp_pattern
+		}
+	end
+
+	def file_matches_regexp? dir_entry, regexp_pattern
+		File.file?(dir_entry) and (not regexp_pattern or dir_entry =~ Regexp.new(regexp_pattern))
+	end
 		
-	def newest_dir_entry dir
-		real_dir_entries(dir).sort_by do |entry| 
+	
+	def newest_dir_entry dir, files=nil
+		unless files then files = real_dir_entries(dir) end
+		files.sort_by do |entry| 
 			complete_path = File.join dir, entry
 			File.mtime(complete_path)
 		end.last
 	end
-
+	
   def file? filename
 		File.file? filename
 	end

data/app/start_command.rb

@@ -16,12 +16,12 @@ class StartCommand
 
 	def start command, file
 		unless command then @view.show_missing_command_argument_error "start", "shell_command"; return end
-		unless file then @view.show_missing_command_argument_error "start", "kata_file"; return end
+		if file then @view.show_deprecated_command_argument_warning "start", "kata_file" end # since 30-may-2011, remove argument in later version
 	  @view.show_start_kata command, file, @meta_file.framework_property
-	  dojo = Runner.new @shell, SessionIdGenerator.new
-	  dojo.file = file
-	  dojo.run_command = command
-	  scheduler = Scheduler.new dojo, @view, [@upload_command]
+	  runner = Runner.new @shell, SessionIdGenerator.new, @view
+		runner.source_files = @meta_file.source_files
+	  runner.run_command = command
+	  scheduler = Scheduler.new runner, @view, [@upload_command]
 	  scheduler.start
 	end
 	

data/app/state.rb

@@ -1,10 +1,10 @@
 class State
 
-  attr_accessor :time, :code, :result, :return_code
+  attr_accessor :time, :files, :result, :return_code
 
-  def initialize time=nil, code=nil, result=nil, return_code=nil
+  def initialize time=nil, files=nil, result=nil, return_code=nil
     @time = time
-    @code = code
+    @files = files
     @result = result
     @return_code = return_code
   end

data/app/state_reader.rb

@@ -45,14 +45,20 @@ class StateReader
     state = State.new
     state_dir = get_state_dir
     state.time = @shell.creation_time state_dir
-    state.code = @shell.read_file @filename_formatter.source_code_file(state_dir)
-    state.result = @shell.read_file @filename_formatter.result_file(state_dir)
+    state.files = read_source_files state_dir
+		state.result = @shell.read_file @filename_formatter.result_file(state_dir)
 		properties = @shell.read_properties @filename_formatter.info_file(state_dir)
 		fill_state_with_properties state, properties
     @next_step += 1
     state
   end
 
+	def read_source_files state_dir
+		files = @shell.files_in_dir_tree state_dir
+		source_files = files.find_all{|file| @filename_formatter.source_file_in_state_dir? file}
+		source_files.collect {|file| @shell.read_file file}
+	end
+
 	def fill_state_with_properties state, properties
 		state.return_code = properties[InfoPropertyFile.RETURN_CODE_PROPERTY]
 	end

data/app/uploader.rb

@@ -46,7 +46,7 @@ class Uploader
 		kata_data = {:framework => @framework}
 		states_data = states.each_with_index do |state,index|
 			green = state.return_code == 0
-			kata_data["states[#{index}]"] = {:code => state.code, :result => state.result, :green => green, 
+			kata_data["states[#{index}]"] = {:code => state.files, :result => state.result, :green => green, 
 				:created_at => state.time}
 		end
     RestClient.post "#{@hostname}#{@@kata_path}", kata_data

data/templates/any/README

@@ -10,6 +10,3 @@ You have to adapt the .meta file:
 'source_files' is a regular expression that match the source files of the kata. A valid source_files definition would be .*\.java for all files ending with .java.
 
 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.ext%.

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

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file.ext%
+codersdojo start run-once.%sh%

data/templates/clojure.is-test/%kata_file%.clj

@@ -1,6 +1,4 @@
 ; Adapt the code to your code kata %kata_file%.
-; Important: Test and production code has to be
-;            completely in this file.
 
 (use 'clojure.test)
 

data/templates/clojure.is-test/README

@@ -6,7 +6,6 @@ These files were created:
 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.
   - Java is installed on your system and 'java' is in the path.
   - clojure.jar and clojure-contrib.jar are placed in the 'lib' directory.
 

data/templates/clojure.is-test/run-endless.%sh%

@@ -1,2 +1,2 @@
-codersdojo start run-once.%sh% %kata_file%.clj
+codersdojo start run-once.%sh%
 

data/templates/cpp.gtest/README

@@ -7,7 +7,6 @@ Run run-endless.sh and start your kata. (On Mac/Linux you have to call ./run-end
 
 Assumptions:
   - make and a C++ compiler (like gcc) is installed on your system and is in the PATH
-  - The whole kata source code is in the one %Kata_file%.cc.
   - The GTest framework is in the directory gtest.
   - If your IDE does the compilation and linking, you should remove the first 3 lines
     in the run-once.%sh% file.

data/templates/cpp.gtest/run-endless.sh

@@ -1 +1 @@
-codersdojo start run-once.sh %Kata_file%.cc
+codersdojo start run-once.sh

data/templates/csharp.nunit.dotnet/README

@@ -10,7 +10,7 @@ Assumptions:
   - the Path includes:
       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\)
+  - you are using NUnit versoon 2.5.10 or higher.
   - nunit.framework.dll is in the same directory as %Kata_file%.cs.
-  - The whole kata source code is in the one %Kata_file%.cs.
 
 The support for C#/NUnit was contributed by Meike Mertsch (Twitter: meikemertsch).

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

@@ -1 +1 @@
-codersdojo start run-once.%sh% %Kata_file%.cs
+codersdojo start run-once.%sh%

data/templates/csharp.nunit.mono/README

@@ -8,6 +8,5 @@ Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-e
 Assumptions:
   - The MonoDevelop framework is installed.
   - nunit.framework.dll is in the same directory as %Kata_file%.cs.
-  - The whole kata source code is in the one %Kata_file%.cs.
 
 The support for C#/NUnit was contributed by Meike Mertsch (Twitter: meikemertsch).

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

@@ -1 +1 @@
-codersdojo start run-once.%sh% %Kata_file%.cs
+codersdojo start run-once.%sh%

data/templates/forth.tester/README

@@ -5,7 +5,4 @@ These files were created:
 
 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.
-
 The support for Forth/Tester was contributed by Stefan Roock.

data/templates/forth.tester/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.sh %kata_file%.fth
+codersdojo start run-once.sh

data/templates/groovy.gunit/README

@@ -8,6 +8,5 @@ Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-e
 Assumptions:
   - Java and Groovy is installed on your system, 'groovy' is in the path and GROOVY_HOME is set.
   - groovy.jar is placed in the 'lib' directory.
-  - The whole kata source code is in the one %Kata_file%Test.groovy.
 
 The support for Groovy/GUnit was contributed by Stefan Roock.

data/templates/groovy.gunit/run-endless.sh

@@ -1 +1 @@
-codersdojo start run-once.sh %Kata_file%Test.groovy
+codersdojo start run-once.sh

data/templates/java.junit/%Kata_file%Test.java

@@ -1,6 +1,4 @@
 // Adapt the code to your code kata %kata_file%.
-// Important: Test and production code has to be
-//            completely in this file.
 
 import org.junit.*;
 import static org.junit.Assert.*;

data/templates/java.junit/README

@@ -9,7 +9,6 @@ Assumptions:
   - A Java JDK is installed on your system and 'java' and 'javac' are in the path.
   - junit.jar is placed in the 'lib' directory.
   - junit.jar contains JUnit 4.
-  - The whole kata source code is in the one %Kata_file%Test.java.
   - The kata class file is generated into the 'bin' directory.
   - In the source file the classes are placed in the default package.
   - The kata source file has a main method that starts the tests.

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

@@ -1 +1 @@
-codersdojo start run-once.%sh% %Kata_file%Test.java
+codersdojo start run-once.%sh%

data/templates/javascript.jspec/README

@@ -5,7 +5,4 @@ These files were created:
 
 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 spec.js.
-
 The support for JavaScript/JSpec was contributed by Marko Schulz.

data/templates/javascript.jspec/run-endless.%sh%

@@ -3,4 +3,4 @@ then
   jspec init
   mv spec.js spec/unit
 fi
-codersdojo start run-once.%sh% spec/unit/spec.js
+codersdojo start run-once.%sh%

data/templates/javascript.jspec/spec.js

@@ -1,6 +1,4 @@
 // Adapt the code to your code kata %kata_file%.
-// Important: Test and production code has to be
-//            completely in this file.
 
 describe '%kata_file%'
   describe '.foo()'

data/templates/javascript.vows/%kata_file%-test.js

@@ -1,6 +1,4 @@
 // Adapt the code to your code kata %kata_file%.
-// Important: Test and production code has to be
-//            completely in this file.
 
 require.paths.push(__dirname + '/../lib/');
 require.paths.push(__dirname + '/../deps/');	

data/templates/javascript.vows/README

@@ -4,7 +4,4 @@ These files were created:
 
 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.
-
 The support for JavaScript/Vows was contributed by Matthias Lübken.

data/templates/javascript.vows/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start "vows %kata_file%.js" %kata_file%.js
+codersdojo start "vows %kata_file%.js"

data/templates/objective-c.ocunit/%Kata_file%Tests.m

@@ -1,6 +1,4 @@
 // Adapt the code to your code kata %kata_file%.
-// Important: Test and production code has to be
-//            completely in this file.
 
 #import <Cocoa/Cocoa.h>
 #import <SenTestingKit/SenTestingKit.h>

data/templates/objective-c.ocunit/README

@@ -5,7 +5,4 @@ These files were created:
 
 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%.m.
-
 The support for Objective-C/OCUnit was contributed by Sven Günther.

data/templates/objective-c.ocunit/run-endless.%sh%

@@ -1,2 +1,2 @@
-codersdojo start run-once.sh %Kata_file%Tests.m
+codersdojo start run-once.sh
 

data/templates/perl.test/README

@@ -5,7 +5,4 @@ These files were created:
 
 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%.pl.
-
 The support for Perl/Test was contributed by Stefan Roock.

data/templates/perl.test/run-endless.sh

@@ -1 +1 @@
-codersdojo start run-once.sh %kata_file%.pl
+codersdojo start run-once.sh

data/templates/php.phpunit/%kata_file%.php

@@ -1,7 +1,5 @@
 <?php
 // Adapt the code to your code kata %kata_file%.
-// Important: Test and production code has to be
-//            completely in this file.
 
 require_once 'PHPUnit/Autoload.php';
 

data/templates/php.phpunit/README

@@ -5,7 +5,4 @@ These files were created:
 
 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%.php.
-
 The support for PHP/PHP-Unit was contributed by Gregor Gramlich.

data/templates/php.phpunit/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%.php
+codersdojo start run-once.%sh%

data/templates/python.pytest/%kata_file%.py

@@ -1,6 +1,4 @@
 # Adapt the code to your code kata %kata_file%.
-# Important: Test and production code has to be
-#            completely in this file.
 
 def foo(num):	
     return 'fixme' 

data/templates/python.pytest/README

@@ -5,7 +5,4 @@ These files were created:
 
 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.
-
 The support for Python/PyTest was contributed by Sebastian Sanitz (github.com/sanitz).

data/templates/python.pytest/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%.py
+codersdojo start run-once.%sh%

data/templates/python.pyunit/%kata_file%.py

@@ -1,6 +1,4 @@
 # Adapt the code to your code kata %kata_file%.
-# Important: Test and production code has to be
-#            completely in this file.
 
 import unittest
 

data/templates/python.pyunit/README

@@ -5,7 +5,4 @@ These files were created:
 
 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.
-
 The support for Python/PyUnit was contributed by Steven Collins (Twitter: @lomin).

data/templates/python.pyunit/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%.py
+codersdojo start run-once.%sh%

data/templates/ruby.rspec/%kata_file%.rb

@@ -1,7 +1,4 @@
 # Adapt the code to your code kata %kata_file%.
-# Important: Test and production code has to be
-#            completely in this file.
-
 
 class %Kata_file%
 

data/templates/ruby.rspec/README

@@ -5,7 +5,4 @@ These files were created:
 
 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.
-
 The support for Ruby/RSpec was contributed by Stefan Roock.

data/templates/ruby.rspec/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%.rb
+codersdojo start run-once.%sh%

data/templates/ruby.test-unit/%kata_file%.rb

@@ -1,6 +1,4 @@
 # Adapt the code to your code kata %kata_file%.
-# Important: Test and production code has to be
-#            completely in this file.
 
 require 'test/unit'
 

data/templates/ruby.test-unit/README

@@ -5,7 +5,4 @@ These files were created:
 
 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.
-
 The support for Ruby/TestUnit was contributed by Stefan Roock.

data/templates/ruby.test-unit/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%.rb
+codersdojo start run-once.%sh%

data/templates/scala.junit/%Kata_file%Test.scala

@@ -1,6 +1,4 @@
 // Adapt the code to your code kata primes.
-// Important: Test and production code has to be
-//            completely in this file.
 
 import org.junit.Test
 import org.junit.Assert._

data/templates/scala.junit/README

@@ -9,7 +9,6 @@ Assumptions:
   - A Java JDK is installed on your system and 'java' and 'javac' are in the path.
   - scala-library.jar, junit.jar and org.hamcrest.core.jar are placed in the 'lib' directory.
   - junit.jar contains JUnit 4.
-  - The whole kata source code is in the one %Kata_file%Test.scala.
   - The kata class file is generated into the 'bin' directory.
   - In the source file the classes are placed in the default package.
   - The kata source file has a main method that starts the tests.

data/templates/scala.junit/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %Kata_file%Test.scala
+codersdojo start run-once.%sh%

data/templates/shell.shunit/README

@@ -6,7 +6,6 @@ These files were created:
 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%.sh.
   - shunit2 is in your path.
 
 The support for Shell/ShUnit was contributed by Stefan Roock (Twitter: StefanRoock, http://stefanroock.de).

data/templates/shell.shunit/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%.sh
+codersdojo start run-once.%sh%

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 20
-  version: 1.2.20
+  - 3
+  - 0
+  version: 1.3.00
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-05-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency