codersdojo 1.1.05 → 1.1.06

data/app/codersdojo.rb

@@ -7,19 +7,17 @@ require 'scaffolder'
 
 class CodersDojo
 	
-	def initialize params
+	def initialize params, hostname = "http://www.codersdojo.com"
 		@params = params
+		@hostname = hostname
 	end
 	
 	def run
 		if called_from_spec? then return end
-		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
+		controller = Controller.new shell, view, scaffolder, @hostname
 
 		begin
 			arg_parser = ArgumentParser.new controller
@@ -34,6 +32,3 @@ class CodersDojo
 	end
 	
 end
-
-# entry from shell
-CodersDojo.new(ARGV).run

data/app/console_view.rb

@@ -19,10 +19,10 @@ helptext
 		puts <<-helptext
 Usage: #{$0} command [options]
 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
+  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
 
 Report bugs to <codersdojo@it-agile.de>
 helptext
@@ -69,10 +69,11 @@ helptext
 		templates = @scaffolder.list_templates
 		puts <<-helptext
 		
-upload <framework> <session_directory>  Upload the kata written with <framework> in <session_directory> to codersdojo.com. 
-                                        <session_directory> is relative to the working directory.
-                                        By now <framework> is one of #{templates}.
-                                        If you used another framework, use ??? and send an email to codersdojo@it-agile.de
+upload <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
@@ -87,7 +88,7 @@ helptext
 	end
 	
 	def show_start_kata command, file
-	  puts "Starting PersonalCodersDojo with command #{command} and kata file #{file}. Use Ctrl+C to finish the kata."		
+	  puts "Starting CodersDojo-Client with command #{command} and kata file #{file}. Use Ctrl+C to finish the kata."		
 	end
 	
 	def show_missing_command_argument_error command
@@ -95,8 +96,8 @@ helptext
 		show_usage
 	end
 	
-	def show_upload_start hostname
-		puts "Start upload to #{hostname}"
+	def show_upload_start session_directory, hostname
+		puts "Start upload from #{session_directory} to #{hostname}"
 	end
 	
 	def show_upload_result result

data/app/controller.rb

@@ -42,13 +42,13 @@ class Controller
 	end
 
 	def upload framework, session_directory
-		@view.show_upload_start @hostname
-		if session_directory then
-		  uploader = Uploader.new @hostname, framework, session_directory
-		  @view.show_upload_result uploader.upload
-		else
-			@view.show_missing_command_argument_error "upload"
+		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
+	  uploader = Uploader.new @hostname, framework, session_directory
+	  @view.show_upload_result uploader.upload
 	end
 
 end

data/app/filename_formatter.rb

@@ -8,6 +8,10 @@ class FilenameFormatter
 		STATE_DIR_PREFIX
 	end
 
+	def self.codersdojo_workspace
+		CODERSDOJO_WORKSPACE
+	end
+
   def source_code_file state_dir
     Dir.entries(state_dir).each { |file|
       return state_file state_dir, file unless file =='..' || file == '.' || file == RESULT_FILE }

data/app/shell_wrapper.rb

@@ -60,6 +60,13 @@ class ShellWrapper
 	def real_dir_entries dir
 		Dir.new(dir).entries - ["..", "."]
 	end
+	
+	def newest_dir_entry dir
+		Dir.new(dir).sort_by do |entry| 
+			complete_path = File.join dir, entry
+			File.mtime(complete_path)
+		end.last
+	end
 
   def file? filename
 		File.file? filename

data/app/state.rb

@@ -0,0 +1,11 @@
+class State
+
+  attr_accessor :time, :code, :result
+
+  def initialize time=nil, code=nil, result=nil
+    @time = time
+    @code = code
+    @result = result
+  end
+
+end

data/app/state_reader.rb

@@ -1,4 +1,5 @@
 require 'filename_formatter'
+require 'state'
 
 class StateReader
 
@@ -7,9 +8,13 @@ class StateReader
   def initialize shell
     @filename_formatter = FilenameFormatter.new
     @shell = shell
-    @next_step = 0
+		reset
   end
 
+	def reset
+		@next_step = 0
+	end
+
 	def session_dir= session_dir
 		@session_dir = session_dir
 		@session_id = @filename_formatter.extract_last_path_item @session_dir
@@ -48,15 +53,3 @@ class StateReader
 
 end
 
-class State
-
-  attr_accessor :time, :code, :result
-
-  def initialize time=nil, code=nil, result=nil
-    @time = time
-    @code = code
-    @result = result
-  end
-
-end
-

data/app/uploader.rb

@@ -1,3 +1,4 @@
+require 'state'
 require 'state_reader'
 require 'progress'
 require 'filename_formatter'
@@ -6,42 +7,42 @@ require 'rest_client'
 
 class Uploader
 
+	attr_reader :states
+
   def initialize hostname, framework, session_dir, state_reader = StateReader.new(ShellWrapper.new)
+	  @states = []
 		@hostname = hostname
 	  @framework = framework
     @state_reader = state_reader
     @state_reader.session_dir = session_dir
   end
 
-  def upload_kata
-    RestClient.post "#{@hostname}#{@@kata_path}", {:framework => @framework}
-  end
-
-  def upload_state kata_id
-    state = @state_reader.read_next_state
-    RestClient.post "#{@hostname}#{@@kata_path}/#{kata_id}#{@@state_path}", {:code => state.code, :result => state.result, :created_at => state.time}
-    Progress.next
-  end
-
-  def upload_states kata_id
-    Progress.write_empty_progress @state_reader.state_count
-    while @state_reader.has_next_state
-      upload_state kata_id
-    end
-    Progress.end
+  def upload
+    return upload_kata_and_states if @state_reader.enough_states?
+    return "You need at least two states"
   end
 
   def upload_kata_and_states
+		read_states
     kata = upload_kata
-    upload_states(XMLElementExtractor.extract('kata/id', kata))
 		finish_url = "#{@hostname}#{@@description_path}/#{XMLElementExtractor.extract('kata/uuid', kata)}"
 		summary_url = XMLElementExtractor.extract('kata/short-url', kata)
     "Complete kata information at #{finish_url}"
   end
 
-  def upload
-    return upload_kata_and_states if @state_reader.enough_states?
-    return "You need at least two states"
+	def read_states
+		@state_reader.reset
+		while @state_reader.has_next_state
+			@states << @state_reader.read_next_state
+		end
+	end
+
+  def upload_kata
+		kata_data = {:framework => @framework}
+		states_data = states.each_with_index do |state,index|
+			kata_data["states[#{index}]"] = {:code => state.code, :result => state.result, :created_at => state.time}
+		end
+    RestClient.post "#{@hostname}#{@@kata_path}", kata_data
   end
 
   private

data/bin/codersdojo

@@ -2,3 +2,4 @@
 codersdojo_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'app'))
 $LOAD_PATH.unshift(codersdojo_dir) unless $LOAD_PATH.include?(codersdojo_dir)
 require 'codersdojo'
+CodersDojo.new(ARGV).run

data/templates/python.pytest/%kata_file%.py

@@ -0,0 +1,9 @@
+# Adapt the code to your code kata %kata_file%.
+# Important: Test and production code has to be
+#            completely in this file.
+
+def foo(num):	
+    return 'fixme' 
+
+def test_to_roman():	
+    assert foo == 'foo'

data/templates/python.pytest/README

@@ -0,0 +1,8 @@
+Two shell scripts were created:
+  run-once.%sh% runs your tests once
+  run-endless.%sh% runs your tests endlessly via run-once.%sh%
+
+Run run-endless.%sh% and start your kata.
+
+Assumptions:
+  - The whole kata source code is in the one %kata_file%.py.

data/templates/python.pytest/run-endless.%sh%

@@ -0,0 +1 @@
+codersdojo start run-once.%sh% %kata_file%.py

data/templates/python.pytest/run-once.%sh%

@@ -0,0 +1 @@
+py.test %kata_file%.py

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.05
+  - 6
+  version: 1.1.06
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - app/session_id_generator.rb
 - app/shell_argument_exception.rb
 - app/shell_wrapper.rb
+- app/state.rb
 - app/state_reader.rb
 - app/text_converter.rb
 - app/text_template_machine.rb
@@ -86,6 +87,10 @@ files:
 - templates/javascript.vows/README
 - templates/javascript.vows/run-endless.%sh%
 - templates/javascript.vows/spec.js
+- templates/python.pytest/%kata_file%.py
+- templates/python.pytest/README
+- templates/python.pytest/run-endless.%sh%
+- templates/python.pytest/run-once.%sh%
 - templates/python.pyunit/%kata_file%.py
 - templates/python.pyunit/README
 - templates/python.pyunit/run-endless.%sh%