codersdojo 1.2.13 → 1.2.14

data/app/argument_parser.rb

@@ -4,7 +4,10 @@ require 'shell_argument_exception'
 require 'shell_wrapper'
 require 'console_view'
 require 'help_command'
+require 'xhelp_command'
 require 'generate_command'
+require 'init_session_command'
+require 'capture_single_run_command'
 require 'upload_command'
 require 'upload_no_open_command'
 require 'start_command'
@@ -13,11 +16,15 @@ class ArgumentParser
 	
 	def initialize shell, view, scaffolder, hostname
 		@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
-		@generate_command = GenerateCommand.new shell, view, scaffolder
+		@init_session_command = InitSessionCommand.new shell, view
+		@capture_single_run_command = CaptureSingleRunCommand.new shell, view
 		@start_command = StartCommand.new shell, view, @upload_command
-		@commands = [@help_command, @generate_command, @start_command, @upload_command, @upload_no_open_command]
+		@commands = [@help_command, @xhelp_command, @generate_command, @init_session_command, 
+			@capture_single_run_command, @start_command, @upload_command, @upload_no_open_command]
 	end
 	
 	def parse params

data/app/capture_single_run_command.rb

@@ -0,0 +1,32 @@
+require 'runner'
+
+class CaptureSingleRunCommand
+
+	COMMAND_NAME = 'capture-single-run'
+
+	def initialize shell, view
+		@shell = shell
+		@view = view
+	end
+
+	def execute_from_shell params
+		unless params[1] then @view.show_missing_command_argument_error COMMAND_NAME, "shell_command"; return end
+		unless params[2] then @view.show_missing_command_argument_error COMMAND_NAME, "kata_file"; return end
+		capture_single_run params[1], params[2]
+	end
+
+	def capture_single_run run_command, kata_file
+		runner = Runner.new @shell, SessionIdGenerator.new
+		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
+	end
+
+	def accepts_shell_command? command
+		command == COMMAND_NAME
+	end
+		
+end

data/app/console_view.rb

@@ -26,6 +26,7 @@ Usage: #{current_command_path} command [options]
 Commands:
   help, -h, --help                     Print this help text.
   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 [<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
@@ -33,17 +34,23 @@ Commands:
 Report bugs to <codersdojo@it-agile.de>
 helptext
 	end
+	
+	def show_extended_help
+		show <<-helptext
+Usage: #{current_command_path} command [options]
+Commands:
+  help <command>                                    See the details of the command.
+  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.
+helptext
+  end
 
 	def show_detailed_help command
-		if command == 'setup' then
-			show_help_setup
-		elsif command == 'start' then
-			show_help_start
-		elsif command == 'upload' then
-			show_help_upload
-		elsif command == 'upload-no-open' then
-			show_help_upload_no_open
-		else
+		command = command.gsub('-', '_')
+		begin
+			eval "show_help_#{command}"
+		rescue
 			show_help_unknown command
 		end
 	end
@@ -71,7 +78,7 @@ helptext
 		show <<-helptext
 		
 start <shell_command> <kata_file>  
-    Start the continuous test runner, that runs <shell-command> whenever <kata_file>
+    Start the continuous test runner, that runs <shell_command> whenever <kata_file>
     changes. The <kata_file> has to include the whole source code of the kata.
     Whenever the test runner is started, it creates a new session directory in the 
     directory .codersdojo where it logs the steps of the kata.
@@ -97,6 +104,26 @@ Examples:
 helptext
 	end
 	
+	def show_help_init_session
+		show <<-helptext
+
+init-session
+    Create a new session dir in the .codersdojo dir.
+    Usually this command is used before using capture-single-run.
+helptext
+	end
+	
+	def show_help_capture_single_run
+		show <<-helptext
+		
+capture-single-run <shell_command> <kata_file>  
+    Execute <shell-command> once for <kata_file>.
+    The <kata_file> has to include the whole source code of the kata.
+    The run will be captured into the newest session dir in the .codersdojo dir.
+    Usually this command is used after a session dir has been created with the init-session command.
+helptext
+	end
+	
 	def show_help_upload_no_open
 		show <<-helptext
 
@@ -132,7 +159,7 @@ helptext
 	
 	def show_missing_command_argument_error command, missing_argument
 		show "Command <#{command}> recognized but argument <#{missing_argument}> was missing.\n"
-		eval "show_help_#{command}"
+		show_detailed_help command
 	end
 	
 	def show_upload_start session_directory, hostname, framework
@@ -174,6 +201,10 @@ msg
 	def show_kata_upload_hint
 		show "You finished your kata. You can upload it with 'codersdojo upload'."
 	end
+	
+	def show_init_session_result session_dir
+		show "Session directory created: #{session_dir}"
+	end
 		
 	def show text
 		puts @template_machine.render(text)

data/app/filename_formatter.rb

@@ -35,6 +35,10 @@ class FilenameFormatter
     "#{session_directory}/#{STATE_DIR_PREFIX}#{step}"
   end
 
+	def step_number_from_state_dir state_dir
+		state_dir.delete(STATE_DIR_PREFIX).to_i
+	end
+
   def session_dir session_id
     "#{CODERSDOJO_WORKSPACE}/#{session_id}"
   end

data/app/init_session_command.rb

@@ -0,0 +1,24 @@
+require 'runner'
+
+class InitSessionCommand
+
+	def initialize shell, view
+		@shell = shell
+		@view = view
+	end
+
+	def execute_from_shell params
+		init_session
+	end
+
+	def init_session
+		runner = Runner.new @shell, SessionIdGenerator.new
+	  session_dir = runner.init_session
+	  @view.show_init_session_result session_dir
+	end
+	
+	def accepts_shell_command? command
+		command == 'init-session'
+	end
+		
+end

data/app/runner.rb

@@ -13,14 +13,16 @@ class Runner
   end
 
   def start
-    init_session
+    init_session 
     execute
   end
 
   def init_session
     @step = 0
     @session_id = @session_provider.generate_id
-    @shell.mkdir_p(@filename_formatter.session_dir @session_id)
+		session_dir = @filename_formatter.session_dir @session_id
+    @shell.mkdir_p(session_dir)
+		session_dir
   end
 
   def execute
@@ -30,16 +32,24 @@ class Runner
       return
     end
     Progress.end
-    process = @shell.execute @run_command
+		execute_once @file, @session_id, @step
+    @step += 1
+    @previous_change_time = change_time
+  end
+
+	def execute_once file, 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
+    state_dir = @filename_formatter.state_dir session_id, step
     @shell.mkdir state_dir
-    @shell.cp @file, state_dir
+    @shell.cp file, 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}"
-    @step += 1
-    @previous_change_time = change_time
-  end
+	end
+	
+	def run_command= command
+		@run_command = @shell.expand_run_command command
+	end
 
 end
 

data/app/shell_wrapper.rb

@@ -109,6 +109,14 @@ class ShellWrapper
 		end
 	end
 
+	def expand_run_command command
+		if command.end_with?(".sh") then
+			"bash #{command}"
+		else
+			command
+		end
+	end
+
 	def shell_extension
 		windows? ? 'cmd' : 'sh'
 	end

data/app/start_command.rb

@@ -17,7 +17,6 @@ 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
-		command = expand_run_command command
 	  @view.show_start_kata command, file, @meta_file.framework_property
 	  dojo = Runner.new @shell, SessionIdGenerator.new
 	  dojo.file = file
@@ -30,12 +29,4 @@ class StartCommand
 		command == 'start'
 	end
 	
-	def expand_run_command command
-		if command.end_with?(".sh") then
-			"bash #{command}"
-		else
-			command
-		end
-	end
-	
 end

data/app/xhelp_command.rb

@@ -0,0 +1,23 @@
+class XHelpCommand
+
+	def initialize view
+		@view = view
+	end
+	
+	def execute_from_shell params
+		help params[1]
+	end
+	
+	def help command=nil
+		if command then
+			@view.show_detailed_help command.downcase
+		else
+			@view.show_extended_help
+		end
+	end
+	
+	def accepts_shell_command? command
+		command == 'xhelp'
+	end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 2
-  - 13
-  version: 1.2.13
+  - 14
+  version: 1.2.14
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +02:00
+date: 2011-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,12 +60,14 @@ extra_rdoc_files: []
 
 files: 
 - app/argument_parser.rb
+- app/capture_single_run_command.rb
 - app/codersdojo.rb
 - app/console_view.rb
 - app/filename_formatter.rb
 - app/generate_command.rb
 - app/help_command.rb
 - app/info_property_file.rb
+- app/init_session_command.rb
 - app/meta_config_file.rb
 - app/progress.rb
 - app/property_file_missing_exception.rb
@@ -84,6 +86,7 @@ files:
 - app/upload_command.rb
 - app/upload_no_open_command.rb
 - app/uploader.rb
+- app/xhelp_command.rb
 - app/xml_element_extractor.rb
 - templates/any/README
 - templates/any/run-endless.%sh%