codersdojo 1.3.00 → 1.3.01

data/app/shell_wrapper.rb

@@ -75,7 +75,7 @@ class ShellWrapper
 	def files_in_dir_tree dir, regexp_pattern=nil
 		Dir.glob("#{dir}/**/*").find_all{|entry|
 			file_matches_regexp? entry, regexp_pattern
-		}
+		}.sort
 	end
 
 	def file_matches_regexp? dir_entry, regexp_pattern

data/app/state_reader.rb

@@ -56,7 +56,12 @@ class StateReader
 	def read_source_files state_dir
 		files = @shell.files_in_dir_tree state_dir
 		source_files = files.find_all{|file| @filename_formatter.source_file_in_state_dir? file}
-		source_files.collect {|file| @shell.read_file file}
+		marker = "=========="
+		source_files.collect {|file| 
+			filename = @filename_formatter.extract_last_path_item file
+			code = @shell.read_file(file)
+			"#{marker} #{filename} #{marker}\n\n#{code}"
+		}
 	end
 
 	def fill_state_with_properties state, properties

data/app/uploader.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'state'
 require 'state_reader'
 require 'progress'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codersdojo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.00
+  - 1
+  version: 1.3.01
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 +02:00
+date: 2011-06-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency