at_coder_friends 0.6.2 → 0.6.7

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

data/lib/at_coder_friends/test_runner/sample.rb

@@ -4,19 +4,17 @@ module AtCoderFriends
   module TestRunner
     # run test cases for the specified program with sample input/output.
     class Sample < Base
-      include PathUtil
-
       attr_reader :data_dir
 
       def initialize(ctx)
         super(ctx)
-        @data_dir = smp_dir(dir)
+        @data_dir = ctx.path_info.smp_dir
       end
 
       def test_all
         puts "***** test_all #{prg} (#{test_loc}) *****"
         results = Dir["#{data_dir}/#{q}_*.in"].sort.map do |infile|
-          id = File.basename(infile, '.in').sub(/[^_]+_/, '')
+          id = File.basename(infile, '.in').sub(/\A#{q}_/, '')
           test(id)
         end
         !results.empty? && results.all?

data/lib/at_coder_friends/verifier.rb

@@ -10,9 +10,8 @@ module AtCoderFriends
     attr_reader :path, :file, :vdir, :vpath
 
     def initialize(ctx)
-      @path = ctx.path
-      @file = File.basename(path)
-      @vdir = tmp_dir(path)
+      @path, _dir, @file = ctx.path_info.components
+      @vdir = ctx.path_info.tmp_dir
       @vpath = File.join(vdir, "#{file}.verified")
     end
 

data/lib/at_coder_friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtCoderFriends
-  VERSION = '0.6.2'
+  VERSION = '0.6.7'
 end

data/templates/{cxx_builtin_interactive.cxx → cxx_builtin.cxx.erb}

@@ -1,15 +1,20 @@
-// /*** URL ***/
+// <%= pbm.url %>
 
 #include <cstdio>
+<% if pbm.options.interactive -%>
 #include <vector>
 #include <string>
+<% end -%>
 
 using namespace std;
 
+<% if pbm.options.interactive -%>
 #define DEBUG
+<% end -%>
 #define REP(i,n)   for(int i=0; i<(int)(n); i++)
 #define FOR(i,b,e) for(int i=(b); i<=(int)(e); i++)
 
+<% if pbm.options.interactive -%>
 //------------------------------------------------------------------------------
 const int BUFSIZE = 1024;
 char req[BUFSIZE];
@@ -31,11 +36,17 @@ void query() {
 }
 
 //------------------------------------------------------------------------------
-/*** CONSTS ***/
+<% end -%>
+<% gen_consts.each do |line| -%>
+<%= line %>
+<% end -%>
 
-/*** DCLS ***/
+<% gen_decls.each do |line| -%>
+<%= line %>
+<% end -%>
 
 void solve() {
+<% if pbm.options.interactive -%>
   printf("! %s\n", ans);
   fflush(stdout);
 #ifdef DEBUG
@@ -45,13 +56,24 @@ void solve() {
     puts(responses[i].c_str());
   }
 #endif
+<% elsif (vs = pbm.options.binary_values) -%>
+  bool cond = false;
+  puts(cond ? "<%= vs[0] %>" : "<%= vs[1] %>");
+<% else -%>
+  int ans = 0;
+  printf("%d\n", ans);
+<% end -%>
 }
 
 void input() {
-  /*** INPUTS ***/
+<% gen_inputs.each do |line| -%>
+  <%= line %>
+<% end -%>
+<% if pbm.options.interactive -%>
 #ifdef DEBUG
   scanf("%s", source);
 #endif
+<% end -%>
 }
 
 int main() {

data/templates/{ruby_builtin_interactive.rb → ruby_builtin.rb.erb}

@@ -1,5 +1,6 @@
-# ### URL ###
+# <%= pbm.url %>
 
+<% if pbm.options.interactive -%>
 def query(*args)
   puts "? #{args.join(' ')}"
   STDOUT.flush
@@ -13,15 +14,23 @@ end
 
 $DEBUG = true
 
-### CONSTS ###
+<% end -%>
+<% gen_consts.each do |line| -%>
+<%= line %>
+<% end -%>
 
-### DCLS ###
+<% gen_decls.each do |line| -%>
+<%= line %>
+<% end -%>
+<% if pbm.options.interactive -%>
 
 if $DEBUG
   @responses = []
   @source = gets.chomp
 end
+<% end -%>
 
+<% if pbm.options.interactive -%>
 puts "! #{ans}"
 STDOUT.flush
 
@@ -32,3 +41,8 @@ if $DEBUG
   @responses.each { |res| puts res }
   puts "----------------------------------------"
 end
+<% elsif (vs = pbm.options.binary_values) -%>
+puts cond ? '<%= vs[0] %>' : '<%= vs[1] %>'
+<% else -%>
+puts ans
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: at_coder_friends
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.7
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -28,14 +28,14 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
@@ -159,12 +159,14 @@ files:
 - lib/at_coder_friends/context.rb
 - lib/at_coder_friends/emitter.rb
 - lib/at_coder_friends/errors.rb
+- lib/at_coder_friends/generator/base.rb
 - lib/at_coder_friends/generator/cxx_builtin.rb
 - lib/at_coder_friends/generator/main.rb
 - lib/at_coder_friends/generator/ruby_builtin.rb
 - lib/at_coder_friends/parser/binary.rb
 - lib/at_coder_friends/parser/constraints.rb
 - lib/at_coder_friends/parser/input_format.rb
+- lib/at_coder_friends/parser/input_type.rb
 - lib/at_coder_friends/parser/interactive.rb
 - lib/at_coder_friends/parser/introduction_wrapper.rb
 - lib/at_coder_friends/parser/main.rb
@@ -172,6 +174,7 @@ files:
 - lib/at_coder_friends/parser/sample_data.rb
 - lib/at_coder_friends/parser/section_wrapper.rb
 - lib/at_coder_friends/parser/sections.rb
+- lib/at_coder_friends/path_info.rb
 - lib/at_coder_friends/path_util.rb
 - lib/at_coder_friends/problem.rb
 - lib/at_coder_friends/scraping/agent.rb
@@ -185,17 +188,8 @@ files:
 - lib/at_coder_friends/test_runner/sample.rb
 - lib/at_coder_friends/verifier.rb
 - lib/at_coder_friends/version.rb
-- tasks/regression/check_const.rake
-- tasks/regression/check_diff.rake
-- tasks/regression/check_fmt.rake
-- tasks/regression/check_parse.rake
-- tasks/regression/regression.rb
-- tasks/regression/section_list.rake
-- tasks/regression/setup.rake
-- templates/cxx_builtin_default.cxx
-- templates/cxx_builtin_interactive.cxx
-- templates/ruby_builtin_default.rb
-- templates/ruby_builtin_interactive.rb
+- templates/cxx_builtin.cxx.erb
+- templates/ruby_builtin.rb.erb
 homepage: https://github.com/nejiko96/at_coder_friends
 licenses:
 - MIT
@@ -211,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -219,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: AtCoder support tool

data/tasks/regression/check_const.rake

@@ -1,136 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'regression'
-
-module AtCoderFriends
-  # tasks for regression
-  module Regression
-    module_function
-
-    CONST_PAT = {
-      mod: /
-        (.{,30}(?:
-          で割った|modulo|mod\b|divided\s+by|dividing\s+by
-        ).{,30})
-      /xmi,
-      max: /
-        (.{,30}(?:
-          ≦|≤|\\le|&leq?;
-          |＜|\\lt|<
-          |以上.{1,25}以下の整数
-        ).{,30})
-      /xmi
-    }.freeze
-
-    def collect(tgt)
-      File.open(const_log('collect', tgt), 'w') do |f|
-        local_pbm_list.each do |contest, q, url|
-          page = agent.get(url)
-          body = page.body.force_encoding('utf-8')
-          ms = body.scan(CONST_PAT[tgt.to_sym])
-          ms.each do |m|
-            s = m[0].delete("\r\n\t\"")
-            f.puts [contest, q, s].join("\t")
-          end
-        end
-      end
-    end
-
-    def check_mod
-      File.open(const_log('check', 'mod'), 'w') do |f|
-        local_pbm_list.each do |contest, q, url|
-          pbm = scraping_agent(nil, contest).fetch_problem(q, url)
-          Parser::Sections.process(pbm)
-          Parser::Modulo.process(pbm)
-          pbm.constants.each do |cnst|
-            f.puts [contest, q, cnst.value].join("\t")
-          end
-        end
-      end
-    end
-
-    def check_max
-      File.open(const_log('check', 'max'), 'w') do |f|
-        local_pbm_list.each do |contest, q, url|
-          pbm = scraping_agent(nil, contest).fetch_problem(q, url)
-          Parser::Sections.process(pbm)
-          Parser::Constraints.process(pbm)
-          pbm.constants.each do |cns|
-            f.puts [contest, q, "#{cns.name}:#{cns.value}"].join("\t")
-          end
-        end
-      end
-    end
-
-    def merge_list(tgt)
-      tbl = load_merge_list(tgt)
-      save_merge_list(tgt, tbl)
-    end
-
-    def load_merge_list(tgt)
-      tbl = {}
-      %w[collect check]
-        .map { |act| const_log(act, tgt) }
-        .each
-        .with_index(1) do |file, n|
-          list_from_file(file)
-            .group_by { |contest, q, _| "#{contest}\t#{q}" }
-            .map { |key, grp| [key, grp.map { |row| row[2] }.join("\n")] }
-            .each do |key, txt|
-              tbl[key] ||= { 'v1' => '', 'v2' => '' }
-              tbl[key]["v#{n}"] = '"' + txt + '"'
-            end
-        end
-      tbl
-    end
-
-    def save_merge_list(tgt, tbl)
-      File.open(const_log('merge', tgt), 'w') do |f|
-        tbl.sort.each do |k, h|
-          f.puts [k, h['v1'], h['v2']].join("\t")
-        end
-      end
-    end
-
-    def const_log(act, tgt)
-      log_path("#{act}_#{tgt}.txt")
-    end
-
-    def list_from_file(file)
-      Encoding.default_external = 'utf-8'
-      CSV.read(file, col_sep: "\t", headers: false)
-    end
-  end
-end
-
-namespace :regression do
-  desc 'list all mod values'
-  task :collect_mod do
-    AtCoderFriends::Regression.collect('mod')
-  end
-
-  desc 'check extracted mod values'
-  task :check_mod do
-    AtCoderFriends::Regression.check_mod
-  end
-
-  desc 'merge mod values list'
-  task :merge_mod do
-    AtCoderFriends::Regression.merge_list('mod')
-  end
-
-  desc 'list all max values'
-  task :collect_max do
-    AtCoderFriends::Regression.collect('max')
-  end
-
-  desc 'check extracted max values'
-  task :check_max do
-    AtCoderFriends::Regression.check_max
-  end
-
-  desc 'merge max values list'
-  task :merge_max do
-    AtCoderFriends::Regression.merge_list('max')
-  end
-end