codersdojo 1.3.01 → 1.4.00

data/app/argument_parser.rb

@@ -3,11 +3,13 @@ require 'runner'
 require 'shell_argument_exception'
 require 'shell_wrapper'
 require 'console_view'
+require 'state_reader'
 require 'help_command'
 require 'xhelp_command'
 require 'generate_command'
 require 'init_session_command'
 require 'capture_single_run_command'
+require 'revert_to_green_command'
 require 'upload_command'
 require 'upload_no_open_command'
 require 'start_command'
@@ -15,6 +17,7 @@ require 'start_command'
 class ArgumentParser
 	
 	def initialize shell, view, scaffolder, hostname
+		meta_config_file = MetaConfigFile.new shell
 		@help_command = HelpCommand.new view
 		@xhelp_command = XHelpCommand.new view
 		@generate_command = GenerateCommand.new shell, view, scaffolder
@@ -22,9 +25,11 @@ class ArgumentParser
 		@upload_no_open_command = UploadNoOpenCommand.new @upload_command
 		@init_session_command = InitSessionCommand.new shell, view
 		@capture_single_run_command = CaptureSingleRunCommand.new shell, view
-		@start_command = StartCommand.new shell, view, @upload_command
+		@revert_to_green_command = RevertToGreenCommand.new shell, view, meta_config_file, StateReader.new(shell)
+		@start_command = StartCommand.new shell, view, [@upload_command, @revert_to_green_command]
 		@commands = [@help_command, @xhelp_command, @generate_command, @init_session_command, 
-			@capture_single_run_command, @start_command, @upload_command, @upload_no_open_command]
+			@capture_single_run_command, @start_command, @revert_to_green_command,
+			@upload_command, @upload_no_open_command]
 	end
 	
 	def parse params

data/app/capture_single_run_command.rb

@@ -28,5 +28,9 @@ class CaptureSingleRunCommand
 	def accepts_shell_command? command
 		command == COMMAND_NAME
 	end
+	
+	def continue_test_loop?
+		false
+	end
 		
 end

data/app/console_view.rb

@@ -180,6 +180,14 @@ helptext
 		show result
 	end
 	
+	def show_revert_to_step step
+		show "Revert to step #{step}."
+	end
+	
+	def show_no_green_state_to_revert_to
+		show "Sorry, no previous green state to revert to."
+	end
+	
 	def show_socket_error command
 		show "Encountered network error while <#{command}>. Is http://www.codersdojo.com down?"
 	end
@@ -194,6 +202,7 @@ helptext
 		show <<-msg 
 
 You finished your kata. Choose your next action:
+  g) Revert to last green state.
   u) Upload the kata to http://www.codersdojo.com.
   e) Exit without uploading.
   r) Resume the kata.

data/app/filename.rb

@@ -0,0 +1,61 @@
+class Filename
+	
+	DIR_SEPARATOR = '/'
+	WINDOWS_DIR_SEPARATOR = '\\'
+	
+	attr_accessor :path_items
+	
+	def initialize filename
+		filename = filename.gsub(WINDOWS_DIR_SEPARATOR, DIR_SEPARATOR)
+		@path_items = filename.split(DIR_SEPARATOR).delete_if{|item| item.empty?}
+		@absolute_path = filename.start_with? DIR_SEPARATOR
+	end
+	
+	def absolute_path?
+		@absolute_path
+	end
+	
+	def relative_path?
+		not absolute_path?
+	end
+	
+	def without_extension 
+		if @path_items.size > 0 and @path_items.last.include? '.' then
+			Filename.new(to_s.split('.')[0..-2].join('.'))
+		else
+			clone
+		end
+	end
+	
+	def extract_last_path_item
+		Filename.new(nil_to_empty_string @path_items.last)
+	end
+	
+	def remove_last_path_item
+		Filename.new(make_string(@path_items[0..-2]))
+	end
+	
+	def to_unix_s
+		make_string @path_items
+	end
+	
+	def to_windows_s
+		make_string @path_items, WINDOWS_DIR_SEPARATOR
+	end
+	
+	def to_s
+		to_unix_s
+	end
+	
+private
+	
+	def make_string the_path_items, seperator=DIR_SEPARATOR
+		prefix = absolute_path? ? seperator : ''
+		prefix + the_path_items.join(seperator)
+	end
+
+	def nil_to_empty_string object
+		object.nil? ? "" : object
+	end
+	
+end

data/app/filename_formatter.rb

@@ -1,9 +1,12 @@
+require 'shell_wrapper'
+
 class FilenameFormatter
 
   CODERSDOJO_WORKSPACE = ".codersdojo"
   RESULT_FILE = "result.txt"
   INFO_FILE = "info.yml"
   STATE_DIR_PREFIX = "state_"
+	DIR_SEPARATOR = '/'
 
 	def self.state_dir_prefix
 		STATE_DIR_PREFIX
@@ -14,7 +17,7 @@ class FilenameFormatter
 	end
 
 	def source_file_in_state_dir? file
-		file = extract_last_path_item file
+		file = Filename.new(file).extract_last_path_item.to_s
 		file != '..' and file != '.' and file != INFO_FILE and file != RESULT_FILE
 	end
 
@@ -27,12 +30,12 @@ class FilenameFormatter
   end
 
   def state_file state_dir, file
-    "#{state_dir}/#{file}"
+    concat_path state_dir, file
   end
 
   def state_dir session_id, step
     session_directory = session_dir session_id
-    "#{session_directory}/#{STATE_DIR_PREFIX}#{step}"
+    concat_path session_directory, "#{STATE_DIR_PREFIX}#{step}"
   end
 
 	def step_number_from_state_dir state_dir
@@ -40,29 +43,13 @@ class FilenameFormatter
 	end
 
   def session_dir session_id
-    "#{CODERSDOJO_WORKSPACE}/#{session_id}"
+    concat_path CODERSDOJO_WORKSPACE, session_id
   end
 
-	def without_extension filename
-		if filename.include? '.' then
-			filename.split('.')[0..-2].join('.')
-		else
-			filename
-		end
-	end
-
-  def extract_last_path_item dir_path
-	  last_separated_by_slash = dir_path.split('/').last
-	  last_separated_by_native = dir_path.split(ShellWrapper.new.dir_separator).last
-	  last = [last_separated_by_slash, last_separated_by_native].min_by {|item| item.nil? ? 0 : item.size}
-		nil_to_empty_string last
+	def concat_path path, item
+		separator = path.end_with?(DIR_SEPARATOR) ? '' : DIR_SEPARATOR
+		"#{path}#{separator}#{item}"
 	end
 	
-	private
-	
-	def nil_to_empty_string object
-		object.nil? ? "" : object
-	end
-
 end
 

data/app/generate_command.rb

@@ -26,5 +26,9 @@ class GenerateCommand
 	def accepts_shell_command? command
 		command == 'setup'
 	end
+	
+	def continue_test_loop?
+		false
+	end
 
 end

data/app/help_command.rb

@@ -20,4 +20,8 @@ class HelpCommand
 		['help', '-h', '--help'].member? command
 	end
 
+	def continue_test_loop?
+		false
+	end
+
 end

data/app/init_session_command.rb

@@ -20,5 +20,9 @@ class InitSessionCommand
 	def accepts_shell_command? command
 		command == 'init-session'
 	end
+	
+	def continue_test_loop?
+		false
+	end
 		
 end

data/app/revert_to_green_command.rb

@@ -0,0 +1,52 @@
+
+class RevertToGreenCommand
+	
+	def initialize shell, view, meta_config_file, state_reader
+		@shell = shell
+		@view = view
+		@meta_config_file = meta_config_file
+		@state_reader = state_reader
+	end
+	
+	def execute_from_shell params
+		revert_to_green
+	end
+	
+	def execute
+		revert_to_green
+	end
+
+	def revert_to_green
+		formatter = FilenameFormatter.new
+		@state_reader.session_dir = formatter.session_dir @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace)
+		@state_reader.goto_last_state
+		state = @state_reader.read_previous_state if @state_reader.state_exist?
+		while @state_reader.state_exist? and state.red?
+			state = @state_reader.read_previous_state
+		end
+		if @state_reader.state_exist? and state.green?
+			@view.show_revert_to_step @state_reader.next_step+1
+			@shell.rm_r @meta_config_file.source_files
+			state.files.each do |file|
+				dest_file = Filename.new(file).extract_last_path_item.to_s
+				@shell.write_file dest_file, @shell.read_file(file)
+			end
+		else
+		  @view.show_no_green_state_to_revert_to
+			@state_reader.goto_last_state
+		end
+	end
+	
+	def command_key
+		'g'
+	end
+	
+	def accepts_shell_command? command
+		command == 'revert-to-green'
+	end
+	
+	def continue_test_loop?
+		true
+	end
+	
+end

data/app/scaffolder.rb

@@ -32,7 +32,7 @@ class Scaffolder
 
 	def scaffold template, kata_file
 		@template_machine.placeholder_values['kata_file.ext'] = kata_file
-		@template_machine.placeholder_values['kata_file'] = @filename_formatter.without_extension kata_file
+		@template_machine.placeholder_values['kata_file'] = Filename.new(kata_file).without_extension.to_s
 		template = template == '???' ? ANY_TEMPLATE : template
 			dir_path = "#{template_path}/#{template}"
 			to_copy = @shell.real_dir_entries dir_path

data/app/scheduler.rb

@@ -5,6 +5,7 @@ class Scheduler
 		@view = view
 		@last_action = ""
 		@commands = commands
+		@continue_after_command = false
   end
 
   def start
@@ -24,11 +25,13 @@ class Scheduler
 	end
 
 	def interrupt_kata
+		@continue_after_command = false
 		@view.show_kata_exit_message 
 		@last_action = @view.read_user_input.downcase
 		@commands.each do |command|
 			if @last_action.start_with? command.command_key
 				command.execute
+				@continue_after_command = command.continue_test_loop?
 			end
 		end
 		if last_action_was_exit? then
@@ -37,7 +40,7 @@ class Scheduler
 	end
 	
 	def continue?
-		@last_action == '' or last_action_was_resume?
+		@last_action == '' or last_action_was_resume? or @continue_after_command
 	end
 
 	def last_action_was_resume?

data/app/shell_wrapper.rb

@@ -14,6 +14,12 @@ class ShellWrapper
     FileUtils.cp_r source, destination
   end
 
+	def rm_r file_regex
+		files_in_dir_tree('.', file_regex).each do |file|
+			FileUtils.rm file
+		end
+	end
+
   def mkdir dir
     FileUtils.mkdir dir
   end

data/app/start_command.rb

@@ -3,11 +3,11 @@ require 'scheduler'
 
 class StartCommand
 	
-	def initialize shell, view, upload_command
+	def initialize shell, view, eval_loop_commands
 		@shell = shell
 		@view = view
 		@meta_file = MetaConfigFile.new @shell
-		@upload_command = upload_command
+		@eval_loop_commands = eval_loop_commands
 	end
 	
 	def execute_from_shell params
@@ -21,7 +21,7 @@ class StartCommand
 	  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 = Scheduler.new runner, @view, @eval_loop_commands
 	  scheduler.start
 	end
 	
@@ -29,4 +29,8 @@ class StartCommand
 		command == 'start'
 	end
 	
+	def continue_test_loop?
+		true
+	end
+	
 end

data/app/state.rb

@@ -1,12 +1,13 @@
 class State
 
-  attr_accessor :time, :files, :result, :return_code
+  attr_accessor :time, :files, :result, :return_code, :file_contents
 
-  def initialize time=nil, files=nil, result=nil, return_code=nil
-    @time = time
-    @files = files
-    @result = result
-    @return_code = return_code
-  end
+	def green?
+		@return_code == 0
+	end
+	
+	def red?
+		not green?
+	end
 
 end

data/app/state_reader.rb

@@ -1,4 +1,5 @@
 require 'info_property_file'
+require 'filename'
 require 'filename_formatter'
 require 'state'
 
@@ -18,7 +19,7 @@ class StateReader
 
 	def session_dir= session_dir
 		@session_dir = session_dir
-		@session_id = @filename_formatter.extract_last_path_item @session_dir
+		@session_id = Filename.new(@session_dir).extract_last_path_item.to_s
 	end
 
   def state_count
@@ -33,32 +34,57 @@ class StateReader
 		2
 	end
 
-  def get_state_dir
-    @filename_formatter.state_dir(@session_id, @next_step)
+  def get_state_dir step=@next_step
+    @filename_formatter.state_dir(@session_id, step)
   end
 
   def has_next_state
-    File.exist?(get_state_dir)
+		state_exist? @next_step
   end
 
-  def read_next_state
-    state = State.new
+	def state_exist? step=@next_step
+		File.exist?(get_state_dir step)
+	end
+
+	def goto_last_state
+		step = 0
+		while state_exist?(step) do step += 1 end
+		@next_step = step-1
+	end
+
+	def read_state
+		state = State.new
     state_dir = get_state_dir
     state.time = @shell.creation_time state_dir
-    state.files = read_source_files state_dir
+		state.files = read_source_files state_dir
+    state.file_contents = read_source_file_contents state.files
 		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
+		state
+   end
+
+  def read_next_state
+	  state = read_state
     @next_step += 1
     state
   end
 
+  def read_previous_state
+		state = read_state
+		@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}
+		files.find_all{|file| @filename_formatter.source_file_in_state_dir? file}
+	end
+
+	def read_source_file_contents source_files
 		marker = "=========="
 		source_files.collect {|file| 
-			filename = @filename_formatter.extract_last_path_item file
+			filename = Filename.new(file).extract_last_path_item.to_s
 			code = @shell.read_file(file)
 			"#{marker} #{filename} #{marker}\n\n#{code}"
 		}

data/app/upload_command.rb

@@ -25,7 +25,7 @@ class UploadCommand
 		formatter = FilenameFormatter.new
 		framework = @meta_file.framework_property
 		if not session_directory then
-			session_directory = formatter.session_dir @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace) 
+			session_directory = formatter.session_dir @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace)
 		end
 		@view.show_upload_start session_directory, @hostname, framework
 		@uploader.framework = framework
@@ -45,5 +45,9 @@ class UploadCommand
 	def accepts_shell_command? command
 		command == 'upload'
 	end
-	
+
+	def continue_test_loop?
+		false
+	end
+			
 end

data/app/upload_no_open_command.rb

@@ -16,4 +16,8 @@ class UploadNoOpenCommand
 		command == 'upload-no-open'
 	end
 	
+	def continue_test_loop?
+		false
+	end
+	
 end

data/app/uploader.rb

@@ -47,7 +47,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.files, :result => state.result, :green => green, 
+			kata_data["states[#{index}]"] = {:code => state.file_contents, :result => state.result, :green => green, 
 				:created_at => state.time}
 		end
     RestClient.post "#{@hostname}#{@@kata_path}", kata_data

data/templates/clojure.midje/%kata_file%.clj

@@ -0,0 +1,13 @@
+; Adapt the code to your code kata %kata_file%.
+
+(ns %kata_file%
+  (:use [midje.sweet]))
+
+(use 'clojure.test)
+
+(defn %kata_file% []
+  "fixme")
+
+(fact (%kata_file%) => "foo")
+
+(run-tests)

data/templates/clojure.midje/.meta

@@ -0,0 +1,3 @@
+framework: clojure.midje
+source_files: .*\.clj
+

data/templates/clojure.midje/README

@@ -0,0 +1,12 @@
+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:
+  - Java is installed on your system and 'java' is in the path.
+  - clojure.jar, clojure-contrib.jar, midje.jar and unifycle.jar are placed in the 'lib' directory.
+
+The support for Clojure/Midje was contributed by Stefan Roock.

data/templates/clojure.midje/project.clj

@@ -0,0 +1,7 @@
+(defproject %kata_file% "0.1"
+    :dependencies [[org.clojure/clojure
+                      "1.1.0-master-SNAPSHOT"]
+                   [org.clojure/clojure-contrib
+                      "1.0-SNAPSHOT"]
+									 [lein-midje "1.0.1"]]
+    :main %kata_file%)

data/templates/clojure.midje/run-endless.%sh%

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

data/templates/clojure.midje/run-once.%sh%

@@ -0,0 +1 @@
+java -cp lib/clojure-contrib.jar%:%lib/clojure.jar%:%lib/midje.jar%:%lib/unifycle.jar clojure.main %kata_file%.clj

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.01
+  - 4
+  - 0
+  version: 1.4.00
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +02:00
+date: 2011-07-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +49,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,7 +65,7 @@ dependencies:
         - 5
         version: 1.0.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: Client executes tests in an endless loop and logs source code and test result for later uplaod.
 email: codersdojo@it-agile.de
 executables: 
@@ -63,6 +79,7 @@ files:
 - app/capture_single_run_command.rb
 - app/codersdojo.rb
 - app/console_view.rb
+- app/filename.rb
 - app/filename_formatter.rb
 - app/generate_command.rb
 - app/help_command.rb
@@ -71,6 +88,7 @@ files:
 - app/meta_config_file.rb
 - app/progress.rb
 - app/property_file_missing_exception.rb
+- app/revert_to_green_command.rb
 - app/runner.rb
 - app/scaffolder.rb
 - app/scheduler.rb
@@ -96,6 +114,12 @@ files:
 - templates/clojure.is-test/README
 - templates/clojure.is-test/run-endless.%sh%
 - templates/clojure.is-test/run-once.%sh%
+- templates/clojure.midje/%kata_file%.clj
+- templates/clojure.midje/lib/place_your_libs_here
+- templates/clojure.midje/project.clj
+- templates/clojure.midje/README
+- templates/clojure.midje/run-endless.%sh%
+- templates/clojure.midje/run-once.%sh%
 - templates/cpp.gtest/%Kata_file%.cc
 - templates/cpp.gtest/Makefile
 - templates/cpp.gtest/README
@@ -171,6 +195,7 @@ files:
 - templates/shell.shunit/run-once.%sh%
 - templates/any/.meta
 - templates/clojure.is-test/.meta
+- templates/clojure.midje/.meta
 - templates/cpp.gtest/.meta
 - templates/csharp.nunit.dotnet/.meta
 - templates/csharp.nunit.mono/.meta