at_coder_friends 0.6.3 → 0.6.8

data/lib/at_coder_friends/context.rb

@@ -7,11 +7,15 @@ module AtCoderFriends
   # - configuration
   # - application modules
   class Context
-    attr_reader :options, :path
+    attr_reader :options, :path_info
 
     def initialize(options, path)
       @options = options
-      @path = File.expand_path(path)
+      @path_info = PathInfo.new(File.expand_path(path))
+    end
+
+    def path
+      path_info.path
     end
 
     def config
@@ -26,6 +30,10 @@ module AtCoderFriends
       @generator ||= Generator::Main.new(self)
     end
 
+    def emitter
+      @emitter ||= Emitter.new(self)
+    end
+
     def sample_test_runner
       @sample_test_runner ||= TestRunner::Sample.new(self)
     end
@@ -38,10 +46,6 @@ module AtCoderFriends
       @verifier ||= Verifier.new(self)
     end
 
-    def emitter
-      @emitter ||= Emitter.new(self)
-    end
-
     def post_process
       @scraping_agent&.save_session
     end

data/lib/at_coder_friends/emitter.rb

@@ -9,8 +9,8 @@ module AtCoderFriends
     include PathUtil
 
     def initialize(ctx)
-      @src_dir = ctx.path
-      @smp_dir = smp_dir(@src_dir)
+      @src_dir = ctx.path_info.src_dir
+      @smp_dir = ctx.path_info.smp_dir
     end
 
     def emit(pbm)

data/lib/at_coder_friends/generator/base.rb

@@ -21,8 +21,9 @@ module AtCoderFriends
       def generate(pbm)
         @pbm = pbm
         src = File.read(select_template)
-        src = ERB.new(src).result(binding)
-        render(src)
+        src = ERB.new(src, safe_level = nil, trim_mode = '-').result(binding)
+        src = render(src) if respond_to?(:render)
+        src
       end
 
       def select_template

data/lib/at_coder_friends/generator/main.rb

@@ -19,7 +19,8 @@ module AtCoderFriends
             gen_obj.process(pbm)
           rescue StandardError => e
             puts "an error occurred in generator:#{gen_name}."
-            p e
+            puts e.to_s
+            puts e.backtrace
           end
         end
       end

data/lib/at_coder_friends/parser/constraints.rb

@@ -64,6 +64,7 @@ module AtCoderFriends
           .gsub('\\lvert', '|')
           .gsub('\\rvert', '|')
           .gsub('\\mathit', '')
+          .gsub('\\mathrm', '')
           .gsub('\\times', '*')
           .gsub(/\\begin(\{[^{}]*\})*/, '')
           .gsub(/\\end(\{[^{}]*\})*/, '')

data/lib/at_coder_friends/parser/input_format.rb

@@ -56,11 +56,13 @@ module AtCoderFriends
           .gsub('>', '>')
           .gsub('&lt;', '<')
           .gsub('\\ ', ' ')
+          .gsub(/\\hspace\{\d+pt\}/, ' ')
           .gsub('\\(', '')
           .gsub('\\)', '')
           .gsub('\\lvert', '|')
           .gsub('\\rvert', '|')
           .gsub('\\mathit', '')
+          .gsub('\\mathrm', '')
           .gsub('\\times', '*')
           .gsub(/\\begin(\{[^{}]*\})*/, '')
           .gsub(/\\end(\{[^{}]*\})*/, '')

data/lib/at_coder_friends/parser/input_type.rb

@@ -6,10 +6,11 @@ module AtCoderFriends
     module InputType
       module_function
 
-      NUMBER_PAT = /\A[+-]?[0-9]+\z/.freeze
+      NUMBER_PAT = /\A[+-]?[0-9]{1,19}\z/.freeze
+      DECIMAL_PAT = /\A[+-]?[0-9]{1,19}(\.[0-9]+)?\z/.freeze
       TYPE_TBL = [
         [:number, NUMBER_PAT],
-        [:decimal, /\A[+-]?[0-9]+(\.[0-9]+)?\z/]
+        [:decimal, DECIMAL_PAT]
       ].freeze
 
       def process(pbm)

data/lib/at_coder_friends/parser/modulo.rb

@@ -21,7 +21,7 @@ module AtCoderFriends
           |\\\(([^()]+)\\\)
           |\$([^$]+)\$
           |\{([^{}]+)\}
-          |([\d,]+)
+          |([\d,^+]+)
           |([一二三四五六七八九十百千万億]+)
         )
       }x.freeze

data/lib/at_coder_friends/parser/sections.rb

@@ -63,7 +63,7 @@ module AtCoderFriends
         {
           key: Problem::SECTION_IN_SMP,
           pattern: /
-            \A(
+            \A(?:
               入力例\s*(?<no>\d+)?
               |入力\s*(?<no>\d+)
               |Sample\s*Input\s*(?<no>\d+)?
@@ -75,14 +75,14 @@ module AtCoderFriends
         {
           key: Problem::SECTION_OUT_SMP,
           pattern: /
-            \A(
+            \A(?:
               出力例\s*(?<no>\d+)?
               |出力\s*(?<no>\d+)
               |入力例\s*(?<no>\d+)?\s*に対する出力例
               |Sample\s*Output\s*(?<no>\d+)?
               |Output\s*Example\s*(?<no>\d+)?
               |Output\s*(?<no>\d+)
-              |Output\s*for\s*(the)?\s*Sample\s*Input\s*(?<no>\d+)?
+              |Output\s*for\s*(?:the)?\s*Sample\s*Input\s*(?<no>\d+)?
             )\z
           /xi
         },

data/lib/at_coder_friends/path_info.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module AtCoderFriends
+  # holds target path information
+  class PathInfo
+    SMP_DIR = 'data'
+    CASES_DIR = 'cases'
+    TMP_DIR = '.tmp'
+
+    attr_reader :path, :dir
+
+    def initialize(path)
+      @path = path
+      # in setup command, path is directory name (existent/non-existent)
+      # in other commands(test, submit, verify), path is existent file name
+      @dir = File.file?(path) ? File.dirname(path) : path
+    end
+
+    def contest_name
+      File.basename(dir).delete('#').downcase
+    end
+
+    def components
+      # overwrites @dir here for non-existent files (test purpose)
+      @dir, prg = File.split(path)
+      base, ext = prg.split('.')
+      q = base.gsub(/_[^#_]+\z/, '')
+      [path, dir, prg, base, ext, q]
+    end
+
+    def src_dir
+      dir
+    end
+
+    def smp_dir
+      File.join(dir, SMP_DIR)
+    end
+
+    def cases_dir
+      File.join(dir, CASES_DIR)
+    end
+
+    def cases_out_dir
+      File.join(dir, TMP_DIR, CASES_DIR)
+    end
+
+    def tmp_dir
+      File.join(dir, TMP_DIR)
+    end
+  end
+end

data/lib/at_coder_friends/path_util.rb

@@ -3,37 +3,6 @@
 module AtCoderFriends
   # Common methods and behaviors for dealing with paths.
   module PathUtil
-    module_function
-
-    SMP_DIR = 'data'
-    CASES_DIR = 'cases'
-    TMP_DIR = '.tmp'
-
-    def contest_name(path)
-      dir = File.file?(path) ? File.dirname(path) : path
-      File.basename(dir).delete('#').downcase
-    end
-
-    def split_prg_path(path)
-      dir, prg = File.split(path)
-      base, ext = prg.split('.')
-      q = base.split('_')[0]
-      [path, dir, prg, base, ext, q]
-    end
-
-    def smp_dir(dir)
-      File.join(dir, SMP_DIR)
-    end
-
-    def cases_dir(dir)
-      File.join(dir, CASES_DIR)
-    end
-
-    def tmp_dir(path)
-      dir = File.dirname(path)
-      File.join(dir, '.tmp')
-    end
-
     def makedirs_unless(dir)
       FileUtils.makedirs(dir) unless Dir.exist?(dir)
     end

data/lib/at_coder_friends/scraping/agent.rb

@@ -7,7 +7,6 @@ module AtCoderFriends
   module Scraping
     # common functions for scraping
     class Agent
-      include AtCoderFriends::PathUtil
       include Session
       include Authentication
       include Tasks
@@ -29,7 +28,7 @@ module AtCoderFriends
       end
 
       def contest
-        @contest ||= contest_name(ctx.path)
+        @contest ||= ctx.path_info.contest_name
       end
 
       def common_url(path)
@@ -41,6 +40,10 @@ module AtCoderFriends
       end
 
       def lang_id(ext)
+        [lang_id_conf(ext)].flatten
+      end
+
+      def lang_id_conf(ext)
         ctx.config.dig('ext_settings', ext, 'submit_lang') || (
           msg = <<~MSG
             submit_lang for .#{ext} is not specified.
@@ -51,6 +54,12 @@ module AtCoderFriends
         )
       end
 
+      def find_lang(page, langs)
+        langs.find do |lng|
+          page.search("div#select-lang select option[value=#{lng}]")[0]
+        end || langs[0]
+      end
+
       def lang_list_txt
         lang_list
           &.map { |opt| "#{opt[:v]} - #{opt[:t]}" }

data/lib/at_coder_friends/scraping/custom_test.rb

@@ -6,20 +6,19 @@ module AtCoderFriends
   module Scraping
     # run tests on custom_test page
     module CustomTest
-      include AtCoderFriends::PathUtil
-
       def code_test(infile)
-        path, _dir, _prg, _base, ext, _q = split_prg_path(ctx.path)
-        lang = lang_id(ext)
+        path, _dir, _prg, _base, ext, _q = ctx.path_info.components
+        langs = lang_id(ext)
         src = File.read(path, encoding: Encoding::UTF_8)
         data = File.read(infile)
 
-        post_custom_test(lang, src, data)
+        post_custom_test(langs, src, data)
         check_custom_test
       end
 
-      def post_custom_test(lang, src, data)
+      def post_custom_test(langs, src, data)
         page = fetch_with_auth(contest_url('custom_test'))
+        lang = find_lang(page, langs)
         script = page.search('script').text
         csrf_token = script.scan(/var csrfToken = "(.*)"/)[0][0]
 

data/lib/at_coder_friends/scraping/submission.rb

@@ -4,22 +4,21 @@ module AtCoderFriends
   module Scraping
     # submit sources on submit page
     module Submission
-      include AtCoderFriends::PathUtil
-
       def submit
-        path, _dir, prg, _base, ext, q = split_prg_path(ctx.path)
+        path, _dir, prg, _base, ext, q = ctx.path_info.components
         puts "***** submit #{prg} *****"
-        lang = lang_id(ext)
+        langs = lang_id(ext)
         src = File.read(path, encoding: Encoding::UTF_8)
 
-        post_submit(q, lang, src)
+        post_submit(q, langs, src)
       end
 
-      def post_submit(q, lang, src)
+      def post_submit(q, langs, src)
         page = fetch_with_auth(contest_url('submit'))
+        lang = find_lang(page, langs)
         form = page.forms[1]
         form.field_with(name: 'data.TaskScreenName') do |sel|
-          option = sel.options.find { |op| op.text.start_with?(q) }
+          option = sel.options.find { |op| op.text =~ /\A#{q}\W/ }
           option&.select || (raise AppError, "unknown problem:#{q}.")
         end
         form.add_field!('data.LanguageId', lang)

data/lib/at_coder_friends/scraping/tasks.rb

@@ -7,9 +7,14 @@ module AtCoderFriends
       def fetch_all
         puts "***** fetch_all #{contest} *****"
         fetch_assignments.map do |q, url|
-          pbm = fetch_problem(q, url)
-          yield pbm if block_given?
-          pbm
+          begin
+            pbm = fetch_problem(q, url)
+            yield pbm if block_given?
+            pbm
+          rescue StandardError => e
+            puts e.to_s
+            puts e.backtrace
+          end
         end
       end
 

data/lib/at_coder_friends/test_runner/base.rb

@@ -8,6 +8,7 @@ module AtCoderFriends
     # run tests for the specified program.
     class Base
       include PathUtil
+
       STATUS_STR = {
         OK: '<< OK >>'.green,
         WA: '!!!!! WA !!!!!'.red,
@@ -19,7 +20,7 @@ module AtCoderFriends
 
       def initialize(ctx)
         @ctx = ctx
-        @path, @dir, @prg, @base, @ext, @q = split_prg_path(ctx.path)
+        @path, @dir, @prg, @base, @ext, @q = ctx.path_info.components
         @detail = true
       end
 
@@ -32,11 +33,23 @@ module AtCoderFriends
       end
 
       def test_loc
-        test_cmd ? 'local' : 'remote'
+        if test_cmd
+          'local'
+        elsif ctx.scraping_agent.respond_to?(:code_test)
+          'remote'
+        else
+          raise AppError, "test_cmd for .#{ext} is not specified."
+        end
       end
 
       def test_mtd
-        test_cmd ? :local_test : :remote_test
+        if test_cmd
+          :local_test
+        elsif ctx.scraping_agent.respond_to?(:code_test)
+          :remote_test
+        else
+          raise AppError, "test_cmd for .#{ext} is not specified."
+        end
       end
 
       def run_test(id, infile, outfile, expfile)
@@ -63,7 +76,7 @@ module AtCoderFriends
       end
 
       def local_test(infile, outfile)
-        system("#{test_cmd} < #{infile} > #{outfile}")
+        system("#{test_cmd} < \"#{infile}\" > \"#{outfile}\"")
       end
 
       def remote_test(infile, outfile)

data/lib/at_coder_friends/test_runner/judge.rb

@@ -4,20 +4,18 @@ module AtCoderFriends
   module TestRunner
     # run test cases for the specified program with judge input/output.
     class Judge < Base
-      include PathUtil
-
       attr_reader :data_dir, :result_dir
 
       def initialize(ctx)
         super(ctx)
-        @data_dir = cases_dir(dir)
-        @result_dir = cases_dir(tmp_dir(path))
+        @data_dir = ctx.path_info.cases_dir
+        @result_dir = ctx.path_info.cases_out_dir
       end
 
       def judge_all
         puts "***** judge_all #{prg} (#{test_loc}) *****"
-        results = Dir["#{data_dir}/#{q}/in/*.txt"].sort.map do |infile|
-          id = File.basename(infile, '.txt')
+        results = Dir["#{data_dir}/#{q}/in/*"].sort.map do |infile|
+          id = File.basename(infile)
           judge(id, false)
         end
         !results.empty? && results.all?
@@ -30,9 +28,9 @@ module AtCoderFriends
 
       def judge(id, detail = true)
         @detail = detail
-        infile = "#{data_dir}/#{q}/in/#{id}.txt"
-        outfile = "#{result_dir}/#{q}/result/#{id}.txt"
-        expfile = "#{data_dir}/#{q}/out/#{id}.txt"
+        infile = "#{data_dir}/#{q}/in/#{id}"
+        outfile = "#{result_dir}/#{q}/result/#{id}"
+        expfile = "#{data_dir}/#{q}/out/#{id}"
         run_test(id, infile, outfile, expfile)
       end
     end