codersdojo 1.2.01 → 1.2.02

data/app/console_view.rb

@@ -186,7 +186,7 @@ msg
 	end
 		
 	def show_kata_upload_hint
-		show "You finished your kata. Now upload it with 'codersdojo upload'."
+		show "You finished your kata. You can upload it with 'codersdojo upload'."
 	end
 		
 	def show text

data/app/info_property_file.rb

@@ -0,0 +1,7 @@
+class InfoPropertyFile
+
+  def self.RETURN_CODE_PROPERTY
+	  'return_code'
+  end
+	
+end

data/app/runner.rb

@@ -1,3 +1,4 @@
+require "info_property_file"
 require "filename_formatter"
 require "text_converter"
 
@@ -35,7 +36,7 @@ class Runner
     @shell.mkdir state_dir
     @shell.cp @file, state_dir
     @shell.write_file @filename_formatter.result_file(state_dir), result
-    @shell.write_file @filename_formatter.info_file(state_dir), "return_code: #{process.return_code}"
+    @shell.write_file @filename_formatter.info_file(state_dir), "#{InfoPropertyFile.RETURN_CODE_PROPERTY}: #{process.return_code}"
     @step += 1
     @previous_change_time = change_time
   end

data/app/state.rb

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

data/app/state_reader.rb

@@ -1,3 +1,4 @@
+require 'info_property_file'
 require 'filename_formatter'
 require 'state'
 
@@ -47,9 +48,15 @@ class StateReader
     state.time = @shell.creation_time state_dir
     state.code = @shell.read_file @filename_formatter.source_code_file(state_dir)
     state.result = @shell.read_file @filename_formatter.result_file(state_dir)
+		properties = @shell.read_properties @filename_formatter.info_file(state_dir)
+		fill_state_with_properties state, properties
     @next_step += 1
     state
   end
 
+	def fill_state_with_properties state, properties
+		state.return_code = properties[InfoPropertyFile.RETURN_CODE_PROPERTY]
+	end
+
 end
 

data/app/uploader.rb

@@ -39,7 +39,9 @@ class Uploader
   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}
+			green = state.return_code == 0
+			kata_data["states[#{index}]"] = {:code => state.code, :result => state.result, :green => green, 
+				:created_at => state.time}
 		end
     RestClient.post "#{@hostname}#{@@kata_path}", kata_data
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.01
+  - 2
+  version: 1.2.02
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +01:00
+date: 2011-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - app/console_view.rb
 - app/controller.rb
 - app/filename_formatter.rb
+- app/info_property_file.rb
 - app/progress.rb
 - app/property_file_missing_exception.rb
 - app/runner.rb