codersdojo 1.4.07 → 1.5.00

data/bin/codersdojo

@@ -14,7 +14,7 @@ msg
 end
 
 show_update_message_when_old
-codersdojo_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'app'))
+codersdojo_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(codersdojo_dir) unless $LOAD_PATH.include?(codersdojo_dir)
 require 'codersdojo'
 CodersDojo.new(ARGV).run

data/{app → lib}/argument_parser.rb

@@ -5,15 +5,15 @@ require 'shell_wrapper'
 require 'console_view'
 require 'return_code_evaluator'
 require 'state_reader'
-require 'help_command'
-require 'xhelp_command'
-require 'generate_command'
-require 'init_session_command'
-require 'capture_single_run_command'
-require 'revert_to_green_command'
-require 'upload_command'
-require 'upload_no_open_command'
-require 'start_command'
+require 'commands/help_command'
+require 'commands/xhelp_command'
+require 'commands/generate_command'
+require 'commands/init_session_command'
+require 'commands/capture_single_run_command'
+require 'commands/revert_to_green_command'
+require 'commands/upload_command'
+require 'commands/upload_no_open_command'
+require 'commands/start_command'
 
 class ArgumentParser
 	

data/{app → lib}/scaffolder.rb

@@ -60,10 +60,14 @@ class Scaffolder
   end
 		
 	def template_path
-		file_path_elements = @shell.current_file.split '/' 
+		file_path_elements = Scaffolder::current_file.split '/' 
 		file_path_elements[-2..-1] = nil
 		(file_path_elements << 'templates').join '/'
 	end
 
+  def self.current_file
+	  __FILE__
+  end
+
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 7
-  version: 1.4.07
+  - 5
+  - 0
+  version: 1.5.00
 platform: ruby
 authors: 
 - CodersDojo-Team
@@ -60,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
+  name: shell-utils
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -68,9 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 0
+        - 1
+        version: 0.0.1
   type: :runtime
   version_requirements: *id004
 description: Client executes tests in an endless loop and logs source code and test result for later uplaod.
@@ -82,39 +82,24 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/argument_parser.rb
-- app/capture_single_run_command.rb
-- app/codersdojo.rb
-- app/console_view.rb
-- app/filename.rb
-- app/filename_formatter.rb
-- app/generate_command.rb
-- app/help_command.rb
-- app/info_property_file.rb
-- app/init_session_command.rb
-- app/meta_config_file.rb
-- app/progress.rb
-- app/property_file_missing_exception.rb
-- app/return_code_evaluator.rb
-- app/revert_to_green_command.rb
-- app/runner.rb
-- app/scaffolder.rb
-- app/scheduler.rb
-- app/session_id_generator.rb
-- app/session_zipper.rb
-- app/shell_argument_exception.rb
-- app/shell_process.rb
-- app/shell_wrapper.rb
-- app/start_command.rb
-- app/state.rb
-- app/state_reader.rb
-- app/text_converter.rb
-- app/text_template_machine.rb
-- app/upload_command.rb
-- app/upload_no_open_command.rb
-- app/uploader.rb
-- app/xhelp_command.rb
-- app/xml_element_extractor.rb
+- lib/argument_parser.rb
+- lib/codersdojo.rb
+- lib/console_view.rb
+- lib/filename_formatter.rb
+- lib/info_property_file.rb
+- lib/meta_config_file.rb
+- lib/property_file_missing_exception.rb
+- lib/return_code_evaluator.rb
+- lib/runner.rb
+- lib/scaffolder.rb
+- lib/scheduler.rb
+- lib/session_id_generator.rb
+- lib/state.rb
+- lib/state_reader.rb
+- lib/text_converter.rb
+- lib/text_template_machine.rb
+- lib/uploader.rb
+- lib/xml_element_extractor.rb
 - templates/any/README
 - templates/any/run-endless.%sh%
 - templates/any/run-once.%sh%

data/app/capture_single_run_command.rb

@@ -1,36 +0,0 @@
-require 'runner'
-
-class CaptureSingleRunCommand
-
-	COMMAND_NAME = 'capture-single-run'
-
-	def initialize shell, view, runner
-		@shell = shell
-		@view = view
-		@runner = runner
-	end
-
-	def execute_from_shell params
-		unless params[1] then @view.show_missing_command_argument_error COMMAND_NAME, "shell_command"; return end
-		unless params[2] then @view.show_missing_command_argument_error COMMAND_NAME, "kata_file"; return end
-		capture_single_run params[1], params[2]
-	end
-
-	def capture_single_run run_command, kata_file
-		@runner.run_command = run_command
-		session_id = @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace) 
-		filename_formatter = FilenameFormatter.new
-		last_state_dir = @shell.newest_dir_entry(filename_formatter.session_dir session_id)
-		step = last_state_dir.nil? ? 0 : filename_formatter.step_number_from_state_dir(last_state_dir) + 1
-		@runner.execute_once kata_file, session_id, step
-	end
-
-	def accepts_shell_command? command
-		command == COMMAND_NAME
-	end
-	
-	def continue_test_loop?
-		false
-	end
-		
-end

data/app/filename.rb

@@ -1,61 +0,0 @@
-class Filename
-	
-	DIR_SEPARATOR = '/'
-	WINDOWS_DIR_SEPARATOR = '\\'
-	
-	attr_accessor :path_items
-	
-	def initialize filename
-		filename = filename.gsub(WINDOWS_DIR_SEPARATOR, DIR_SEPARATOR)
-		@path_items = filename.split(DIR_SEPARATOR).delete_if{|item| item.empty?}
-		@absolute_path = filename.start_with? DIR_SEPARATOR
-	end
-	
-	def absolute_path?
-		@absolute_path
-	end
-	
-	def relative_path?
-		not absolute_path?
-	end
-	
-	def without_extension 
-		if @path_items.size > 0 and @path_items.last.include? '.' then
-			Filename.new(to_s.split('.')[0..-2].join('.'))
-		else
-			clone
-		end
-	end
-	
-	def extract_last_path_item
-		Filename.new(nil_to_empty_string @path_items.last)
-	end
-	
-	def remove_last_path_item
-		Filename.new(make_string(@path_items[0..-2]))
-	end
-	
-	def to_unix_s
-		make_string @path_items
-	end
-	
-	def to_windows_s
-		make_string @path_items, WINDOWS_DIR_SEPARATOR
-	end
-	
-	def to_s
-		to_unix_s
-	end
-	
-private
-	
-	def make_string the_path_items, seperator=DIR_SEPARATOR
-		prefix = absolute_path? ? seperator : ''
-		prefix + the_path_items.join(seperator)
-	end
-
-	def nil_to_empty_string object
-		object.nil? ? "" : object
-	end
-	
-end

data/app/generate_command.rb

@@ -1,34 +0,0 @@
-class GenerateCommand
-	
-	def initialize shell, view, scaffolder
-		@shell = shell
-		@view = view
-		@scaffolder = scaffolder
-	end
-	
-	def execute_from_shell params
-		generate params[1], params[2]
-	end
-	
-	def generate framework, kata_file
-		if not kata_file then
-			@view.show_missing_command_argument_error "setup", "kata_file"
-			return
-		end
-		begin
-			@scaffolder.scaffold framework, kata_file
-			@view.show "\n" + @shell.read_file("README")
-		rescue
-			@view.show_unknown_framework_error framework, @scaffolder.list_templates
-		end		
-	end
-	
-	def accepts_shell_command? command
-		command == 'setup'
-	end
-	
-	def continue_test_loop?
-		false
-	end
-
-end

data/app/help_command.rb

@@ -1,27 +0,0 @@
-class HelpCommand
-
-	def initialize view
-		@view = view
-	end
-	
-	def execute_from_shell params
-		help params[1]
-	end
-	
-	def help command=nil
-		if command then
-			@view.show_detailed_help command.downcase
-		else
-			@view.show_help
-		end
-	end
-	
-	def accepts_shell_command? command
-		['help', '-h', '--help'].member? command
-	end
-
-	def continue_test_loop?
-		false
-	end
-
-end

data/app/init_session_command.rb

@@ -1,27 +0,0 @@
-require 'runner'
-
-class InitSessionCommand
-
-	def initialize view, runner
-		@view = view
-		@runner = runner
-	end
-
-	def execute_from_shell params
-		init_session
-	end
-
-	def init_session
-	  session_dir = @runner.init_session
-	  @view.show_init_session_result session_dir
-	end
-	
-	def accepts_shell_command? command
-		command == 'init-session'
-	end
-	
-	def continue_test_loop?
-		false
-	end
-		
-end

data/app/progress.rb

@@ -1,19 +0,0 @@
-class Progress
-
-  def self.write_empty_progress states
-    STDOUT.print "#{states} states to upload"
-    STDOUT.print "["+" "*states+"]"
-    STDOUT.print "\b"*(states+1)
-    STDOUT.flush
-  end
-
-  def self.next
-    STDOUT.print "."
-    STDOUT.flush
-  end
-
-  def self.end
-    STDOUT.puts
-  end
-end
-

data/app/revert_to_green_command.rb

@@ -1,52 +0,0 @@
-
-class RevertToGreenCommand
-	
-	def initialize shell, view, meta_config_file, state_reader
-		@shell = shell
-		@view = view
-		@meta_config_file = meta_config_file
-		@state_reader = state_reader
-	end
-	
-	def execute_from_shell params
-		revert_to_green
-	end
-	
-	def execute
-		revert_to_green
-	end
-
-	def revert_to_green
-		formatter = FilenameFormatter.new
-		@state_reader.session_dir = formatter.session_dir @shell.newest_dir_entry(FilenameFormatter.codersdojo_workspace)
-		@state_reader.goto_last_state
-		state = @state_reader.read_previous_state if @state_reader.state_exist?
-		while @state_reader.state_exist? and state.red?
-			state = @state_reader.read_previous_state
-		end
-		if @state_reader.state_exist? and state.green?
-			@view.show_revert_to_step @state_reader.next_step+1
-			@shell.rm_r @meta_config_file.source_files
-			state.files.each do |file|
-				dest_file = Filename.new(file).extract_last_path_item.to_s
-				@shell.write_file dest_file, @shell.read_file(file)
-			end
-		else
-		  @view.show_no_green_state_to_revert_to
-			@state_reader.goto_last_state
-		end
-	end
-	
-	def command_key
-		'g'
-	end
-	
-	def accepts_shell_command? command
-		command == 'revert-to-green'
-	end
-	
-	def continue_test_loop?
-		true
-	end
-	
-end

data/app/session_zipper.rb

@@ -1,19 +0,0 @@
-require 'zip/zip'
-require 'zip/zipfilesystem'
-
-class SessionZipper
-
-  def compress(path)
-	  path.sub!(%r[/$],'')
-	  archive = File.join(path,File.basename(path))+'.zip'
-	  FileUtils.rm archive, :force=>true
-
-	  Zip::ZipFile.open(archive, 'w') do |zipfile|
-	    Dir["#{path}/**/**"].reject{|f|f==archive}.each do |file|
-	      zipfile.add(file.sub(path+'/',''),file)
-	    end
-	  end
-	  archive
-	end	
-	
-end

data/app/shell_argument_exception.rb

@@ -1,9 +0,0 @@
-class ShellArgumentException < Exception
-	
-	attr_accessor :command
-	
-	def initialize command
-		@command = command
-	end
-	
-end

data/app/shell_process.rb

@@ -1,5 +0,0 @@
-class ShellProcess
-	
-	attr_accessor :output, :return_code
-	
-end

data/app/shell_wrapper.rb

@@ -1,161 +0,0 @@
-require 'tempfile'
-require 'shell_process'
-require 'yaml'
-
-class ShellWrapper
-
-  MAX_STDOUT_LENGTH = 100000
-
-  def cp source, destination
-    FileUtils.cp source, destination
-  end
-
-  def cp_r source, destination
-    FileUtils.cp_r source, destination
-  end
-
-	def rm_r file_regex
-		files_in_dir_tree('.', file_regex).each do |file|
-			FileUtils.rm file
-		end
-	end
-
-  def mkdir dir
-    FileUtils.mkdir dir
-  end
-
-  def mkdir_p dirs
-    FileUtils.mkdir_p dirs
-  end
-
-	def rename old_filename, new_filename
-		File.rename old_filename, new_filename
-	end
-
-	def current_file
-		__FILE__
-	end
-
-  def execute command
-		process = ShellProcess.new 
-	  redirect_stderr_to_stdout = "2>&1"
-    spec_pipe = IO.popen("#{command} #{redirect_stderr_to_stdout}", "r")
-    process.output = spec_pipe.read MAX_STDOUT_LENGTH
-    spec_pipe.close
-		process.return_code = $?.exitstatus
-    puts process.output unless process.output.nil?
-    process
-  end
-
-  def write_file filename, content
-    file = File.new filename, "w"
-    file << content
-    file.close
-  end
-
-  def read_file filename
-    file = File.new filename
-    content = file.read
-    file.close
-    content
-  end
-
-  def creation_time filename
-    File.ctime(filename)
-  end
-
-  def modification_time filename
-    File.mtime(filename)
-  end
-
-	def real_dir_entries dir
-		Dir.new(dir).entries - ["..", "."]
-	end
-	
-	def files_in_dir dir, regexp_pattern=nil
-		Dir.new(dir).entries.find_all{|entry|
-			file_matches_regexp? entry, regexp_pattern
-		}
-	end
-	
-	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
-		File.file?(dir_entry) and (not regexp_pattern or dir_entry =~ Regexp.new(regexp_pattern))
-	end
-		
-	
-	def newest_dir_entry dir, files=nil
-		unless files then files = real_dir_entries(dir) end
-		files.sort_by do |entry| 
-			complete_path = File.join dir, entry
-			File.mtime(complete_path)
-		end.last
-	end
-	
-  def file? filename
-		File.file? filename
-	end
-	
-	def open_with_default_app filename
-		execute "#{open_command_name} #{filename}"
-	end
-	
-	def read_properties filename
-		begin
-			YAML.load_file filename
-		rescue
-			raise PropertyFileMissingException.new filename
-		end
-	end
-	
-	def remove_command_name
-		windows? ? 'del' : 'rm'
-	end
-	
-	def open_command_name
-		if windows? then
-			'start'
-		elsif mac? then
-			'open'
-		else
-			'xdg-open'
-		end
-	end
-
-	def expand_run_command command
-		if command.end_with?(".sh") then
-			"bash #{command}"
-		else
-			command
-		end
-	end
-
-	def shell_extension
-		windows? ? 'cmd' : 'sh'
-	end
-	
-	def path_separator
-		windows? ? ';' : ':'
-	end
-	
-	def dir_separator
-		File::ALT_SEPARATOR ? File::ALT_SEPARATOR : File::SEPARATOR
-	end
-	
-	def windows?
-		platform = RUBY_PLATFORM.downcase
-		platform.include?("windows") or platform.include?("mingw32")
-	end
-
-	def mac?
-		platform = RUBY_PLATFORM.downcase
-		platform.include?("universal-darwin")
-	end
-
-end
-

data/app/start_command.rb

@@ -1,35 +0,0 @@
-require 'meta_config_file'
-require 'scheduler'
-
-class StartCommand
-	
-	def initialize meta_config_file, runner, view, eval_loop_commands
-		@runner = runner
-		@view = view
-		@meta_file = meta_config_file
-		@eval_loop_commands = eval_loop_commands
-	end
-	
-	def execute_from_shell params
-		start params[1], params[2]
-	end
-
-	def start command, file
-		unless command then @view.show_missing_command_argument_error "start", "shell_command"; return end
-		if file then @view.show_deprecated_command_argument_warning "start", "kata_file" end # since 30-may-2011, remove argument in later version
-	  @view.show_start_kata command, file, @meta_file.framework_property
-		@runner.source_files = @meta_file.source_files
-	  @runner.run_command = command
-	  scheduler = Scheduler.new @runner, @view, @eval_loop_commands
-	  scheduler.start
-	end
-	
-	def accepts_shell_command? command
-		command == 'start'
-	end
-	
-	def continue_test_loop?
-		true
-	end
-	
-end

data/app/upload_command.rb

@@ -1,53 +0,0 @@
-require 'meta_config_file'
-require 'uploader'
-
-class UploadCommand
-
-	attr_accessor :uploader
-
-	def initialize shell, view, hostname
-		@shell = shell
-		@view = view
-		@hostname = hostname
-		@uploader = Uploader.new(hostname, '', '')
-		@meta_file = MetaConfigFile.new @shell
-	end
-
-	def execute
-		upload nil
-	end
-
-	def execute_from_shell params
-		upload params[1]
-	end
-
-	def upload session_directory, open_browser=true
-		formatter = FilenameFormatter.new
-		framework = @meta_file.framework_property
-		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, framework
-		@uploader.framework = framework
-		@uploader.session_dir = session_directory
-		upload_result = @uploader.upload
-		 @view.show_upload_result upload_result
-		url = upload_result.split.last
-		if open_browser then 
-			@shell.open_with_default_app url
-		end
-	end
-	
-	def command_key
-		'u'
-	end
-	
-	def accepts_shell_command? command
-		command == 'upload'
-	end
-
-	def continue_test_loop?
-		false
-	end
-			
-end

data/app/upload_no_open_command.rb

@@ -1,23 +0,0 @@
-class UploadNoOpenCommand
-	
-	def initialize upload_command
-		@upload_command = upload_command
-	end
-
-	def execute_from_shell params
-		upload params[1]
-	end
-
-	def upload session_directory
-		@upload_command.upload session_directory, false
-	end
-	
-	def accepts_shell_command? command
-		command == 'upload-no-open'
-	end
-	
-	def continue_test_loop?
-		false
-	end
-	
-end

data/app/xhelp_command.rb

@@ -1,23 +0,0 @@
-class XHelpCommand
-
-	def initialize view
-		@view = view
-	end
-	
-	def execute_from_shell params
-		help params[1]
-	end
-	
-	def help command=nil
-		if command then
-			@view.show_detailed_help command.downcase
-		else
-			@view.show_extended_help
-		end
-	end
-	
-	def accepts_shell_command? command
-		command == 'xhelp'
-	end
-
-end