codersdojo 1.5.06 → 1.5.07

data/lib/codersdojo.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
+require 'shellutils/argument_parser'
 require 'console_view'
-require 'argument_parser'
+require 'commands/command_configuration'
 require 'scaffold/scaffolder'
 
 class CodersDojo
@@ -18,7 +19,8 @@ class CodersDojo
 		view = ConsoleView.new scaffolder
 
 		begin
-			arg_parser = ArgumentParser.new shell, view, scaffolder, @hostname
+			command_config = CommandConfiguration.new shell, view, scaffolder, @hostname
+			arg_parser = ArgumentParser.new command_config.commands
 			command = arg_parser.parse @params
 		rescue ShellArgumentException => e
 			view.show_unknwon_command_message e.command

data/lib/{argument_parser.rb → commands/command_configuration.rb}

@@ -1,4 +1,5 @@
 require 'record/session_id_generator'
+require 'record/state_recorder'
 require 'run/runner'
 require 'state_reader'
 require 'shellutils/shell_argument_exception'
@@ -15,11 +16,13 @@ require 'commands/upload_no_open_command'
 require 'commands/upload_zipped_session_command'
 require 'commands/start_command'
 
-class ArgumentParser
+class CommandConfiguration
+	
+	attr_reader :commands
 	
 	def initialize shell, view, scaffolder, hostname
 		meta_config_file = MetaConfigFile.new shell
-		runner = Runner.new shell, SessionIdGenerator.new, view, meta_config_file
+		runner = create_runner shell, view, meta_config_file
 		@help_command = HelpCommand.new view
 		@xhelp_command = XHelpCommand.new view
 		@generate_command = GenerateCommand.new shell, view, scaffolder
@@ -35,22 +38,15 @@ class ArgumentParser
 			@upload_command, @upload_no_open_command, @upload_zipped_session_command]
 	end
 	
-	def parse params
-		params[0] = params[0] ? params[0].downcase : 'help'
-		command_name = params[0]
-		command_executed = false
-		@commands.each do |command|
-			if command.accepts_shell_command?(command_name) 
-				command.execute_from_shell params
-				command_executed = true
-			end
-		end
-		if not command_executed and command_name == "spec"
-			# 'spec" is for testing purpose only: do nothing special
-		elsif not command_executed
-			raise ShellArgumentException.new command_name
-		end
+private
+	
+	def create_runner shell, view, meta_config_file
+		state_recorder = StateRecorder.new shell, SessionIdGenerator.new, meta_config_file
+		runner = Runner.new shell, view
+		runner.init_session_callback = Proc.new {state_recorder.init_session}
+		runner.execute_callback = Proc.new {|files, process| state_recorder.record_state files, process}
+		runner
 	end
-
+	
 end
 

data/lib/commands/start_command.rb

@@ -1,5 +1,6 @@
 require 'meta_config_file'
 require 'run/scheduler'
+require 'run/scheduler_interrupt_listener'
 
 class StartCommand
 	
@@ -20,7 +21,8 @@ class StartCommand
 	  @view.show_start_kata command, file, @meta_file.framework_property
 		@runner.source_files = @meta_file.source_files
 	  @runner.run_command = command
-	  scheduler = Scheduler.new @runner, @view, @eval_loop_commands
+	  scheduler = Scheduler.new @runner
+	  scheduler.interrupt_listener = SchedulerInterruptListener.new @view, @eval_loop_commands
 	  scheduler.start
 	end
 	

data/lib/console_view.rb

@@ -28,6 +28,7 @@ Commands:
   help <command>                       See the details of the command.
   xhelp                                Print help text for advanced commands.
   setup <framework> <kata_file>        Setup the environment for running the kata.
+  upload-zip [<session_dir>]           Upload session as a ZIP file (beta feature)
   upload [<session_dir>]               Upload the kata to http://www.codersdojo.org and open the kata in a browser.
   upload-no-open [<session_dir>]       Upload the kata to http://www.codersdojo.org
 
@@ -43,7 +44,6 @@ Commands:
   init-session                                      Create a new session dir within the .codersdojo dir.
   capture-single-run <shell_command> <kata_file>    Capture a single run.
   start <shell_command> <kata_file>                 Start the continuous test loop.
-  upload-zip [<session_dir>]                        Upload session as a ZIP file (beta feature)
 helptext
   end
 

data/lib/run/runner.rb

@@ -1,31 +1,19 @@
-require "info_property_file"
-require "filename_formatter"
-require "record/state_recorder"
-
 class Runner
 
-  attr_accessor :source_files, :run_command
+  attr_accessor :source_files, :run_command, :init_session_callback, :execute_callback
 
 	WORKING_DIR = '.'
 
-  def initialize shell, session_id_generator, view, meta_config_file
-	  @filename_formatter = FilenameFormatter.new
+  def initialize shell, view
     @shell = shell
-    @session_id_generator = session_id_generator
 		@view = view
-		@meta_config_file = meta_config_file
   end
 
   def start
-		@state_recorder = StateRecorder.new(@shell, @session_id_generator, @meta_config_file)
-    init_session 
+	  if @init_session_callback then @init_session_callback.call end
     execute
   end
 
-  def init_session
-	  @state_recorder.init_session
-  end
-
   def execute
 		files = @shell.files_in_dir_tree WORKING_DIR, @source_files
 		newest_dir_entry = @shell.newest_dir_entry WORKING_DIR, files
@@ -42,7 +30,7 @@ class Runner
 
 	def execute_once files
 		process = @shell.execute @run_command
-		@state_recorder.record_state files, process
+		if @execute_callback then @execute_callback.call(files, process) end
 	end
 	
 	def run_command= command

data/lib/run/scheduler.rb

@@ -1,54 +1,31 @@
 class Scheduler
 
-  def initialize runner, view, commands
+  attr_accessor :interrupt_listener
+
+  def initialize runner
     @runner = runner
-		@view = view
-		@last_action = ""
-		@commands = commands
-		@continue_after_command = false
   end
 
   def start
-		@last_action = ""
+	  @continue = true
 		register_interrupt_listener
     @runner.start
-    while continue? do
+    while @continue do
       sleep 1
       @runner.execute
     end
   end
 
+private
+
 	def register_interrupt_listener
 		trap("INT") {
-			interrupt_kata
+			interrupt
 		}
 	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
-			@view.show_kata_upload_hint
-		end
-	end
 	
-	def continue?
-		@last_action == '' or last_action_was_resume? or @continue_after_command
-	end
-
-	def last_action_was_resume?
-		@last_action.start_with? 'r'
-	end
-
-	def last_action_was_exit?
-		@last_action.start_with? 'e'
-	end
+	def interrupt
+		if @interrupt_listener then @continue = @interrupt_listener.interrupt end
+  end
 
 end

data/lib/run/scheduler_interrupt_listener.rb

@@ -0,0 +1,38 @@
+class SchedulerInterruptListener
+
+  def initialize view, commands
+	  @view = view
+	  @commands = commands
+		@continue_after_command = false
+		@last_action = ""
+	end
+
+	def interrupt
+		@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
+			@view.show_kata_upload_hint
+		end
+		continue?
+	end
+	
+	def continue?
+		@last_action == '' or last_action_was_resume? or @continue_after_command
+	end
+
+	def last_action_was_resume?
+		@last_action.start_with? 'r'
+	end
+
+	def last_action_was_exit?
+		@last_action.start_with? 'e'
+	end
+	
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.06
+  - 7
+  version: 1.5.07
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 +02:00
+date: 2011-10-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,8 +69,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 8
-        version: 0.0.8
+        - 9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id004
 description: Client executes tests in an endless loop and logs source code and test result for later uplaod.
@@ -82,9 +82,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/argument_parser.rb
 - lib/codersdojo.rb
 - lib/commands/capture_single_run_command.rb
+- lib/commands/command_configuration.rb
 - lib/commands/generate_command.rb
 - lib/commands/help_command.rb
 - lib/commands/init_session_command.rb
@@ -105,6 +105,7 @@ files:
 - lib/record/text_converter.rb
 - lib/run/runner.rb
 - lib/run/scheduler.rb
+- lib/run/scheduler_interrupt_listener.rb
 - lib/scaffold/scaffolder.rb
 - lib/scaffold/text_template_machine.rb
 - lib/state.rb