codersdojo 1.1.07 → 1.1.08

data/app/argument_parser.rb

@@ -9,17 +9,19 @@ class ArgumentParser
 	end
 	
 	def parse params
-		command = params[0] ? params[0] : ""
-		if command.downcase == "help" then
+		command = params[0] ? params[0].downcase : ""
+		if command == "help" then
 			@controller.help params[1]
-		elsif command.downcase == "setup" then
+		elsif command == "setup" then
 			@controller.generate params[1], params[2] ? params[2] : '<kata_file>'
-		elsif command.downcase == "upload" then
-			@controller.upload params[1], params[2]
-		elsif command.downcase == "start" then
+		elsif command == "upload" then
+			@controller.upload params[1]
+		elsif command == "upload-with-framework" then
+			@controller.upload_with_framework params[1], params[2]
+		elsif command == "start" then
 			run_command = expand_run_command params[1]
 			@controller.start run_command, params[2]
-		elsif command.downcase == "spec" then
+		elsif command == "spec" then
 			# 'spec" is for testing purpose only: do nothing special
 		else
 			raise ShellArgumentException

data/app/console_view.rb

@@ -22,7 +22,13 @@ Commands:
   help, -h, --help                     Print this help text.
   help <command>                       See the details of the command.
   setup <framework> <kata_file>        Setup the environment for running the kata.
-  upload <framework> [<session_dir>]   Upload the kata to http://www.codersdojo.org
+  upload [<session_dir>]               Upload the kata to http://www.codersdojo.org
+  upload-with-framework <framework> [<session_dir>]   
+                                       Upload the kata to http://www.codersdojo.org
+                                       !!! This command exists for compatibility reasons only.
+                                       !!! It will be removed in the near future. 
+                                       !!! Please run 'setup' again to generate the .meta file
+                                       !!! and use 'upload' without the 'framework' parameter.
 
 Report bugs to <codersdojo@it-agile.de>
 helptext
@@ -35,6 +41,8 @@ helptext
 			show_help_start
 		elsif command == 'upload' then
 			show_help_upload
+		elsif command == 'upload-with-framework' then
+			show_help_upload_with_framework
 		else
 			show_help_unknown command
 		end
@@ -66,29 +74,46 @@ helptext
 	end
 
 	def show_help_upload
-		templates = @scaffolder.list_templates
 		puts <<-helptext
 		
-upload <framework> [<session_directory>]  Upload the kata written with <framework> in <session_directory> to codersdojo.com. 
+upload                      Upload the newest kata session in .codersdojo to codersdojo.com.
+
+upload <session_directory>  Upload the kata <session_directory> to codersdojo.com. 
+                            <session_directory> is relative to the working directory.
+
+Examples:
+    :/dojo/my_kata$ #{$0} upload
+        Upload the newest kata located in directory ".codersdojo" to codersdojo.com.
+    :/dojo/my_kata$ #{$0} upload .codersdojo/2010-11-02_16-21-53
+        Upload the kata located in directory ".codersdojo/2010-11-02_16-21-53" to codersdojo.com.
+helptext
+	end
+	
+	def show_help_upload_with_framework
+		templates = @scaffolder.list_templates
+		puts <<-helptext
+
+upload-with-framework <framework> [<session_directory>]  
+                                          Upload the kata written with <framework> in <session_directory> to codersdojo.com. 
                                           <session_directory> is relative to the working directory.
                                           If you don't specify a <session_directory> the newest session in .codersdojo is uploaded.
                                           By now <framework> is one of #{templates}.
                                           If you used another framework, use ??? and send an email to codersdojo@it-agile.de
 
 Example:
-    :/dojo/my_kata$ #{$0} upload ruby.test-unit .codersdojo/2010-11-02_16-21-53
+    :/dojo/my_kata$ #{$0} upload-with-framework ruby.test-unit .codersdojo/2010-11-02_16-21-53
         Upload the kata (written in Ruby with the test/unit framework) located in directory ".codersdojo/2010-11-02_16-21-53" to codersdojo.com.
 helptext
 	end
-	
+
 	def show_help_unknown command
 		puts <<-helptext
 Command #{command} not known. Try '#{$0} help' to list the supported commands.
 helptext
 	end
 	
-	def show_start_kata command, file
-	  puts "Starting CodersDojo-Client with command #{command} and kata file #{file}. Use Ctrl+C to finish the kata."		
+	def show_start_kata command, file, framework
+	  puts "Starting CodersDojo-Client with command #{command} and kata file #{file} with framework #{framework}. Use Ctrl+C to finish the kata."		
 	end
 	
 	def show_missing_command_argument_error command
@@ -96,8 +121,8 @@ helptext
 		show_usage
 	end
 	
-	def show_upload_start session_directory, hostname
-		puts "Start upload from #{session_directory} to #{hostname}"
+	def show_upload_start session_directory, hostname, framework
+		puts "Start upload from #{session_directory} with framework #{framework} to #{hostname}"
 	end
 	
 	def show_upload_result result

data/app/controller.rb

@@ -33,20 +33,27 @@ class Controller
 			@view.show_missing_command_argument_error "start"
 			return
 		end
-	  @view.show_start_kata command, file
-	  dojo = Runner.new ShellWrapper.new, SessionIdGenerator.new
+	  @view.show_start_kata command, file, framework_property
+	  dojo = Runner.new @shell, SessionIdGenerator.new
 	  dojo.file = file
 	  dojo.run_command = command
 	  scheduler = Scheduler.new dojo
 	  scheduler.start
 	end
 
-	def upload framework, session_directory
+	# merge with 'upload_with_framework' when the framework parameter is removed
+	def upload session_directory
+		upload_with_framework framework_property, session_directory
+	end
+
+	# framework parameter is obsolete since client version 1.1.08 (08-feb-2011)
+	# it stays here for compatibility reasons and will be removed in the near future
+	def upload_with_framework framework, session_directory 
 		formatter = FilenameFormatter.new
 		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
+		@view.show_upload_start session_directory, @hostname, framework
 	  uploader = Uploader.new @hostname, framework, session_directory
 		upload_result = uploader.upload
 	  @view.show_upload_result upload_result
@@ -54,5 +61,13 @@ class Controller
 		@shell.open_with_default_app url
 	end
 
+	def framework_property
+		properties['framework']
+	end
+
+	def properties
+		@shell.read_properties '.meta'
+	end
+
 end
 

data/app/shell_wrapper.rb

@@ -77,6 +77,10 @@ class ShellWrapper
 		execute "#{open_command_name} #{filename}"
 	end
 	
+	def read_properties filename
+		YAML.load_file(filename)
+	end
+	
 	def remove_command_name
 		windows? ? 'del' : 'rm'
 	end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.07
+  - 8
+  version: 1.1.08
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +01:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency