codersdojo 1.4.06 → 1.4.07

data/app/argument_parser.rb

@@ -3,6 +3,7 @@ require 'runner'
 require 'shell_argument_exception'
 require 'shell_wrapper'
 require 'console_view'
+require 'return_code_evaluator'
 require 'state_reader'
 require 'help_command'
 require 'xhelp_command'
@@ -18,15 +19,17 @@ class ArgumentParser
 	
 	def initialize shell, view, scaffolder, hostname
 		meta_config_file = MetaConfigFile.new shell
+		return_code_evaluator = ReturnCodeEvaluator.new meta_config_file.success_detection
+		runner = Runner.new shell, SessionIdGenerator.new, view, return_code_evaluator
 		@help_command = HelpCommand.new view
 		@xhelp_command = XHelpCommand.new view
 		@generate_command = GenerateCommand.new shell, view, scaffolder
 		@upload_command = UploadCommand.new shell, view, hostname
 		@upload_no_open_command = UploadNoOpenCommand.new @upload_command
-		@init_session_command = InitSessionCommand.new shell, view
-		@capture_single_run_command = CaptureSingleRunCommand.new shell, view
+		@init_session_command = InitSessionCommand.new view, runner
+		@capture_single_run_command = CaptureSingleRunCommand.new shell, view, runner
 		@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]
+		@start_command = StartCommand.new meta_config_file, runner, view, [@upload_command, @revert_to_green_command]
 		@commands = [@help_command, @xhelp_command, @generate_command, @init_session_command, 
 			@capture_single_run_command, @start_command, @revert_to_green_command,
 			@upload_command, @upload_no_open_command]

data/app/capture_single_run_command.rb

@@ -4,9 +4,10 @@ class CaptureSingleRunCommand
 
 	COMMAND_NAME = 'capture-single-run'
 
-	def initialize shell, view
+	def initialize shell, view, runner
 		@shell = shell
 		@view = view
+		@runner = runner
 	end
 
 	def execute_from_shell params
@@ -16,13 +17,12 @@ class CaptureSingleRunCommand
 	end
 
 	def capture_single_run run_command, kata_file
-		runner = Runner.new @shell, SessionIdGenerator.new, @view
-		runner.run_command = run_command
+		@runner.run_command = run_command
 		session_id = @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace) 
 		filename_formatter = FilenameFormatter.new
 		last_state_dir = @shell.newest_dir_entry(filename_formatter.session_dir session_id)
 		step = last_state_dir.nil? ? 0 : filename_formatter.step_number_from_state_dir(last_state_dir) + 1
-		runner.execute_once kata_file, session_id, step
+		@runner.execute_once kata_file, session_id, step
 	end
 
 	def accepts_shell_command? command

data/app/info_property_file.rb

@@ -3,5 +3,5 @@ class InfoPropertyFile
   def self.RETURN_CODE_PROPERTY
 	  'return_code'
   end
-	
+
 end

data/app/init_session_command.rb

@@ -2,9 +2,9 @@ require 'runner'
 
 class InitSessionCommand
 
-	def initialize shell, view
-		@shell = shell
+	def initialize view, runner
 		@view = view
+		@runner = runner
 	end
 
 	def execute_from_shell params
@@ -12,8 +12,7 @@ class InitSessionCommand
 	end
 
 	def init_session
-		runner = Runner.new @shell, SessionIdGenerator.new, @view
-	  session_dir = runner.init_session
+	  session_dir = @runner.init_session
 	  @view.show_init_session_result session_dir
 	end
 	

data/app/meta_config_file.rb

@@ -14,6 +14,10 @@ class MetaConfigFile
 		properties['source_files']
 	end
 
+  def success_detection
+	  properties['success_detection']
+	end
+
 	def properties
 	  @properties = @shell.read_properties PROPERTY_FILENAME unless @properties
 	  @properties

data/app/return_code_evaluator.rb

@@ -0,0 +1,24 @@
+class ReturnCodeEvaluator 
+
+  SUCCESS_RETURN_CODE = 0
+  FAILURE_RETURN_CODE = 1
+
+  def initialize success_detection
+	  @success_detection = success_detection
+  end
+
+  def return_code process
+	  return process.return_code unless @success_detection
+	  return_code_from_output process.output
+	end	
+	
+	def return_code_from_output output
+		space_or_start_of_line = "( |^)"
+    if output =~ /#{space_or_start_of_line}#{@success_detection}/ then
+		  SUCCESS_RETURN_CODE
+		else
+			FAILURE_RETURN_CODE
+		end
+	end
+	
+end

data/app/runner.rb

@@ -1,6 +1,7 @@
 require "info_property_file"
 require "filename_formatter"
 require "text_converter"
+require "return_code_evaluator"
 
 class Runner
 
@@ -8,11 +9,12 @@ class Runner
 
 	WORKING_DIR = '.'
 
-  def initialize shell, session_provider, view
+  def initialize shell, session_provider, view, return_code_evaluator
     @filename_formatter = FilenameFormatter.new
     @shell = shell
     @session_provider = session_provider
 		@view = view
+		@return_code_evaluator = return_code_evaluator
   end
 
   def start
@@ -47,10 +49,11 @@ class Runner
 		process = @shell.execute @run_command
 		result = TextConverter.new.remove_escape_sequences process.output
     state_dir = @filename_formatter.state_dir session_id, step
+    return_code = @return_code_evaluator.return_code(process)
     @shell.mkdir 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}"
+    @shell.write_file @filename_formatter.info_file(state_dir), "#{InfoPropertyFile.RETURN_CODE_PROPERTY}: #{return_code}"
 	end
 	
 	def run_command= command

data/app/session_zipper.rb

@@ -17,5 +17,3 @@ class SessionZipper
 	end	
 	
 end
-
-SessionZipper.new.compress ".codersdojo/broken"

data/app/start_command.rb

@@ -3,10 +3,10 @@ require 'scheduler'
 
 class StartCommand
 	
-	def initialize shell, view, eval_loop_commands
-		@shell = shell
+	def initialize meta_config_file, runner, view, eval_loop_commands
+		@runner = runner
 		@view = view
-		@meta_file = MetaConfigFile.new @shell
+		@meta_file = meta_config_file
 		@eval_loop_commands = eval_loop_commands
 	end
 	
@@ -18,10 +18,9 @@ class StartCommand
 		unless command then @view.show_missing_command_argument_error "start", "shell_command"; 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
-	  runner = Runner.new @shell, SessionIdGenerator.new, @view
-		runner.source_files = @meta_file.source_files
-	  runner.run_command = command
-	  scheduler = Scheduler.new runner, @view, @eval_loop_commands
+		@runner.source_files = @meta_file.source_files
+	  @runner.run_command = command
+	  scheduler = Scheduler.new @runner, @view, @eval_loop_commands
 	  scheduler.start
 	end
 	

data/app/uploader.rb

@@ -6,6 +6,7 @@ require 'filename_formatter'
 require 'xml_element_extractor'
 require 'rest_client'
 require 'shell_wrapper'
+require 'session_zipper'
 
 class Uploader
 
@@ -21,6 +22,7 @@ class Uploader
   end
 
 	def session_dir= dir
+		@session_dir = dir
 		@state_reader.session_dir = dir
 	end
 
@@ -30,6 +32,7 @@ class Uploader
   end
 
   def upload_kata_and_states
+	  upload_zipped_kata zip_kata
 		read_states
     kata = upload_kata
 		finish_url = "#{@hostname}#{@@description_path}/#{XMLElementExtractor.extract('kata/private-uuid', kata)}"
@@ -52,10 +55,19 @@ class Uploader
     RestClient.post "#{@hostname}#{@@kata_path}", kata_data
   end
 
-  private
+  def zip_kata
+#	  SessionZipper.new.compress @session_dir
+  end
+
+  def upload_zipped_kata zip_file
+#	  RestClient.post "#{@hostname}#{@@zipped_kata_path}", {:zipped_kata => zip_file}
+  end
+
+private
   @@kata_path = '/katas'
   @@state_path = '/states'
 	@@description_path = '/kata_description'
+	@@zipped_kata_path = '/zipped_katas'
 
 end
 

data/templates/clojure.is-test/.meta

@@ -1,3 +1,3 @@
 framework: clojure.is-test
 source_files: .*\.clj
-
+success_detection: "0 failures, 0 errors"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 6
-  version: 1.4.06
+  - 7
+  version: 1.4.07
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 +02:00
+date: 2011-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - app/meta_config_file.rb
 - app/progress.rb
 - app/property_file_missing_exception.rb
+- app/return_code_evaluator.rb
 - app/revert_to_green_command.rb
 - app/runner.rb
 - app/scaffolder.rb
@@ -226,7 +227,6 @@ files:
 - templates/ruby.test-unit/.meta
 - templates/scala.junit/.meta
 - templates/shell.shunit/.meta
-- lib/place_libs_here
 has_rdoc: true
 homepage: http://www.codersdojo.org/
 licenses: []