codersdojo 1.5.01 → 1.5.02

data/lib/argument_parser.rb

@@ -1,5 +1,4 @@
 require 'record/session_id_generator'
-require 'record/return_code_evaluator'
 require 'run/runner'
 require 'state_reader'
 require 'shell_argument_exception'
@@ -19,8 +18,7 @@ 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
+		runner = Runner.new shell, SessionIdGenerator.new, view, meta_config_file
 		@help_command = HelpCommand.new view
 		@xhelp_command = XHelpCommand.new view
 		@generate_command = GenerateCommand.new shell, view, scaffolder

data/lib/run/runner.rb

@@ -9,12 +9,12 @@ class Runner
 
 	WORKING_DIR = '.'
 
-  def initialize shell, session_provider, view, return_code_evaluator
-    @filename_formatter = FilenameFormatter.new
+  def initialize shell, session_provider, view, meta_config_file
+	  @filename_formatter = FilenameFormatter.new
     @shell = shell
     @session_provider = session_provider
 		@view = view
-		@return_code_evaluator = return_code_evaluator
+		@meta_config_file = meta_config_file
   end
 
   def start
@@ -31,6 +31,7 @@ class Runner
   end
 
   def execute
+		return_code_evaluator = ReturnCodeEvaluator.new meta_config_file.success_detection	
 		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
@@ -40,16 +41,16 @@ class Runner
     end
     Progress.end
 		@view.show_run_once_message newest_dir_entry, change_time
-		execute_once files, @session_id, @step
+		execute_once files, @session_id, @step, return_code_evaluator
     @step += 1
     @previous_change_time = change_time
   end
 
-	def execute_once files, session_id, step
+	def execute_once files, session_id, step, return_code_evaluator
 		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)
+    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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.01
+  - 2
+  version: 1.5.02
 platform: ruby
 authors: 
 - CodersDojo-Team