codersdojo 1.0.10 → 1.0.11

data/app/runner.rb

@@ -1,4 +1,5 @@
 require "filename_formatter"
+require "text_converter"
 
 class Runner
 
@@ -27,6 +28,7 @@ class Runner
       return
     end
     result = @shell.execute @run_command
+		result = TextConverter.new.remove_escape_sequences result
     state_dir = @filename_formatter.state_dir @session_id, @step
     @shell.mkdir state_dir
     @shell.cp @file, state_dir

data/app/text_converter.rb

@@ -0,0 +1,19 @@
+class TextConverter
+	
+	@@ESCAPE_SEQUENCE_START = 0x1b.chr
+	@@ESCAPE_SEQUENCE_END = 0x6d.chr
+	
+	def self.ESCAPE_SEQUENCE_START
+		@@ESCAPE_SEQUENCE_START
+	end
+	
+	def self.ESCAPE_SEQUENCE_END
+		@@ESCAPE_SEQUENCE_END
+	end
+	
+	def remove_escape_sequences text
+		if text.nil? then return nil end
+		text.gsub(/#{@@ESCAPE_SEQUENCE_START}.*?#{@@ESCAPE_SEQUENCE_END}/, '')
+	end
+	
+end

data/spec/runner_spec.rb

@@ -55,5 +55,11 @@ describe Runner, "in run mode" do
     @runner.start
   end
 
+	it "should remove escape sequences" do
+    @shell_mock.should_receive(:execute).and_return "#{TextConverter.ESCAPE_SEQUENCE_START}b#{TextConverter.ESCAPE_SEQUENCE_END}c"
+    @shell_mock.should_receive(:write_file).with "#{STATE_DIR_PREFIX}0/result.txt", "c"
+		@runner.start
+	end
+
 end
 

data/spec/text_converter_spec.rb

@@ -0,0 +1,30 @@
+require 'text_converter'
+
+describe TextConverter do
+
+  before (:each) do
+		@escape_sequence_start = 0x1b.chr
+		@escape_sequence_end = 0x6d.chr
+    @text_converter = TextConverter.new
+  end
+
+	it "should leave nil as nil" do
+		@text_converter.remove_escape_sequences(nil).should be_nil
+		
+	end
+	
+  it "should leave text without escape sequences untouched" do
+		@text_converter.remove_escape_sequences("text without escape sequence").should == "text without escape sequence"
+  end
+
+  it "should remove escape sequences from text" do
+		@text_converter.remove_escape_sequences("#{@escape_sequence_start}ab#{@escape_sequence_end}").should == ""
+		@text_converter.remove_escape_sequences("a#{@escape_sequence_start}b#{@escape_sequence_end}c").should == "ac"
+		@text_converter.remove_escape_sequences("ab#{@escape_sequence_start}#{@escape_sequence_end}cd").should == "abcd"
+  end
+
+	it "should remove escape sequences non greedy" do
+		@text_converter.remove_escape_sequences("#{@escape_sequence_start}a#{@escape_sequence_end}b#{@escape_sequence_start}c#{@escape_sequence_end}").should == "b"
+	end
+	
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - app/shell_argument_exception.rb
 - app/shell_wrapper.rb
 - app/state_reader.rb
+- app/text_converter.rb
 - app/text_template_machine.rb
 - app/uploader.rb
 - app/xml_element_extractor.rb
@@ -90,6 +91,7 @@ files:
 - spec/scaffolder_spec.rb
 - spec/session_id_generator_spec.rb
 - spec/state_reader_spec.rb
+- spec/text_converter_spec.rb
 - spec/text_template_machine_spec.rb
 - spec/uploader_spec.rb
 - spec/xml_element_extractor_spec.rb
@@ -135,6 +137,7 @@ test_files:
 - spec/scaffolder_spec.rb
 - spec/session_id_generator_spec.rb
 - spec/state_reader_spec.rb
+- spec/text_converter_spec.rb
 - spec/text_template_machine_spec.rb
 - spec/uploader_spec.rb
 - spec/xml_element_extractor_spec.rb