codersdojo 1.5.00 → 1.5.01

data/lib/argument_parser.rb

@@ -1,10 +1,10 @@
-require 'session_id_generator'
-require 'runner'
+require 'record/session_id_generator'
+require 'record/return_code_evaluator'
+require 'run/runner'
+require 'state_reader'
 require 'shell_argument_exception'
 require 'shell_wrapper'
 require 'console_view'
-require 'return_code_evaluator'
-require 'state_reader'
 require 'commands/help_command'
 require 'commands/xhelp_command'
 require 'commands/generate_command'

data/lib/codersdojo.rb

@@ -2,7 +2,7 @@
 
 require 'console_view'
 require 'argument_parser'
-require 'scaffolder'
+require 'scaffold/scaffolder'
 
 class CodersDojo
 	

data/lib/commands/capture_single_run_command.rb

@@ -0,0 +1,34 @@
+class CaptureSingleRunCommand
+
+	COMMAND_NAME = 'capture-single-run'
+
+	def initialize shell, view, runner
+		@shell = shell
+		@view = view
+		@runner = runner
+	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.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
+	
+	def continue_test_loop?
+		false
+	end
+		
+end

data/lib/commands/generate_command.rb

@@ -0,0 +1,34 @@
+class GenerateCommand
+	
+	def initialize shell, view, scaffolder
+		@shell = shell
+		@view = view
+		@scaffolder = scaffolder
+	end
+	
+	def execute_from_shell params
+		generate params[1], params[2]
+	end
+	
+	def generate framework, kata_file
+		if not kata_file then
+			@view.show_missing_command_argument_error "setup", "kata_file"
+			return
+		end
+		begin
+			@scaffolder.scaffold framework, kata_file
+			@view.show "\n" + @shell.read_file("README")
+		rescue
+			@view.show_unknown_framework_error framework, @scaffolder.list_templates
+		end		
+	end
+	
+	def accepts_shell_command? command
+		command == 'setup'
+	end
+	
+	def continue_test_loop?
+		false
+	end
+
+end

data/lib/commands/help_command.rb

@@ -0,0 +1,27 @@
+class HelpCommand
+
+	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_help
+		end
+	end
+	
+	def accepts_shell_command? command
+		['help', '-h', '--help'].member? command
+	end
+
+	def continue_test_loop?
+		false
+	end
+
+end

data/lib/commands/init_session_command.rb

@@ -0,0 +1,25 @@
+class InitSessionCommand
+
+	def initialize view, runner
+		@view = view
+		@runner = runner
+	end
+
+	def execute_from_shell params
+		init_session
+	end
+
+	def init_session
+	  session_dir = @runner.init_session
+	  @view.show_init_session_result session_dir
+	end
+	
+	def accepts_shell_command? command
+		command == 'init-session'
+	end
+	
+	def continue_test_loop?
+		false
+	end
+		
+end

data/lib/commands/revert_to_green_command.rb

@@ -0,0 +1,51 @@
+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/lib/commands/start_command.rb

@@ -0,0 +1,35 @@
+require 'meta_config_file'
+require 'run/scheduler'
+
+class StartCommand
+	
+	def initialize meta_config_file, runner, view, eval_loop_commands
+		@runner = runner
+		@view = view
+		@meta_file = meta_config_file
+		@eval_loop_commands = eval_loop_commands
+	end
+	
+	def execute_from_shell params
+		start params[1], params[2]
+	end
+
+	def start command, file
+		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.source_files = @meta_file.source_files
+	  @runner.run_command = command
+	  scheduler = Scheduler.new @runner, @view, @eval_loop_commands
+	  scheduler.start
+	end
+	
+	def accepts_shell_command? command
+		command == 'start'
+	end
+	
+	def continue_test_loop?
+		true
+	end
+	
+end

data/lib/commands/upload_command.rb

@@ -0,0 +1,53 @@
+require 'meta_config_file'
+require 'upload/uploader'
+
+class UploadCommand
+
+	attr_accessor :uploader
+
+	def initialize shell, view, hostname
+		@shell = shell
+		@view = view
+		@hostname = hostname
+		@uploader = Uploader.new(hostname, '', '')
+		@meta_file = MetaConfigFile.new @shell
+	end
+
+	def execute
+		upload nil
+	end
+
+	def execute_from_shell params
+		upload params[1]
+	end
+
+	def upload session_directory, open_browser=true
+		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)
+		end
+		@view.show_upload_start session_directory, @hostname, framework
+		@uploader.framework = framework
+		@uploader.session_dir = session_directory
+		upload_result = @uploader.upload
+		 @view.show_upload_result upload_result
+		url = upload_result.split.last
+		if open_browser then 
+			@shell.open_with_default_app url
+		end
+	end
+	
+	def command_key
+		'u'
+	end
+	
+	def accepts_shell_command? command
+		command == 'upload'
+	end
+
+	def continue_test_loop?
+		false
+	end
+			
+end

data/lib/commands/upload_no_open_command.rb

@@ -0,0 +1,23 @@
+class UploadNoOpenCommand
+	
+	def initialize upload_command
+		@upload_command = upload_command
+	end
+
+	def execute_from_shell params
+		upload params[1]
+	end
+
+	def upload session_directory
+		@upload_command.upload session_directory, false
+	end
+	
+	def accepts_shell_command? command
+		command == 'upload-no-open'
+	end
+	
+	def continue_test_loop?
+		false
+	end
+	
+end

data/lib/commands/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

data/lib/console_view.rb

@@ -1,5 +1,5 @@
 require 'shell_wrapper'
-require 'text_template_machine'
+require 'scaffold/text_template_machine'
 require 'property_file_missing_exception'
 
 class ConsoleView

data/lib/{runner.rb → run/runner.rb}

@@ -1,7 +1,7 @@
 require "info_property_file"
 require "filename_formatter"
-require "text_converter"
-require "return_code_evaluator"
+require "run/text_converter"
+require "record/return_code_evaluator"
 
 class Runner
 

data/lib/{scaffolder.rb → scaffold/scaffolder.rb}

@@ -1,4 +1,4 @@
-require 'text_template_machine'
+require 'scaffold/text_template_machine'
 require 'filename_formatter'
 
 class Scaffolder

data/lib/{uploader.rb → upload/uploader.rb}

@@ -1,9 +1,9 @@
 require 'json'
 require 'state'
 require 'state_reader'
+require 'upload/xml_element_extractor'
 require 'progress'
 require 'filename_formatter'
-require 'xml_element_extractor'
 require 'rest_client'
 require 'shell_wrapper'
 require 'session_zipper'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.00
+  - 1
+  version: 1.5.01
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 +02:00
+date: 2011-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,22 +84,31 @@ extra_rdoc_files: []
 files: 
 - lib/argument_parser.rb
 - lib/codersdojo.rb
+- lib/commands/capture_single_run_command.rb
+- lib/commands/generate_command.rb
+- lib/commands/help_command.rb
+- lib/commands/init_session_command.rb
+- lib/commands/revert_to_green_command.rb
+- lib/commands/start_command.rb
+- lib/commands/upload_command.rb
+- lib/commands/upload_no_open_command.rb
+- lib/commands/xhelp_command.rb
 - lib/console_view.rb
 - lib/filename_formatter.rb
 - lib/info_property_file.rb
 - lib/meta_config_file.rb
 - lib/property_file_missing_exception.rb
-- lib/return_code_evaluator.rb
-- lib/runner.rb
-- lib/scaffolder.rb
-- lib/scheduler.rb
-- lib/session_id_generator.rb
+- lib/record/return_code_evaluator.rb
+- lib/record/session_id_generator.rb
+- lib/run/runner.rb
+- lib/run/scheduler.rb
+- lib/run/text_converter.rb
+- lib/scaffold/scaffolder.rb
+- lib/scaffold/text_template_machine.rb
 - lib/state.rb
 - lib/state_reader.rb
-- lib/text_converter.rb
-- lib/text_template_machine.rb
-- lib/uploader.rb
-- lib/xml_element_extractor.rb
+- lib/upload/uploader.rb
+- lib/upload/xml_element_extractor.rb
 - templates/any/README
 - templates/any/run-endless.%sh%
 - templates/any/run-once.%sh%