hw_checker 1.3.48 → 1.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTg3MzhlZDRmZTg3MWQ3ODVhNmI2YzAzMzg1MWZlMGYxZGRmYTY5Ng==
+    NzhkMzI5YTgzNjBhNDc1ZWRhMTljMjQ2NTJlMDRlMjUxZTI3NWY1ZA==
   data.tar.gz: !binary |-
-    N2RhYzFlMGNlNmQ5ZDYwOTZlOGYzNWM3N2RhYzc3OTQ4MWU0NTllNA==
+    YjdhOTc1MjE5ZjBiZjkzMTRkZTUzODA4MGQ2NjQzNDljYmFkY2E1Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzgxZWZhY2E4Mjk5ZTZhNDA3ZTM0ZGI5MzczNjAzZTgxOWYyYjk0NDRmZTIw
-    N2U5ZTdkM2Q2NzcwNjFkNzkyOWM5OGNjMzY0MGYzZmU0MzdiYjE0YmQ5OWIw
-    ZGI0YTRjMjNmZTE4OTg2Njg4NjNhMWZjODE2YjIwYjU5YzUyZjU=
+    OGIxODQ0OWE4YjYyM2IxYzU1MjIxNzE3MTViNTQ5NTllN2E4MTIyYTIzOTQ5
+    MjMxZmI0NTFlMDU0ZjdmNGFiOWFiNjQ5ZGE3MmMzNjAxOTJkZmU0NTM0N2My
+    MzA0MjZiOWQ2YjJhOWNmM2RkZDNlZjFhODExMTA0ZmZkOTZiYjM=
   data.tar.gz: !binary |-
-    ZGQ5OTA2YmExMDdlNDlkMGMxYmNiZWUxMWZiMDU0NGQ4MzI3Yjk2YjNiYTli
-    ZmIwZWM5YzdmZDcxMzI0ZmE3YmVkNGU1ZDkwZGI3OTc0OTgwMzI2YzFiMjE0
-    OTVlZWVmODIxN2I1MDk3YjYxM2FkYjIyMTU4MDFlMTNhNDI0NDY=
+    OWRlN2UwNmJjM2YxMmIxZjRkMmFhYjFjYjE3N2RlOWViYTc1MjY5Nzg3N2Q4
+    M2RhODFjOGFkYjJmMDEwZDNhYjc1OTgxM2EzYmMwMTVjMWY2OGJiOGIwNmJl
+    YTg2ZWNkMjE4ZTEyZGM2NmRjYjNmYjM0NGU1NmJmYzEyODAyOWE=

data/bin/hw_checker

@@ -3,9 +3,9 @@
 require 'hw_checker'
 
 begin
-  HomeWorkChecker::FileScan.new(ARGV[0], '/tmp').each do |name, type|
-    HomeWorkChecker::Base.start(ARGV[0], '/tmp', name, type)
+  HomeWorkChecker::FileScan.new(ARGV[0], ARGV[1]).each do |name, type|
+    HomeWorkChecker::Base.start(ARGV[0], ARGV[1], name, type)
   end
-rescue HomeWorkChecker::DirectoryExistError => error
+rescue HomeWorkChecker::DirectoryExistError, HomeWorkChecker::DirectoryFormatError => error
   puts error.message, error.backtrace
 end

data/config/config.yml

@@ -0,0 +1,12 @@
+#
+# List of used languages is defined here
+#
+languages:
+  rb: ruby
+  py: python
+
+modules:
+  ruby:   HomeWorkChecker::ArchiveResult::RubyTestRun HomeWorkChecker::ArchiveResult::RubyCodeQuality
+  python: HomeWorkChecker::ArchiveResult::PythonTestRun HomeWorkChecker::ArchiveResult::PythonCodeQuality
+
+archives: .zip .7z

data/lib/hw_checker/archive_result.rb

@@ -0,0 +1,12 @@
+module HomeWorkChecker
+  module ArchiveResult
+    def self.execute(tmp_path, name)
+      language_name = LANGUAGE_TYPES[name.split('_')[1] ]
+      raise DirectoryFormatError, "Directory '#{name}' does not match needed format" if language_name.nil? 
+       stats = MODULE_TYPES[language_name].split(' ').map do |class_name|
+        class_name.constatize.new(tmp_path, name).perform
+      end
+      [language_name, stats.first, stats.last ]
+    end
+  end
+end

data/lib/hw_checker/base.rb

@@ -1,14 +1,14 @@
 module HomeWorkChecker
   class Base
-    def self.start(work_path, tmp_path, name, type)
+    def self.start(archive_path, result_path, name, type, tmp_path = '/tmp')
       `rm -r #{tmp_path}/#{name}` if Dir.exist?("#{tmp_path}/#{name}")
       time_start, xml_content = Time.now, {} 
-      Unarchive::Zip.new("#{work_path}/#{name+type}", tmp_path)
-      stat = TestRunStat::execute(work_path, tmp_path, name)
-      stat << (Time.now - time_start).round(2)
+      Unarchive::Zip.new("#{archive_path}/#{name+type}", tmp_path)   
+      stats = ArchiveResult.execute(tmp_path, name)
+      stats << (Time.now - time_start).round(2)
 
-      File.open("#{work_path}/#{name}-result.xml", 'w') do |file| 
-        file.write(generate_xml_content(name, stat) )
+      File.open("#{result_path}/#{name}.xml", 'w') do |file| 
+        file.write(generate_xml_content(name, stats) )
       end
     end 
 
@@ -16,7 +16,7 @@ module HomeWorkChecker
     def self.generate_xml_content(identity, info)
       Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
         xml.root {
-          xml.student identity.split('_').first       # name
+          xml.student identity.split('_').first       # student name
           xml.homework identity.split('_').last       # homework
           xml.language info[0]                        # language
           xml.ratio info[1]                           # ratio of passed and failed tests

data/lib/hw_checker/directory_format_error.rb

@@ -0,0 +1,3 @@
+module HomeWorkChecker
+  class DirectoryFormatError < StandardError; end
+end

data/lib/hw_checker/file_scan.rb

@@ -1,11 +1,12 @@
 module HomeWorkChecker
   class FileScan
-    def initialize(work_path, tmp_path = '/tmp')
-      raise DirectoryExistError, "Directory #{work_path} does not exist" unless Dir::exist?(work_path)
-      raise DirectoryExistError, "Directory #{tmp_path} does not exist" unless Dir::exist?(tmp_path)
-      @work_path, @tmp_path, @files = work_path, tmp_path, []
-      Dir.foreach(@work_path) do |p|
-        if File.file?("#{@work_path}/#{p}") && FILE_TYPES.include?(File.extname p) && !exist_xml?(p)
+    def initialize(archive_path, result_path, tmp_path = '/tmp')
+      raise DirectoryExistError, "Directory '#{archive_path}' does not exist" unless Dir::exist?(archive_path)
+      raise DirectoryExistError, "Directory '#{result_path}' does not exist" unless Dir::exist?(result_path)
+      raise DirectoryExistError, "Directory '#{tmp_path}' does not exist" unless Dir::exist?(tmp_path)
+      @archive_path, @result_path, @tmp_path, @files = archive_path, result_path, tmp_path, []
+      Dir.foreach(@archive_path) do |p|
+        if File.file?("#{archive_path}/#{p}") && ARCHIVE_TYPES.include?(File.extname p) && !exist_xml?(p)
           @files << p
         end
       end
@@ -26,8 +27,8 @@ module HomeWorkChecker
 
     private
     def exist_xml?(archive_name)
-      temp = archive_name.chomp(File.extname archive_name)
-      File.exist? "#{@work_path}/#{temp}-result.xml"
+      name = archive_name.chomp(File.extname archive_name)
+      File.exist? "#{@result_path}/#{name}.xml"
     end 
   end
 end

data/lib/hw_checker/{python_stat.rb → python_code_quality.rb}

@@ -1,6 +1,6 @@
 module HomeWorkChecker
-  module TestRunStat
-    class PythonStat
+  module ArchiveResult
+    class PythonCodeQuality
       def initialize(tmp_path, dirname)
         @work_path = "#{tmp_path}/#{dirname}/tests/statistic"
         raise DirectoryExistError, "Archive '#{dirname}' is invalid" unless Dir::exist?(@work_path)
@@ -18,7 +18,18 @@ module HomeWorkChecker
       end
 
       def calc_percent_quality(filename)
-        ( (`tail -n 2 #{filename}`).scan(/\d{1,2}/).shift.to_f / 10 * 100).round(2)
+=begin
+        rake = ((`tail -n 75 #{filename}`).scan(/\d{1,2}\.\d{1,2}\\/).shift.to_f)
+        if rake > 10
+          (rake / 10).round(2)
+        else 
+          (rake * 10).round(2)
+        end
+=end
+        File.open(filename).each_line do |line|
+          next unless line.match(/^Your\scode\shas\sbeen\srated\sat/)
+          return ( line.scan(/[\d\.]+/).shift.to_f * 10 )
+        end
       end
     end
   end

data/lib/hw_checker/python_test_run.rb

@@ -1,5 +1,5 @@
 module HomeWorkChecker
-  module TestRunStat
+  module ArchiveResult
     class PythonTestRun
       def initialize(tmp_path, dirname)
         @work_path = "#{tmp_path}/#{dirname}/tests/application"

data/lib/hw_checker/{ruby_stat.rb → ruby_code_quality.rb}

@@ -1,6 +1,6 @@
 module HomeWorkChecker
-  module TestRunStat
-    class RubyStat
+  module ArchiveResult
+    class RubyCodeQuality
       def initialize(tmp_path, dirname)
         @work_path = "#{tmp_path}/#{dirname}" 
         raise DirectoryExistError, "Archive '#{dirname}' is invalid" unless Dir::exist?(@work_path)
@@ -17,6 +17,7 @@ module HomeWorkChecker
         calc_percent_quality
       end
 
+      private
       def count_lines_failed(filename)
         temp = []
         File.open(filename).each_line do |line|

data/lib/hw_checker/ruby_test_run.rb

@@ -1,5 +1,5 @@
 module HomeWorkChecker
-  module TestRunStat
+  module ArchiveResult
     class RubyTestRun
       def initialize(tmp_path, dirname)
         @work_path = "#{tmp_path}/#{dirname}/test"

data/lib/hw_checker/string.rb

@@ -0,0 +1,7 @@
+class String
+  def constatize
+    str_class, const_class = self.split('::'), Object
+    str_class.each { |value| const_class = const_class.const_get(value) }
+    const_class
+  end
+end

data/lib/hw_checker/zip.rb

@@ -7,4 +7,4 @@ module HomeWorkChecker
       end
     end
   end
-end
+end

data/lib/hw_checker.rb

@@ -1,20 +1,30 @@
 require 'nokogiri'
+require 'yaml'
 require 'hw_checker/directory_exist_error'
+require 'hw_checker/directory_format_error'
+require 'hw_checker/string'
 require 'hw_checker/base'
 require 'hw_checker/file_scan'
 require 'hw_checker/unarchive'
 require 'hw_checker/zip'
-require 'hw_checker/test_run_stat'
-require 'hw_checker/python_stat'
+require 'hw_checker/archive_result'
+require 'hw_checker/python_code_quality'
 require 'hw_checker/python_test_run'
-require 'hw_checker/ruby_stat'
+require 'hw_checker/ruby_code_quality'
 require 'hw_checker/ruby_test_run'
 
 
 module HomeWorkChecker
-  FILE_TYPES = ['.7z', '.zip'] 
-  LANGUAGE_TYPES = {
-    '.rb' => [TestRunStat::RubyTestRun, TestRunStat::RubyStat],
-    '.py' => [TestRunStat::PythonTestRun, TestRunStat::PythonStat]
-  }
+  def self.configurate
+    fname = File.expand_path('./config/config.yml')
+    hash_conf = YAML.load_file fname
+    archive_types, language_types, module_types = hash_conf['archives'].split(' '), {}, {}
+    hash_conf['languages'].each do |key, value|
+      language_types[key] = value
+      module_types[value] = hash_conf['modules'][value]
+    end
+    [archive_types, language_types, module_types]
+  end
+
+  ARCHIVE_TYPES, LANGUAGE_TYPES, MODULE_TYPES = self.configurate
 end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'simplecov'
+SimpleCov.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hw_checker
 version: !ruby/object:Gem::Version
-  version: 1.3.48
+  version: 1.4.4
 platform: ruby
 authors:
 - Lv-LAMP-085
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,22 +60,20 @@ extra_rdoc_files: []
 files:
 - lib/hw_checker/python_test_run.rb
 - lib/hw_checker/ruby_test_run.rb
+- lib/hw_checker/string.rb
+- lib/hw_checker/directory_format_error.rb
+- lib/hw_checker/python_code_quality.rb
 - lib/hw_checker/base.rb
 - lib/hw_checker/file_scan.rb
 - lib/hw_checker/unarchive.rb
-- lib/hw_checker/python_stat.rb
+- lib/hw_checker/ruby_code_quality.rb
+- lib/hw_checker/archive_result.rb
 - lib/hw_checker/directory_exist_error.rb
-- lib/hw_checker/test_run_stat.rb
 - lib/hw_checker/zip.rb
-- lib/hw_checker/ruby_stat.rb
 - lib/hw_checker.rb
 - bin/hw_checker
-- spec/ruby_stat_spec.rb
-- spec/test_run_stat_spec.rb
-- spec/zip_spec.rb
-- spec/base_spec.rb
-- spec/ruby_test_run_spec.rb
-- spec/file_scan_spec.rb
+- spec/spec_helper.rb
+- config/config.yml
 homepage: 
 licenses: []
 metadata: {}

data/lib/hw_checker/test_run_stat.rb

@@ -1,25 +0,0 @@
-module HomeWorkChecker
-  module TestRunStat
-    def self.detect_language(path)
-      return '.py' unless Dir.exist?("#{path}/test")
-      Dir.foreach("#{path}/test") do |p|
-        if File.file?("#{path}/test/#{p}") && LANGUAGE_TYPES.include?(File.extname p)
-          return File.extname p
-        end
-      end
-      raise "Any .rb/.py file doesn't exist"
-    end
-
-    def self.execute(work_path, tmp_path, dirname)
-      lang_needed = TestRunStat::detect_language("#{tmp_path}/#{dirname}")
-      class_names = LANGUAGE_TYPES[lang_needed]
-      test_passed = class_names.first.new(tmp_path, dirname).perform
-      code_quality = class_names.last.new(tmp_path, dirname).perform      
-      [name_language(lang_needed), test_passed, code_quality]
-    end
-
-    def self.name_language(extname)
-      extname == '.rb' ? 'ruby' : 'python' 
-    end
-  end
-end

data/spec/base_spec.rb

@@ -1,32 +0,0 @@
-require 'hw_checker'
-
-module HomeWorkChecker
-  describe Base do
-    before(:each) do
-      @archives = ['aaa.zip', 'bbb.7z']
-      @work_path = './support/'
-      @tmp_path = './support/tmp'
-      #@baza = HomeWorkChecker::Base.new(@work_path)
-    end
-    context '#start' do
-      it 'extracting should execute 5 times' do
-        files_to = double("FileScan", :work_path => @work_path) 
-        files_to.stub(:files).and_return(@archives)
-
-        szip_files = stub("HomeWorkChecker::Unarchive::Zip")
-        szip_files.should_receive(:new).with("aaa.zip", @tmp_path).once
-        szip_files.should_receive(:new).with("bbb.7z", @tmp_path).once
-
-        run_files = double("HomeWorkChecker::TestRunStat")
-        run_files.stub(:detect_language).with("#{@tmp_path}/task1").and_return(".rb")
-        rtr = stub(LANGUAGE_TYPES[run_files.detect_language "#{@tmp_path}/task1"])
-        rtr.should_receive(:new).with("#{@tmp_path}/task1").once
-      
-        files_to.stub(:each).
-          and_yield(stub(szip_files.new(files_to.files[0], @tmp_path)),
-                    stub(rtr.new("#{@tmp_path}/task1"))).
-            and_yield(stub(szip_files.new(files_to.files[1], @tmp_path)))
-      end
-    end
-  end
-end

data/spec/file_scan_spec.rb

@@ -1,48 +0,0 @@
-require 'hw_checker'
-
-module HomeWorkChecker
-  describe FileScan do
-    before(:each) do
-      @file_scan = FileScan.new('./support')
-    end
-
-    context '.new' do
-      def is_all_archives?
-        @file_scan.instance_variable_get(:@files).each do |item; ext_name|
-          ext_name = File::extname(item)
-          return false unless FILE_TYPES.include?(ext_name)
-        end
-        true
-      end
-      it 'should have exactly 6 items' do
-        @file_scan.instance_variable_get(:@files).should have(7).items 
-      end
-      it 'should contain .zip/7z files only' do
-        is_all_archives?.should_not be_false
-      end
-    end
-
-    context '#each' do
-      before(:each) do
-        @file_scan.instance_variable_get(:@files).sort!
-      end
-      it 'should yield correct data' do
-        expect { |b| @file_scan.each(&b) }.to yield_successive_args(
-          ["julia.tymo_creational.patterns", ".7z"],
-          ["julia.tymo_iterators.in.ruby", ".zip"],
-          ["pavlo.petryk_creational.patterns", ".zip"],
-          ["pavlo.petryk_final.tasks", ".7z"],
-          ["roman.horobets_creational.patterns", ".7z"],
-          ["roman.horobets_final.tasks", ".zip"],
-          ["roman.horobets_iterators.in.ruby", ".zip"]
-        )
-      end
-    end
-
-    context '#exist_xml?' do
-      it 'xml-file should exist' do
-        @file_scan.should_not be_exist_xml('test.xml')
-      end
-    end  
-  end
-end

data/spec/ruby_stat_spec.rb

@@ -1,30 +0,0 @@
-require 'hw_checker'
-
-module HomeWorkChecker
-  module TestRunStat
-    describe RubyStat do
-      before(:all) do
-        @ruby_stat = RubyStat.new('./support', 'julia.tymo_creational.patterns')
-        @ruby_stat.perform
-      end
-
-      context '#count_lines_failed' do
-        it 'should calculate failed lines correctly' do
-          @ruby_stat.instance_variable_get(:@lines_failed).should == 5
-        end
-      end
-
-      context '#count_lines_all' do
-        it 'should calculate failed lines count correctly' do
-          @ruby_stat.instance_variable_get(:@lines_all).should == 7
-        end
-      end
-
-      context '#calc_percent_quality' do
-        it 'should calculate percent correctly' do
-          @ruby_stat.send(:calc_percent_quality).should == 28.57
-        end
-      end
-    end
-  end
-end

data/spec/ruby_test_run_spec.rb

@@ -1,27 +0,0 @@
-require 'hw_checker'
-
-module HomeWorkChecker
-  module TestRunStat
-    describe RubyTestRun do
-      before(:all) do
-        @ruby_test_run = RubyTestRun.new('./support', 'julia.tymo_creational.patterns')
-        @ruby_test_run.perform
-      end
-
-      context '#count_passed_failed' do
-        it 'should calculate passed tests correctly' do
-          @ruby_test_run.instance_variable_get(:@passed).should == 0
-        end
-        it 'should calculate failed tests correctly' do
-          @ruby_test_run.instance_variable_get(:@failed).should == 1
-        end
-      end
-
-      context '#calc_percent_passed' do
-        it 'should calculate percent passed tests correctly' do
-          @ruby_test_run.send(:calc_percent_passed).should ==  0.00
-        end
-      end
-    end
-  end
-end

data/spec/test_run_stat_spec.rb

@@ -1,14 +0,0 @@
-require 'hw_checker'
-
-module HomeWorkChecker
-  describe HomeWorkChecker::TestRunStat do
-    context '.detect_language' do
-      before(:each) do
-        @detect_test = TestRunStat.detect_language('./support/julia.tymo_creational.patterns')
-      end
-      it 'should contain .rb/.py tests' do
-        @detect_test.should == '.rb'
-      end
-    end
-  end
-end

data/spec/zip_spec.rb

@@ -1,29 +0,0 @@
-require 'hw_checker'
-
-describe HomeWorkChecker::Unarchive::Zip do
-  before(:each) do
-    @path_filename = './support/julia.tymo_creational.patterns.7z'
-    @filename = 'julia.tymo_creational.patterns.7z'
-    @tmp_path = '/tmp/support/'
-  end
-
-  after(:each) do
-    `rm -rf #{@tmp_path}/#{@filename.chomp(".7z") || filename.chomp(".zip")}`
-  end
-
-  it 'should exist in temp' do
-    @unarchive1 = HomeWorkChecker::Unarchive::Zip.new(@path_filename, @tmp_path)
-    Dir.exist?("#{@tmp_path}/#{@filename.chomp(".7z") || filename.chomp(".zip")}").should be_true
-  end
-
-  it 'authenticity archive' do
-    @authenticity = `7za t #{@path_filename}`
-    @authenticity = @authenticity.include? "Everything is Ok"
-    @authenticity.should be_true
-  end
-
-  it 'exit code' do
-    @unarchive1 = HomeWorkChecker::Unarchive::Zip.new(@path_filename, @tmp_path)
-    $?.to_s[-1].to_i.should equal(0)    
-  end
-end