codersdojo 1.1.15 → 1.1.16

data/app/argument_parser.rb

@@ -24,7 +24,7 @@ class ArgumentParser
 		elsif command == "spec" then
 			# 'spec" is for testing purpose only: do nothing special
 		else
-			raise ShellArgumentException
+			raise ShellArgumentException.new command
 		end
 	end
 

data/app/codersdojo.rb

@@ -22,8 +22,10 @@ class CodersDojo
 		begin
 			arg_parser = ArgumentParser.new controller
 			command = arg_parser.parse @params
-		rescue ShellArgumentException
-			controller.help
+		rescue ShellArgumentException => e
+			view.show_unknwon_command_message e.command
+		rescue PropertyFileMissingException => e
+			view.show_properties_file_missing_error e.filename
 		end
   end
 

data/app/console_view.rb

@@ -1,5 +1,6 @@
 require 'shell_wrapper'
 require 'text_template_machine'
+require 'property_file_missing_exception'
 
 class ConsoleView
 	
@@ -113,6 +114,11 @@ Command #{command} not known. Try '#{current_command_path} help' to list the sup
 helptext
 	end
 	
+	def show_unknwon_command_message command
+		show "Command #{command} not known.\n\n"
+		show_usage
+	end
+	
 	def show_start_kata command, file, framework
 	  show "Starting CodersDojo-Client with command #{command} and kata file #{file} with framework #{framework}. Use Ctrl+C to finish the kata."		
 	end
@@ -149,6 +155,14 @@ You finished your kata. Choose your next action:
   r) Resume the kata.
 msg
 	end
+
+	def show_properties_file_missing_error filename
+		show <<-msg
+Property file #{filename} is missing.
+Maybe you created the directory structure with an older version of CodersDojo?
+Recreate the directory structure with the current version with 'codersdojo setup ...'.
+msg
+	end
 		
 	def show_kata_upload_hint
 		show "You finished your kata. Now upload it with 'codersdojo upload'."

data/app/controller.rb

@@ -5,6 +5,7 @@ require 'filename_formatter'
 class Controller
 
 	def initialize shell, view, scaffolder, hostname
+		@property_filename = '.meta'
 		@shell = shell
 		@view = view
 		@scaffolder = scaffolder
@@ -74,7 +75,7 @@ class Controller
 	end
 
 	def properties
-		@shell.read_properties '.meta'
+	  @shell.read_properties @property_filename
 	end
 
 end

data/app/property_file_missing_exception.rb

@@ -0,0 +1,9 @@
+class PropertyFileMissingException < Exception
+	
+	attr_accessor :filename
+	
+	def initialize filename
+		@filename = filename
+	end
+	
+end

data/app/shell_argument_exception.rb

@@ -1,3 +1,9 @@
 class ShellArgumentException < Exception
 	
+	attr_accessor :command
+	
+	def initialize command
+		@command = command
+	end
+	
 end

data/app/shell_wrapper.rb

@@ -66,6 +66,13 @@ class ShellWrapper
 		Dir.new(dir).entries - ["..", "."]
 	end
 	
+	def files_in_dir dir
+		Dir.new(dir).entries.find_all{|entry|
+			File.file? entry
+		}
+	end
+		
+	
 	def newest_dir_entry dir
 		Dir.new(dir).sort_by do |entry| 
 			complete_path = File.join dir, entry
@@ -82,7 +89,11 @@ class ShellWrapper
 	end
 	
 	def read_properties filename
-		YAML.load_file(filename)
+		begin
+			YAML.load_file filename
+		rescue
+			raise PropertyFileMissingException.new filename
+		end
 	end
 	
 	def remove_command_name

data/templates/clojure.is-test/.meta

@@ -1 +1,3 @@
 framework: clojure.is-test
+source_files: .*\.clj
+

data/templates/csharp.nunit/.meta

@@ -1 +1,2 @@
 framework: csharp.nunit
+source_files: .*\.cs

data/templates/forth.tester/.meta

@@ -1 +1,2 @@
 framework: forth.tester
+source_files: .*\.fth

data/templates/java.junit/.meta

@@ -1 +1,3 @@
 framework: java.junit
+source_files: .*\.java
+

data/templates/javascript.jspec/.meta

@@ -1 +1,2 @@
 framework: javascript.jspec
+source_files: .*\.js

data/templates/javascript.vows/.meta

@@ -1 +1,3 @@
 framework: javascript.vows
+source_files: .*\.js
+

data/templates/python.pytest/.meta

@@ -1 +1,3 @@
 framework: python.pytest
+source_files: .*\.py
+

data/templates/python.pyunit/.meta

@@ -1 +1,3 @@
 framework: python.pyunit
+source_files: .*\.py
+

data/templates/ruby.test-unit/.meta

@@ -1 +1,3 @@
 framework: ruby.test-unit
+source_files: .*\.rb
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 51
   prerelease: false
   segments: 
   - 1
   - 1
-  - 15
-  version: 1.1.15
+  - 16
+  version: 1.1.16
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - app/controller.rb
 - app/filename_formatter.rb
 - app/progress.rb
+- app/property_file_missing_exception.rb
 - app/runner.rb
 - app/scaffolder.rb
 - app/scheduler.rb