codersdojo 1.0.14 → 1.0.15

data/app/filename_formatter.rb

@@ -10,7 +10,7 @@ class FilenameFormatter
 
   def source_code_file state_dir
     Dir.entries(state_dir).each { |file|
-      return state_file state_dir, file unless file =='..' || file == '.' ||file == RESULT_FILE }
+      return state_file state_dir, file unless file =='..' || file == '.' || file == RESULT_FILE }
   end
 
   def result_file state_dir
@@ -30,5 +30,10 @@ class FilenameFormatter
     "#{CODERSDOJO_WORKSPACE}/#{session_id}"
   end
 
+  def extract_last_path_item dir_path
+	  last = dir_path.split(File::Separator).last
+		last.nil? ? "" : last
+	end
+
 end
 

data/app/state_reader.rb

@@ -2,7 +2,7 @@ require 'filename_formatter'
 
 class StateReader
 
-  attr_accessor :session_id, :next_step
+  attr_accessor :session_id, :session_dir, :next_step
 
   def initialize shell
     @filename_formatter = FilenameFormatter.new
@@ -10,6 +10,11 @@ class StateReader
     @next_step = 0
   end
 
+	def session_dir= session_dir
+		@session_dir = session_dir
+		@session_id = @filename_formatter.extract_last_path_item @session_dir
+	end
+
   def state_count
 	  dummy_dirs_current_and_parent = 2
     Dir.new(@filename_formatter.session_dir @session_id).count - dummy_dirs_current_and_parent
@@ -34,7 +39,7 @@ class StateReader
   def read_next_state
     state = State.new
     state_dir = get_state_dir
-    state.time = @shell.ctime state_dir
+    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)
     @next_step += 1

data/app/uploader.rb

@@ -1,5 +1,6 @@
 require 'state_reader'
 require 'progress'
+require 'filename_formatter'
 require 'xml_element_extractor'
 require 'rest_client'
 
@@ -9,7 +10,7 @@ class Uploader
 		@hostname = hostname
 	  @framework = framework
     @state_reader = state_reader
-    @state_reader.session_id = session_dir.gsub('.codersdojo/', '')
+    @state_reader.session_dir = session_dir
   end
 
   def upload_kata

data/spec/filename_formatter_spec.rb

@@ -0,0 +1,17 @@
+require 'filename_formatter'
+
+describe FilenameFormatter do
+
+	before (:each) do
+		@formatter = FilenameFormatter.new
+  end
+
+  it 'extract the last element of a dir path' do
+		@formatter.extract_last_path_item("").should == ""
+		@formatter.extract_last_path_item("/").should == ""
+		@formatter.extract_last_path_item("a").should == "a"
+		@formatter.extract_last_path_item("a/b/").should == "b"
+		@formatter.extract_last_path_item("/a/b/c").should == "c"
+  end
+
+end

data/spec/state_reader_spec.rb

@@ -12,7 +12,7 @@ describe StateReader do
   end
 
   it "should read a stored kata state" do
-    @shell_mock.should_receive(:ctime).with(".codersdojo/id0815/#{@state_dir_prefix}0").and_return @a_time
+    @shell_mock.should_receive(:creation_time).with(".codersdojo/id0815/#{@state_dir_prefix}0").and_return @a_time
     Dir.should_receive(:entries).with(".codersdojo/id0815/#{@state_dir_prefix}0").and_return(['.','..','file.rb', 'result.txt'])
     @shell_mock.should_receive(:read_file).with(".codersdojo/id0815/#{@state_dir_prefix}0/result.txt").and_return "result"
     @shell_mock.should_receive(:read_file).with(".codersdojo/id0815/#{@state_dir_prefix}0/file.rb").and_return "source code"

data/spec/uploader_spec.rb

@@ -7,7 +7,7 @@ describe Uploader do
   end
 
   it "should convert session-dir to session-id" do
-    @state_reader_mock.should_receive(:session_id=).with("session_id")
+    @state_reader_mock.should_receive(:session_dir=).with(".codersdojo/session_id")
     Uploader.new "http://dummy_host", "dummy.framework", ".codersdojo/session_id", @state_reader_mock
   end
 
@@ -15,7 +15,7 @@ describe Uploader do
 
       before (:each) do
         @state_reader_mock = mock StateReader
-        @state_reader_mock.should_receive(:session_id=).with("path_to_kata")
+        @state_reader_mock.should_receive(:session_dir=).with("path_to_kata")
         @uploader = Uploader.new "http://dummy_host", "dummy.framework", "path_to_kata", @state_reader_mock
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 0
-  - 14
-  version: 1.0.14
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +01:00
+date: 2011-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - templates/ruby.test-unit/run-once.%sh%
 - lib/place_libs_here
 - spec/argument_parser_spec.rb
+- spec/filename_formatter_spec.rb
 - spec/progress_spec.rb
 - spec/runner_spec.rb
 - spec/scaffolder_spec.rb
@@ -132,6 +133,7 @@ specification_version: 3
 summary: Client for CodersDojo.org
 test_files: 
 - spec/argument_parser_spec.rb
+- spec/filename_formatter_spec.rb
 - spec/progress_spec.rb
 - spec/runner_spec.rb
 - spec/scaffolder_spec.rb