codersdojo 1.0.12 → 1.0.13

data/app/controller.rb

@@ -19,8 +19,13 @@ class Controller
 	end
 
 	def generate framework, kata_file
-		@scaffolder.scaffold framework, kata_file
-		puts "\n" + @shell.read_file("README")
+		begin
+			@scaffolder.scaffold framework, kata_file
+		  puts "\n" + @shell.read_file("README")
+		rescue
+			puts "Unkown framework #{framework}. Possible frameworks:"
+			puts @scaffolder.list_templates
+		end		
 	end
 
 	def start command, file

data/app/scaffolder.rb

@@ -27,19 +27,15 @@ class Scaffolder
 
 	def scaffold template, kata_file
 		@template_machine.placeholder_values['kata_file'] = kata_file
-		begin
+		template = template == '???' ? ANY_TEMPLATE : template
 			dir_path = "#{template_path}/#{template}"
 			to_copy = @shell.real_dir_entries dir_path
-		rescue
-			dir_path = "#{template_path}/#{ANY_TEMPLATE}"
-			to_copy = @shell.real_dir_entries dir_path
-		end
-		to_copy.each do |item|
-			file_path = "#{dir_path}/#{item}"
-			@shell.cp_r file_path, "."
-			transform_file_content item
-			transform_file_name item
-		end
+			to_copy.each do |item|
+				file_path = "#{dir_path}/#{item}"
+				@shell.cp_r file_path, "."
+				transform_file_content item
+				transform_file_name item
+			end
 	end
 	
 	def transform_file_content filename

data/app/shell_wrapper.rb

@@ -54,8 +54,7 @@ class ShellWrapper
   end
 
 	def real_dir_entries dir
-		current_and_parent = 2
-		Dir.new(dir).entries.drop current_and_parent
+		Dir.new(dir).entries - ["..", "."]
 	end
 
   def file? filename

data/spec/scaffolder_spec.rb

@@ -29,14 +29,6 @@ describe Scaffolder do
 		@scaffolder.scaffold "a.template", 'myKata'
 	end
 	
-	it "should use 'any' when the given template doesn't exist" do
-		@shell_mock.should_receive(:real_dir_entries).with("aDir/templates/unknown.template").and_throw Exception
-		@shell_mock.should_receive(:real_dir_entries).with("aDir/templates/any").and_return ["a"]
-		@shell_mock.should_receive(:cp_r).with "aDir/templates/any/a", "."
-		@shell_mock.should_receive(:file?).with("a").and_return false
-		@scaffolder.scaffold "unknown.template", 'myKata'
-	end
-	
 	it "should replace placeholder in template file README and shell scripts" do
 		@shell_mock.should_receive(:real_dir_entries).with("aDir/templates/a.template").
 			and_return ["a", "README", "run-once.sh", "run-endless.sh"]	

data/templates/java.junit/README

@@ -7,6 +7,7 @@ Run run-endless.sh and start your kata.
 Assumptions:
   - A Java JDK is installed on your system and 'java' and 'javac' are in the path.
   - junit.jar is placed in the 'lib' directory.
+  - junit.jar contains JUnit 4.
   - The whole kata source code is in the one %Kata_file%Test.java.
   - The kata source file is placed in the 'src' directory.
   - The kata class file is generated into the 'bin' directory.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - CodersDojo-Team