codersdojo 1.5.05 → 1.5.06

data/lib/argument_parser.rb

@@ -12,6 +12,7 @@ require 'commands/capture_single_run_command'
 require 'commands/revert_to_green_command'
 require 'commands/upload_command'
 require 'commands/upload_no_open_command'
+require 'commands/upload_zipped_session_command'
 require 'commands/start_command'
 
 class ArgumentParser
@@ -24,13 +25,14 @@ class ArgumentParser
 		@generate_command = GenerateCommand.new shell, view, scaffolder
 		@upload_command = UploadCommand.new shell, view, hostname
 		@upload_no_open_command = UploadNoOpenCommand.new @upload_command
+		@upload_zipped_session_command = UploadZippedSessionCommand.new shell, view, hostname
 		@init_session_command = InitSessionCommand.new view, runner
 		@capture_single_run_command = CaptureSingleRunCommand.new shell, view, runner
 		@revert_to_green_command = RevertToGreenCommand.new shell, view, meta_config_file, StateReader.new(shell)
 		@start_command = StartCommand.new meta_config_file, runner, view, [@upload_command, @revert_to_green_command]
 		@commands = [@help_command, @xhelp_command, @generate_command, @init_session_command, 
 			@capture_single_run_command, @start_command, @revert_to_green_command,
-			@upload_command, @upload_no_open_command]
+			@upload_command, @upload_no_open_command, @upload_zipped_session_command]
 	end
 	
 	def parse params

data/lib/commands/upload_zipped_session_command.rb

@@ -0,0 +1,53 @@
+require 'meta_config_file'
+require 'upload/uploader'
+
+class UploadZippedSessionCommand
+
+	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_zipped_session
+		@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
+		'z'
+	end
+	
+	def accepts_shell_command? command
+		command == 'upload-zip'
+	end
+
+	def continue_test_loop?
+		false
+	end
+			
+end

data/lib/console_view.rb

@@ -43,6 +43,7 @@ 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/record/state_recorder.rb

@@ -1,3 +1,4 @@
+require "meta_config_file"
 require "record/text_converter"
 require "record/return_code_evaluator"
 
@@ -18,6 +19,7 @@ class StateRecorder
 		session_dir = @filename_formatter.session_dir @session_id
     @shell.mkdir_p session_dir
 		session_dir
+    @shell.cp MetaConfigFile::PROPERTY_FILENAME, session_dir
   end
 	
 	def record_state files, process
@@ -31,7 +33,7 @@ class StateRecorder
     @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})
+    write_info_file(state_dir, {:return_code => return_code, :date => "'#{date}'", :time => "'#{time}'", :step => @step})
 		@step += 1
 	end
 	

data/lib/upload/uploader.rb

@@ -32,7 +32,6 @@ class Uploader
   end
 
   def upload_kata_and_states
-#	  upload_zipped_kata zip_kata
 		read_states
     kata = upload_kata
 		finish_url = "#{@hostname}#{@@description_path}/#{XMLElementExtractor.extract('kata/private-uuid', kata)}"
@@ -55,12 +54,16 @@ class Uploader
     RestClient.post "#{@hostname}#{@@kata_path}", kata_data
   end
 
+  def upload_zipped_session
+	  private_url = upload_zipped_kata zip_kata
+    "Complete kata information at #{private_url}"
+	end
+
   def zip_kata
 	  SessionZipper.new.compress @session_dir
   end
 
   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
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 5
-  version: 1.5.05
+  - 6
+  version: 1.5.06
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 +02:00
+date: 2011-09-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,13 +64,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id004
 description: Client executes tests in an endless loop and logs source code and test result for later uplaod.
@@ -92,6 +92,7 @@ files:
 - lib/commands/start_command.rb
 - lib/commands/upload_command.rb
 - lib/commands/upload_no_open_command.rb
+- lib/commands/upload_zipped_session_command.rb
 - lib/commands/xhelp_command.rb
 - lib/console_view.rb
 - lib/filename_formatter.rb