codersdojo 1.1.14 → 1.1.15

data/app/argument_parser.rb

@@ -13,7 +13,7 @@ class ArgumentParser
 		if command == "help" then
 			@controller.help params[1]
 		elsif command == "setup" then
-			@controller.generate params[1], params[2] ? params[2] : '<kata_file>'
+			@controller.generate params[1], params[2]
 		elsif command == "upload" then
 			@controller.upload params[1]
 		elsif command == "upload-with-framework" then

data/app/console_view.rb

@@ -54,10 +54,9 @@ helptext
 			templates = @scaffolder.list_templates
 			show <<-helptext
 			
-setup <framework> <kata_file_no_ext>  Setup the environment for the kata for the given framework and kata file.
-                                      The kata_file should not have an extension. Use 'prime' and not 'prime.java'.
-                                      By now <framework> is one of #{templates}.
-                                      Use ??? as framework if your framework isn't in the list.
+setup <framework> <kata_file>  Setup the environment for the kata for the given framework and kata file.
+                               By now <framework> is one of #{templates}.
+                               Use ??? as framework if your framework isn't in the list.
 
 Example:
     :%/%dojo%/%my_kata$ #{current_command_path} setup ruby.test-unit prime
@@ -118,9 +117,9 @@ helptext
 	  show "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
-		show "Command <#{command}> recognized but no argument was provided (at least one argument is required).\n\n"
-		show_usage
+	def show_missing_command_argument_error command, missing_argument
+		show "Command <#{command}> recognized but argument <#{missing_argument}> was missing.\n"
+		eval "show_help_#{command}"
 	end
 	
 	def show_upload_start session_directory, hostname, framework
@@ -135,6 +134,12 @@ helptext
 		show "Encountered network error while <#{command}>. Is http://www.codersdojo.com down?"
 	end
 	
+	def show_unknown_framework_error framework, templates
+		show "Unkown framework #{framework}. Possible frameworks:"
+		show templates
+		show "Use ??? as framework if your framework isn't in the list."
+	end
+	
 	def show_kata_exit_message
 		show <<-msg 
 

data/app/controller.rb

@@ -1,5 +1,6 @@
 require 'scheduler'
 require 'uploader'
+require 'filename_formatter'
 
 class Controller
 
@@ -8,6 +9,7 @@ class Controller
 		@view = view
 		@scaffolder = scaffolder
 		@hostname = hostname
+		@filename_formatter = FilenameFormatter.new
 	end
 
 	def help command=nil
@@ -19,12 +21,15 @@ class Controller
 	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
-		  puts "\n" + @shell.read_file("README")
+			@view.show "\n" + @shell.read_file("README")
 		rescue
-			puts "Unkown framework #{framework}. Possible frameworks:"
-			puts @scaffolder.list_templates
+			@view.show_unknown_framework_error framework, @scaffolder.list_templates
 		end		
 	end
 

data/app/filename_formatter.rb

@@ -39,6 +39,14 @@ class FilenameFormatter
     "#{CODERSDOJO_WORKSPACE}/#{session_id}"
   end
 
+	def without_extension filename
+		if filename.include? '.' then
+			filename.split('.')[0..-2].join('.')
+		else
+			filename
+		end
+	end
+
   def extract_last_path_item dir_path
 	  last = dir_path.split(ShellWrapper.new.dir_separator).last
 		last.nil? ? "" : last

data/app/scaffolder.rb

@@ -7,6 +7,7 @@ class Scaffolder
 	def initialize shell
 		@shell = shell
 		@template_machine = TextTemplateMachineFactory.create @shell
+		@filename_formatter = FilenameFormatter.new
 	end
 
 	def list_templates
@@ -16,7 +17,8 @@ class Scaffolder
 	end
 
 	def scaffold template, kata_file
-		@template_machine.placeholder_values['kata_file'] = kata_file
+		@template_machine.placeholder_values['kata_file.ext'] = kata_file
+		@template_machine.placeholder_values['kata_file'] = @filename_formatter.without_extension kata_file
 		template = template == '???' ? ANY_TEMPLATE : template
 			dir_path = "#{template_path}/#{template}"
 			to_copy = @shell.real_dir_entries dir_path

data/templates/any/README

@@ -8,4 +8,4 @@ run-once.%sh% is not implemented by now. You have to implement it appropriately.
 Run run-endless.%sh% and start your kata. (On Mac/Linux you have to call ./run-endless.%sh%.)
 
 Assumptions:
-  - The whole kata source code is in the one %kata_file%.
+  - The whole kata source code is in the one %kata_file.ext%.

data/templates/any/run-endless.%sh%

@@ -1 +1 @@
-codersdojo start run-once.%sh% %kata_file%
+codersdojo start run-once.%sh% %kata_file.ext%

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 1
-  - 14
-  version: 1.1.14
+  - 15
+  version: 1.1.15
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency