codersdojo 1.5.04 → 1.5.05

data/lib/argument_parser.rb

@@ -1,8 +1,8 @@
 require 'record/session_id_generator'
 require 'run/runner'
 require 'state_reader'
-require 'shell_argument_exception'
-require 'shell_wrapper'
+require 'shellutils/shell_argument_exception'
+require 'shellutils/shell_wrapper'
 require 'console_view'
 require 'commands/help_command'
 require 'commands/xhelp_command'

data/lib/console_view.rb

@@ -1,4 +1,4 @@
-require 'shell_wrapper'
+require 'shellutils/shell_wrapper'
 require 'scaffold/text_template_machine'
 require 'property_file_missing_exception'
 

data/lib/filename_formatter.rb

@@ -1,4 +1,4 @@
-require 'shell_wrapper'
+require 'shellutils/shell_wrapper'
 
 class FilenameFormatter
 

data/lib/record/session_id_generator.rb

@@ -1,17 +1,9 @@
+require 'shellutils/date_time_formatter'
+
 class SessionIdGenerator
 
   def generate_id time=Time.new
-		year = format_to_length time.year, 4
-		month = format_to_length time.month, 2
-		day = format_to_length time.day, 2
-		hour = format_to_length time.hour, 2
-		minute = format_to_length time.min, 2
-		second = format_to_length time.sec, 2
-    "#{year}-#{month}-#{day}_#{hour}-#{minute}-#{second}"
+	  DateTimeFormatter.new.format time
   end
 
-  def format_to_length value, len
-		value.to_s.rjust len,"0"
-	end
-
 end

data/lib/record/state_recorder.rb

@@ -0,0 +1,48 @@
+require "record/text_converter"
+require "record/return_code_evaluator"
+
+class StateRecorder
+	
+	attr_accessor :step, :session_id
+	
+	def initialize shell, session_id_generator, meta_config_file
+		@shell = shell
+		@session_id_generator = session_id_generator
+		@meta_config_file = meta_config_file
+		@filename_formatter = FilenameFormatter.new
+	end
+	
+	def init_session
+    @step = 0
+    @session_id = @session_id_generator.generate_id
+		session_dir = @filename_formatter.session_dir @session_id
+    @shell.mkdir_p session_dir
+		session_dir
+  end
+	
+	def record_state files, process
+		result = TextConverter.new.remove_escape_sequences process.output
+		return_code_evaluator = ReturnCodeEvaluator.new @meta_config_file.success_detection	
+    return_code = return_code_evaluator.return_code(process)
+    state_dir = @filename_formatter.state_dir @session_id, @step
+    now = Time.new
+    date = now.strftime "%Y-%m-%d"
+    time = now.strftime "%H:%M:%S"
+    @shell.mkdir state_dir
+    @shell.cp_r files, state_dir
+    write_result_file state_dir, result
+    write_info_file (state_dir, {:return_code => return_code, :date => date, :time => time})
+		@step += 1
+	end
+	
+	def write_result_file state_dir, result
+		@shell.write_file @filename_formatter.result_file(state_dir), result
+  end
+	
+	def write_info_file state_dir, properties
+		content = properties.collect{|key, value| "#{key}: #{value}"}.join "\n"
+    @shell.write_file @filename_formatter.info_file(state_dir), content
+	end
+	
+end
+

data/lib/run/runner.rb

@@ -1,7 +1,6 @@
 require "info_property_file"
 require "filename_formatter"
-require "run/text_converter"
-require "record/return_code_evaluator"
+require "record/state_recorder"
 
 class Runner
 
@@ -9,29 +8,25 @@ class Runner
 
 	WORKING_DIR = '.'
 
-  def initialize shell, session_provider, view, meta_config_file
+  def initialize shell, session_id_generator, view, meta_config_file
 	  @filename_formatter = FilenameFormatter.new
     @shell = shell
-    @session_provider = session_provider
+    @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 
     execute
   end
 
   def init_session
-    @step = 0
-    @session_id = @session_provider.generate_id
-		session_dir = @filename_formatter.session_dir @session_id
-    @shell.mkdir_p(session_dir)
-		session_dir
+	  @state_recorder.init_session
   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
@@ -41,20 +36,13 @@ class Runner
     end
     Progress.end
 		@view.show_run_once_message newest_dir_entry, change_time
-		execute_once files, @session_id, @step, return_code_evaluator
-    @step += 1
+		execute_once files
     @previous_change_time = change_time
   end
 
-	def execute_once files, session_id, step, return_code_evaluator
+	def execute_once files
 		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}: #{return_code}"
+		@state_recorder.record_state files, process
 	end
 	
 	def run_command= command

data/lib/state_reader.rb

@@ -1,5 +1,5 @@
 require 'info_property_file'
-require 'filename'
+require 'shellutils/filename'
 require 'filename_formatter'
 require 'state'
 

data/lib/upload/uploader.rb

@@ -2,11 +2,11 @@ require 'json'
 require 'state'
 require 'state_reader'
 require 'upload/xml_element_extractor'
-require 'progress'
+require 'shellutils/progress'
 require 'filename_formatter'
 require 'rest_client'
-require 'shell_wrapper'
-require 'session_zipper'
+require 'shellutils/shell_wrapper'
+require 'shellutils/session_zipper'
 
 class Uploader
 
@@ -32,7 +32,7 @@ class Uploader
   end
 
   def upload_kata_and_states
-	  upload_zipped_kata zip_kata
+#	  upload_zipped_kata zip_kata
 		read_states
     kata = upload_kata
 		finish_url = "#{@hostname}#{@@description_path}/#{XMLElementExtractor.extract('kata/private-uuid', kata)}"
@@ -56,11 +56,12 @@ class Uploader
   end
 
   def zip_kata
-#	  SessionZipper.new.compress @session_dir
+	  SessionZipper.new.compress @session_dir
   end
 
-  def upload_zipped_kata zip_file
+  def upload_zipped_kata zip_file_name
 #	  RestClient.post "#{@hostname}#{@@zipped_kata_path}", {:zipped_kata => zip_file}
+	  RestClient::Resource.new("#{@hostname}#{@@zipped_kata_path}").post(:transfer => { :path => "kata.zip" }, :upload => File.new(zip_file_name, 'rb'))
   end
 
 private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.04
+  - 5
+  version: 1.5.05
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +02:00
+date: 2011-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,8 +69,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 6
+        version: 0.0.6
   type: :runtime
   version_requirements: *id004
 description: Client executes tests in an endless loop and logs source code and test result for later uplaod.
@@ -100,9 +100,10 @@ files:
 - lib/property_file_missing_exception.rb
 - lib/record/return_code_evaluator.rb
 - lib/record/session_id_generator.rb
+- lib/record/state_recorder.rb
+- lib/record/text_converter.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