most 0.7.5 → 0.7.6

data/History.txt

@@ -1,3 +1,6 @@
+== 0.7.5 2009-27-12
+* Fixed dependencies problem on *nix
+
 == 0.7.4 2009-26-12
 * Now it is possible to load the Most library in order to get an ability to load serialized reports
     require 'most'

data/Manifest.txt

@@ -31,10 +31,13 @@ lib/most/structures/test_runner.rb
 lib/most/structures/types/options.rb
 lib/most/structures/types/path.rb
 lib/most/structures/types/report.rb
+lib/most/submissions/borland_delphi_sample.rb
+lib/most/submissions/brainf_sample.rb
 lib/most/submissions/cpp_memory_out_sample.rb
 lib/most/submissions/cpp_sample.rb
 lib/most/submissions/cpp_timeout_sample.rb
 lib/most/submissions/cs_sample.rb
+lib/most/submissions/custom_delphi_sample.rb
 lib/most/submissions/erlang_sample.rb
 lib/most/submissions/haskell_sample.rb
 lib/most/submissions/java_sample.rb
@@ -47,6 +50,8 @@ lib/most/submissions/php_sample.rb
 lib/most/submissions/python_sample.rb
 lib/most/submissions/ruby_sample.rb
 lib/most/submissions/vb_sample.rb
+lib/most/tasks/general/win/borland_delphi.rb
+lib/most/tasks/general/win/brainf.rb
 lib/most/tasks/general/win/cs.rb
 lib/most/tasks/general/win/erlang.rb
 lib/most/tasks/general/win/gcc.rb
@@ -60,13 +65,29 @@ lib/most/tasks/general/win/perl.rb
 lib/most/tasks/general/win/php.rb
 lib/most/tasks/general/win/python.rb
 lib/most/tasks/general/win/ruby.rb
+lib/most/tasks/general/win/run.rb
 lib/most/tasks/general/win/vb.rb
 lib/most/tasks/general/win/vc.rb
 lib/most/tasks/general/win/vs.rb
+samples/custom/ones/check.dpr
+samples/custom/ones/ones_is.dpr
+samples/custom/ones/ones_rs.dpr
+samples/custom/ones/problem.xml
+samples/custom/ones/tests/clean.bat
+samples/custom/ones/tests/make.bat
+samples/custom/ones/tests/make_answers.bat
+samples/custom/ones/tests/ones_rs.exe
+samples/custom/ones/tests/shuffle.dpr
+samples/custom/ones/tests/shuffle.exe
+samples/custom/ones/tests/tests.lst
+samples/problem/solutions/brainf/main.b
+samples/problem/solutions/brainf/tests.yml
 samples/problem/solutions/cpp/main.cpp
 samples/problem/solutions/cpp/tests.yml
 samples/problem/solutions/cs/main.cs
 samples/problem/solutions/cs/tests.yml
+samples/problem/solutions/delphi/main.dpr
+samples/problem/solutions/delphi/tests.yml
 samples/problem/solutions/erlang/main.erl
 samples/problem/solutions/erlang/tests.yml
 samples/problem/solutions/haskell/main.hs

data/Rakefile

@@ -35,9 +35,7 @@ $hoe = Hoe.spec Most::UNIX_NAME do
   self.post_install_message = File.read('PostInstall.txt')
   self.readme_file = 'README.txt'
 
-  self.extra_deps = [['sys-proctable', '>= 0.9.0'],
-                     ['open4', '>= 1.0.1'],
-                     ['win32-open3', '>= 0.3.1']]
+  self.extra_deps = [['sys-proctable', '>= 0.9.0']]
   
   self.extra_dev_deps = [['newgem', '>= 1.5.1']]
 end

data/lib/most/context.rb

@@ -102,6 +102,10 @@ module Most
       interface :show_message do |instance, text, is_log_data|
         instance.show_message(text, is_log_data)
       end
+
+      interface :state do |instance, text|
+        instance.state(text)
+      end
     end
 
     service :starter do

data/lib/most/environment.rb

@@ -58,10 +58,15 @@ module Most
       @logger.info(text)
     end
 
-    def show_message(message, is_log_data = false)
-      puts "#{message}"
+    def show_message(message, is_log_data = true)
+      puts message unless @modes[:quiet]
       log_message(message) if is_log_data
     end
+
+    def state(message)
+      puts message if @modes[:verbose]
+      log_message(message)
+    end
   end
 
 end

data/lib/most/executor.rb

@@ -63,16 +63,16 @@ module Most
     end
 
     def output_version()
-      @environment.show_message("#{FULL_NAME} version #{VERSION}")
-      @environment.show_message("#{COPYRIGHT}")
+      @environment.show_message("#{FULL_NAME} version #{VERSION}", false)
+      @environment.show_message("#{COPYRIGHT}", false)
     end
 
     def output_options()
-      @environment.show_message("Available options: \n\n")
-      @environment.show_message("Usage: #{UNIX_NAME} {[option] [parameter]}")
+      @environment.show_message("Available options: \n\n", false)
+      @environment.show_message("Usage: #{UNIX_NAME} {[option] [parameter]}", false)
 
       SERVICES[:starter].usage.each do |name, options|
-        @environment.show_message("\n\t#{options[2]}\n\t\t#{options[0]}, #{options[1]}")
+        @environment.show_message("\n\t#{options[2]}\n\t\t#{options[0]}, #{options[1]}", false)
       end
     end
   end

data/lib/most/helpers/numeric.rb

@@ -56,4 +56,9 @@ class Numeric
   def petabytes()
     self * 1099511627776
   end
+
+  def w()
+    result = ''; 1.upto(self) do result += ' ' end
+    result
+  end
 end

data/lib/most/structures/box.rb

@@ -18,7 +18,9 @@
 
 require 'time'
 require 'yaml'
+require "rexml/document"
 require 'timeout'
+require 'fileutils'
 
 require 'most/helpers/memory_out'
 
@@ -55,6 +57,7 @@ module Most
 
     include Timeout
     include MemoryOut
+    include FileUtils
 
     include BoxHelpers
 
@@ -74,7 +77,10 @@ module Most
     end
 
     def run(step)
-      result = Report.new("Box: #{@name}")
+      SERVICES[:environment].state("#{6.w}Executing a test box #{object_id}")
+      SERVICES[:environment].state("#{6.w}Step type: #{step.class}")
+
+      result = Report.new("Box: #{object_id}")
 
       if @options[:tests/:report/:specs]
         result.specs = {:options  => @options,
@@ -84,10 +90,41 @@ module Most
       end
 
       result << execute(step)
+      
+      SERVICES[:environment].state("#{6.w}|--> Finished.")
+
       result
     end
 
     private
+    def timeout_with_specs(sec, klass = nil, &block)
+      @result[:limits] ||= {}
+      @result[:limits][:time_limit] = sec
+
+      timeout(sec, klass, &block)
+    end
+
+    def memory_out_with_specs(bytes, pid = nil, precision = 0.1, klass = nil, &block)
+      @result[:limits] ||= {}
+      @result[:limits][:memory_limit] = bytes
+
+      memory_out(bytes, pid, precision, klass, &block)
+    end
+
+    def virtual_memory_out_with_specs(bytes, pid = nil, precision = 0.1, klass = nil, &block)
+      @result[:limits] ||= {}
+      @result[:limits][:virtual_memory_limit] = bytes
+
+      virtual_memory_out(bytes, pid, precision, klass, &block)
+    end
+
+    def total_memory_out_with_specs(bytes, pid = nil, precision = 0.1, klass = nil, &block)
+      @result[:limits] ||= {}
+      @result[:limits][:total_memory_limit] = bytes
+
+      total_memory_out(bytes, pid, precision, klass, &block)
+    end
+
     def execute(step)
       @result[:started] = Time.now
       @result[:success] = true

data/lib/most/structures/submission.rb

@@ -89,7 +89,9 @@ module Most
     end
 
     def run()
-      SERVICES[:environment].log_message("Working...")
+      SERVICES[:environment].show_message("Working...")
+      SERVICES[:environment].state("Processing submission #{@name}")
+      SERVICES[:environment].state("Number of test cases: #{@tests.size}")
 
       result = Report.new("Submission: #{@name}")
 
@@ -110,6 +112,8 @@ module Most
         end
       end
 
+      SERVICES[:environment].state("|--> Finished.")
+
       result.to_yaml()
     end
   end

data/lib/most/structures/test_case.rb

@@ -61,6 +61,8 @@ module Most
     end
 
     def run(options, entities)
+      SERVICES[:environment].state("#{2.w}Processing test case: #{@name}")
+
       result = Report.new("Test Case: #{@name}")
 
       if options[:tests/:report/:specs]
@@ -71,6 +73,12 @@ module Most
       end
 
       result << process(options, entities)
+
+      correct_status = result.last.last[:correct]; correct_status ||= false
+      message = "#{2.w}|--> Test case '#{@name}' correct?: #{correct_status}"
+
+      SERVICES[:environment].show_message(message)
+
       result
     end
 
@@ -78,6 +86,7 @@ module Most
     def process(options, entities)
       result = @runner.run(options, entities, @input)
 
+      result.last[:correct_output] = @output
       if result.last[:success]
         process_result!(result.last, options)
       end

data/lib/most/structures/test_runner.rb

@@ -46,6 +46,9 @@ module Most
     end
 
     def run(options, entities, input)
+      SERVICES[:environment].state("#{4.w}Processing test runner #{@name}")
+      SERVICES[:environment].state("#{4.w}Number of steps: #{@steps.size}")
+
       result = Report.new("Test Runner: #{@name}")
 
       if options[:tests/:report/:specs]
@@ -54,6 +57,9 @@ module Most
       end
 
       result << execute(options, entities, input)
+      
+      SERVICES[:environment].state("#{4.w}|--> Test run successful?: #{result.last[:success]}")
+
       result
     end
 
@@ -87,6 +93,13 @@ module Most
         result[:steps] << step_box
         result[:process_stdout] = step_result.last[:process_stdout]
 
+        limits = step_result.last[:limits]
+
+        unless limits.nil?
+          result[:limits] ||= []
+          result[:limits] << limits
+        end
+
         unless step_result.last[:success]
           if options[:tests/:steps/:break/:unsuccessful]
             result[:success] = false

data/lib/most/structures/types/report.rb

@@ -21,7 +21,7 @@ require 'yaml'
 module Most
 
   class Report
-    attr_accessor :name, :specs
+    attr_accessor :name, :specs, :units
     
     def initialize(name = 'Untitled Report', specs = {})
       @name  = name

data/lib/most/submissions/borland_delphi_sample.rb

@@ -0,0 +1,36 @@
+submission do
+  name 'Simple Borland Delphi Submission'
+
+  entities :source_file => path('main.dpr'), :executable => path('main.exe')
+
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
+                      :steps  => {:break => {:unsuccessful => true}}}
+
+  YAML.load_file('tests.yml').each_with_index do |specs, i|
+
+    add_test TestCase do
+      name "Test #{i + 1}"
+
+      input  specs[:input]
+      output specs[:output]
+
+      runner TestRunner do
+        name 'Borland Delphi Runner'
+
+        add_step Proc do
+          rake_clean 'win:borland_delphi:compile', entities[:source_file]
+        end
+
+        add_step Proc do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
+              rake_clean 'win:borland_delphi:run', entities[:executable], input
+            end
+          end
+        end
+
+      end
+    end
+
+  end
+end

data/lib/most/submissions/brainf_sample.rb

@@ -0,0 +1,32 @@
+submission do
+  name 'Simple Brainf Submission'
+
+  entities :executable  => path('main.b')
+
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
+                      :steps  => {:break => {:unsuccessful => true}}}
+
+  YAML.load_file('tests.yml').each_with_index do |specs, i|
+
+    add_test TestCase do
+      name "Test #{i + 1}"
+
+      input  specs[:input]
+      output specs[:output]
+
+      runner TestRunner do
+        name 'Brainf Runner'
+
+        add_step Proc do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
+              rake_clean 'win:brainf:run', entities[:executable], input
+            end
+          end
+        end
+
+      end
+    end
+
+  end
+end

data/lib/most/submissions/cpp_memory_out_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('main.cpp'), :executable  => path('main.exe')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,7 +22,7 @@ submission do
         end
 
         add_step Proc do
-          total_memory_out 10.megabytes do
+          total_memory_out_with_specs 10.megabytes do
             rake_clean 'win:vc:run', entities[:executable], input
           end
         end

data/lib/most/submissions/cpp_sample.rb

@@ -22,8 +22,8 @@ submission do
         end
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:vc:run', entities[:executable], input
             end
           end

data/lib/most/submissions/cpp_timeout_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('main.cpp'), :executable  => path('main.exe')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,7 +22,7 @@ submission do
         end
 
         add_step Proc do
-          timeout 5.seconds do
+          timeout_with_specs 5.seconds do
             rake_clean 'win:vc:run', entities[:executable], input
           end
         end

data/lib/most/submissions/cs_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('main.cs'), :executable => path('main.exe')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,8 +22,8 @@ submission do
         end
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:cs:run', entities[:executable], input
             end
           end

data/lib/most/submissions/custom_delphi_sample.rb

@@ -0,0 +1,119 @@
+submission do
+  specs = REXML::Document.new(File.new('problem.xml')).elements['problem/judging/script/testset']
+
+  problem_name = Dir.pwd().split(/[\\|\/]/).last()
+
+  number_of_tests = specs.attributes['test-count'].to_i()
+
+  input_files = Dir[specs.attributes['input-href'].gsub('#', '[0-9]').chomp('.')]
+  answer_files = Dir[specs.attributes['answer-href'].gsub('#', '[0-9]').chomp('.')]
+  
+  input_file = specs.attributes['input-name']
+  output_file = specs.attributes['output-name']
+
+  time_limit = specs.attributes['time-limit'].downcase
+  if time_limit['ms']
+    time_limit = time_limit.gsub('ms', '').to_i().milliseconds
+  elsif time_limit['s']
+    time_limit = time_limit.gsub('s', '').to_i()
+  elsif time_limit['m']
+    time_limit = time_limit.gsub('m', '').to_i().minutes
+  elsif time_limit['m']
+    time_limit = time_limit.gsub('h', '').to_i().hours
+  end
+
+  memory_limit = specs.attributes['memory-limit'].to_i()
+
+  name "Custom Borland Delphi Submission: #{problem_name}"
+  
+  entities :problem_name => problem_name,
+
+           :checker => path('check.dpr'), :checker_executable => path('check.exe'),
+           :source  => path("#{problem_name}_is.dpr"), :executable => path("#{problem_name}_is.exe"),
+
+           :input_file  => path(input_file),
+           :output_file => path(output_file),
+           :answer_file => path("#{problem_name}.a"),
+
+           :result_file => path('result.xml'),
+
+           :input_files  => input_files,
+           :answer_files => answer_files
+
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
+                      :steps  => {:break => {:unsuccessful => true}}}
+
+  entities = entities()
+
+  1.upto(number_of_tests) do |i|
+    
+    add_test TestCase do
+      name "Test #{i}"
+
+      input  path(entities[:input_file])
+      output 'testlib: accepted'
+
+      output_destination entities[:result_file]
+
+      output_preprocessor Proc do |text|
+        'testlib: ' + REXML::Document.new(text).elements['result'].
+                                                attributes['outcome'].
+                                                strip().
+                                                downcase() rescue text
+      end
+
+      runner TestRunner do
+        name 'Custom Borland Delphi Runner'
+
+        add_step Proc do
+          rake_clean 'win:borland_delphi:compile', entities[:checker]
+        end
+
+        add_step Proc do
+          rake_clean 'win:borland_delphi:compile', entities[:source]
+        end
+
+        add_step Proc do
+          rake_clean 'win:borland_delphi:compile', entities[:source]
+        end
+
+        add_step Proc do
+          if entities[:input_files].size  != number_of_tests or
+             entities[:answer_files].size != number_of_tests
+            STDOUT.puts 'buba'
+
+            rake 'win:run', 'cd tests && make'
+
+            entities[:input_files]  = Dir[specs.attributes['input-href'].gsub('#', '[0-9]').chomp('.')]
+            entities[:answer_files] = Dir[specs.attributes['answer-href'].gsub('#', '[0-9]').chomp('.')]
+          end
+        end
+
+        add_step Proc do
+          cp entities[:input_files][i - 1], File.join(Dir.pwd, entities[:input_file])
+          cp entities[:answer_files][i - 1], File.join(Dir.pwd, entities[:answer_file])
+        end
+
+        add_step Proc do
+          timeout_with_specs time_limit do
+            total_memory_out_with_specs memory_limit do
+              rake_clean 'win:borland_delphi:run', entities[:executable], input
+            end
+          end
+        end
+
+        add_step Proc do
+          rake 'win:run', entities[:checker_executable],
+               "#{entities[:input_file]} "  +
+               "#{entities[:output_file]} " +
+               "#{entities[:answer_file]} #{entities[:result_file]} -xml"
+
+          rm [entities[:input_file],
+              entities[:output_file],
+              entities[:answer_file]], :force => true
+        end
+      end
+    end
+
+  end
+end

data/lib/most/submissions/erlang_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('main.erl'), :entry_function => path('main')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,8 +22,8 @@ submission do
         end
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:erlang:run', entities[:entry_function], input
             end
           end

data/lib/most/submissions/haskell_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('main.hs'), :executable => path('main.exe')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,8 +22,8 @@ submission do
         end
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:haskell:run', entities[:executable], input
             end
           end

data/lib/most/submissions/java_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('Main.java'), :executable  => path('Main')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,8 +22,8 @@ submission do
         end
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:java:run', entities[:executable], input
             end
           end

data/lib/most/submissions/lisp_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :executable  => path('main.lisp')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -18,8 +18,8 @@ submission do
         name 'Lisp Runner'
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:lisp:run', entities[:executable], input
             end
           end

data/lib/most/submissions/lua_sample.rb

@@ -3,7 +3,7 @@ submission do
 
   entities :source_file => path('main.lua'), :executable => path('main.out')
 
-  options  :tests => {:report => {:differences => true, :time => true, :specs => true},
+  options  :tests => {:report => {:differences => true, :time => true, :specs => false},
                       :steps  => {:break => {:unsuccessful => true}}}
 
   YAML.load_file('tests.yml').each_with_index do |specs, i|
@@ -22,8 +22,8 @@ submission do
         end
 
         add_step Proc do
-          timeout specs[:time] do
-            total_memory_out specs[:memory] do
+          timeout_with_specs specs[:time] do
+            total_memory_out_with_specs specs[:memory] do
               rake_clean 'win:lua:run', entities[:executable], input
             end
           end