codersdojo 1.0.1 → 1.0.2

data/app/codersdojo.rb

@@ -5,24 +5,35 @@ require 'controller'
 require 'argument_parser'
 require 'scaffolder'
 
-def called_from_spec args
-  args[0] == "spec"
-end
+class CodersDojo
+	
+	def initialize params
+		@params = params
+	end
+	
+	def run
+		if called_from_spec? then return end
+		hostname = "http://www.codersdojo.com"
+	#	hostname = "http://localhost:3000"
 
-# entry from shell
-if not called_from_spec(ARGV) then
-	hostname = "http://www.codersdojo.com"
-#	hostname = "http://localhost:3000"
+		shell = ShellWrapper.new
+		scaffolder = Scaffolder.new shell
+		view = ConsoleView.new scaffolder
+		controller = Controller.new shell, view, scaffolder, hostname
 
-	shell = ShellWrapper.new
-	scaffolder = Scaffolder.new shell
-	view = ConsoleView.new scaffolder
-	controller = Controller.new shell, view, scaffolder, hostname
-	
-	begin
-		arg_parser = ArgumentParser.new controller
-		command = arg_parser.parse ARGV
-	rescue ShellArgumentException
-		controller.help
+		begin
+			arg_parser = ArgumentParser.new controller
+			command = arg_parser.parse @params
+		rescue ShellArgumentException
+			controller.help
+		end
+  end
+
+	def called_from_spec?
+	  @params and @params[0] == "spec"
 	end
+	
 end
+
+# entry from shell
+CodersDojo.new(ARGV).run

data/app/scaffolder.rb

@@ -37,18 +37,25 @@ class Scaffolder
 		to_copy.each do |item|
 			file_path = "#{dir_path}/#{item}"
 			@shell.cp_r file_path, "."
-			transform_file item
+			transform_file_content item
+			transform_file_name item
 		end
 	end
 	
-	def transform_file filename
-		if File.file?(filename)
+	def transform_file_content filename
+		if @shell.file?(filename)
 			content = @shell.read_file filename
 			content = @template_machine.render content
-			new_filename = @template_machine.render filename
-			@shell.write_file new_filename, content
+			@shell.write_file filename, content
 		end
 	end
+	
+	def transform_file_name filename
+		new_filename = @template_machine.render filename
+		if new_filename != filename
+			@shell.rename filename, new_filename
+		end
+  end
 		
 	def template_path
 		file_path_elements = @shell.current_file.split '/' 

data/app/shell_wrapper.rb

@@ -20,6 +20,10 @@ class ShellWrapper
     FileUtils.mkdir_p dirs
   end
 
+	def rename old_filename, new_filename
+		File.rename old_filename, new_filename
+	end
+
 	def current_file
 		__FILE__
 	end
@@ -64,6 +68,10 @@ class ShellWrapper
 		end
 	end
 
+  def file? filename
+		File.file? filename
+	end
+	
 	def remove_command_name
 		windows? ? 'del' : 'rm'
 	end

data/bin/codersdojo

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
 codersdojo_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'app'))
-infrastructure_dir = "#{codersdojo_dir}/infrastructure"
-models_dir = "#{codersdojo_dir}/models"
 $LOAD_PATH.unshift(codersdojo_dir) unless $LOAD_PATH.include?(codersdojo_dir)
-$LOAD_PATH.unshift(infrastructure_dir) unless $LOAD_PATH.include?(infrastructure_dir)
-$LOAD_PATH.unshift(models_dir) unless $LOAD_PATH.include?(models_dir)
 require 'codersdojo'

data/spec/scaffolder_spec.rb

@@ -23,7 +23,9 @@ describe Scaffolder do
 	it "should scaffold the files and directories for a given template" do
 		@shell_mock.should_receive(:real_dir_entries).with("aDir/templates/a.template").and_return ["a", "b"]
 		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/a", "."
+		@shell_mock.should_receive(:file?).with("a").and_return false
 		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/b", "."
+		@shell_mock.should_receive(:file?).with("b").and_return false
 		@scaffolder.scaffold "a.template", 'myKata'
 	end
 	
@@ -31,20 +33,25 @@ describe Scaffolder 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"]
+			and_return ["a", "README", "run-once.sh", "run-endless.sh"]	
 		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/a", "."
+		@shell_mock.should_receive(:file?).with("a").and_return false
 		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/README", "."
-		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/run-once.sh", "."
-		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/run-endless.sh", "."
+		@shell_mock.should_receive(:file?).with("README").and_return true
 		@shell_mock.should_receive(:read_file).with("README").and_return '%rm% %kata_file%\nb.%sh%\nc%:%d'
 		@shell_mock.should_receive(:write_file).with "README", 'del myKata\nb.cmd\nc;d'
+		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/run-once.sh", "."
+		@shell_mock.should_receive(:file?).with("run-once.sh").and_return true
 		@shell_mock.should_receive(:read_file).with("run-once.sh").and_return "%rm% a\nb.%sh%\nc%:%d"
 		@shell_mock.should_receive(:write_file).with "run-once.sh", "del a\nb.cmd\nc;d"
+		@shell_mock.should_receive(:cp_r).with "aDir/templates/a.template/run-endless.sh", "."
+		@shell_mock.should_receive(:file?).with("run-endless.sh").and_return true
 		@shell_mock.should_receive(:read_file).with("run-endless.sh").and_return "%rm% a\nb.%sh%\nc%:%d"
 		@shell_mock.should_receive(:write_file).with "run-endless.sh", "del a\nb.cmd\nc;d"
 		@scaffolder.scaffold "a.template", 'myKata'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +01:00
+date: 2010-12-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,24 +58,24 @@ files:
 - app/uploader.rb
 - app/xml_element_extractor.rb
 - templates/any/README
-- templates/any/run-endless.sh
-- templates/any/run-once.sh
+- templates/any/run-endless.%sh%
+- templates/any/run-once.%sh%
 - templates/clojure.is-test/%kata_file%.clj
 - templates/clojure.is-test/lib/place_your_libs_here
 - templates/clojure.is-test/README
-- templates/clojure.is-test/run-endless.sh
-- templates/clojure.is-test/run-once.sh
+- templates/clojure.is-test/run-endless.%sh%
+- templates/clojure.is-test/run-once.%sh%
 - templates/java.junit/%Kata_file%Test.java
 - templates/java.junit/bin/place_your_class_files_here
 - templates/java.junit/lib/place_your_libs_here
 - templates/java.junit/README
-- templates/java.junit/run-endless.sh
-- templates/java.junit/run-once.sh
+- templates/java.junit/run-endless.%sh%
+- templates/java.junit/run-once.%sh%
 - templates/python.pyunit/%kata_file%.py
 - templates/python.pyunit/README
-- templates/python.pyunit/run-endless.sh
-- templates/python.pyunit/run-once.sh
-- templates/ruby.test-unit/%kata_file%.rb
+- templates/python.pyunit/run-endless.%sh%
+- templates/python.pyunit/run-once.%sh%
+- templates/ruby.test-unit/mykata.rb
 - templates/ruby.test-unit/README
 - templates/ruby.test-unit/run-endless.sh
 - templates/ruby.test-unit/run-once.sh