at_coder_friends 0.6.3 → 0.6.8

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.3'
+  VERSION = '0.6.8'
 end

data/templates/cxx_builtin.cxx.erb

@@ -1,17 +1,20 @@
 // <%= pbm.url %>
 
-<%
-if pbm.options.interactive
-%>#include <cstdio>
+#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];
@@ -33,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
@@ -47,44 +56,26 @@ 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
-}<%
-else
-%>#include <cstdio>
-
-using namespace std;
-
-#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++)
-
-/*** CONSTS ***/
-
-/*** DCLS ***/
-
-void solve() {
-<%
-if (vs = pbm.options.binary_values)
-%>  bool cond = false;
-  puts(cond ? "<%= vs[0] %>" : "<%= vs[1] %>");<%
-else
-%>  int ans = 0;
-  printf("%d\n", ans);<%
-end
-%>
+<% end -%>
 }
 
-void input() {
-  /*** INPUTS ***/
-}<%
-end
-%>
-
 int main() {
   input();
   solve();

data/templates/ruby_builtin.rb.erb

@@ -1,8 +1,7 @@
 # <%= pbm.url %>
 
-<%
-if pbm.options.interactive
-%>def query(*args)
+<% if pbm.options.interactive -%>
+def query(*args)
   puts "? #{args.join(' ')}"
   STDOUT.flush
   if $DEBUG
@@ -15,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
 
@@ -33,17 +40,9 @@ if $DEBUG
   puts "query results:"
   @responses.each { |res| puts res }
   puts "----------------------------------------"
-end<%
-else
-%>### CONSTS ###
-
-### DCLS ###
-
-<%
-if (vs = pbm.options.binary_values)
-%>puts cond ? '<%= vs[0] %>' : '<%= vs[1] %>'<%
-else
-%>puts ans<%
-end
 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.3
+  version: 0.6.8
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2021-05-26 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
@@ -174,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
@@ -187,15 +188,6 @@ 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/list_handler.rb
-- tasks/regression/regression.rb
-- tasks/regression/report_handler.rb
-- tasks/regression/section_list.rake
-- tasks/regression/setup.rake
 - templates/cxx_builtin.cxx.erb
 - templates/ruby_builtin.rb.erb
 homepage: https://github.com/nejiko96/at_coder_friends
@@ -213,15 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.2.18
 signing_key: 
 specification_version: 4
 summary: AtCoder support tool

data/tasks/regression/check_const.rake

@@ -1,137 +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)
-      open_const_report('collect', tgt) 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")
-            f.puts [contest, q, tsv_escape(s)].join("\t")
-          end
-        end
-      end
-    end
-
-    def check_mod
-      open_const_report('check', 'mod') do |f|
-        local_pbm_list.each do |contest, q, url|
-          pbm = local_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
-      open_const_report('check', 'max') do |f|
-        local_pbm_list.each do |contest, q, url|
-          pbm = local_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| load_const_report(act, tgt) }
-        .each
-        .with_index(1) do |data, n|
-          data
-            .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)
-      open_const_report('merge', tgt) do |f|
-        tbl.sort.each do |k, h|
-          f.puts [k, h['v1'], h['v2']].join("\t")
-        end
-      end
-    end
-
-    def open_const_report(act, tgt)
-      open_report("#{act}_#{tgt}.txt") { |f| yield f }
-    end
-
-    def load_const_report(act, tgt)
-      file = report_path("#{act}_#{tgt}.txt")
-      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

data/tasks/regression/check_diff.rake

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'regression'
-
-module AtCoderFriends
-  # tasks for regression
-  module Regression
-    module_function
-
-    def check_diff
-      emit_dir = format(EMIT_DIR_FMT, now: Time.now.strftime('%Y%m%d%H%M%S'))
-      rmdir_force(emit_dir)
-
-      local_pbm_list.each do |contest, q, url|
-        pbm = local_scraping_agent(emit_dir, contest).fetch_problem(q, url)
-        pipeline(pbm)
-      end
-
-      diff_log = report_path('check_diff.txt')
-      system("diff -r --exclude=.git #{EMIT_ORG_DIR} #{emit_dir} > #{diff_log}")
-    end
-  end
-end
-
-namespace :regression do
-  desc 'run regression check'
-  task :check_diff do
-    AtCoderFriends::Regression.check_diff
-  end
-end