at_coder_friends 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f97a6bf516dc7443c791b4e2ace991b34eaa47d5
-  data.tar.gz: d48834719bdceceb66cd4f1476c54e7b1c5602af
+  metadata.gz: 7ea93eb5e8bef9fd743ff3f5767cc906264b878b
+  data.tar.gz: 6b41067f5105e20859e2a5e5c0d120ef52e29b9a
 SHA512:
-  metadata.gz: b4ef816ece17840560b7b9bd39ac4ef56ae346fd859a3b1d737dd9a759faecf77a80244fdd56c97a7aa4542f3bdb65e4346f10239c1cd63e7163038cebc95271
-  data.tar.gz: 044e53c76ac9789c2a049a3476141e0d81d103b0d66599bb18e13c0c0b66ec64c65b7fb6062e7ec761d6ba0c536f00d234aa060514eb833e69fc6b922692401e
+  metadata.gz: 963c99df359372cbc89cbe6efb4ccf8c3ffccfc50e68364dc62e7314574a1ad30cfa6e12086cb994a844f5ce71d93a1eb543fe76c50a8cf361b4f18cf7387669
+  data.tar.gz: 81468b9c45065d8c8de6ef3c6355e400ce56d784c0743ad2d44e50784c5ebc3529ab3d5f4808561feea5ec388d53697a5b5d34030360b85f8cd676627c4a7a3b

data/.gitignore

@@ -7,7 +7,12 @@
 /spec/reports/
 /tmp/
 /vendor/
-/.at_coder_friends.yml
 
 # rspec failure tracking
 .rspec_status
+
+# at_coder_friends
+.at_coder_friends.yml
+
+# rvm
+.ruby-version

data/.rubocop.yml

@@ -5,9 +5,6 @@ AllCops:
     - 'spec/fixtures/**/*'
   TargetRubyVersion: 2.3
 
-Layout/EndOfLine:
-  EnforcedStyle: lf
-
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    at_coder_friends (0.4.0)
+    at_coder_friends (0.5.0)
       launchy (~> 2.4.3)
       mechanize (~> 2.0)
 
@@ -43,7 +43,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     public_suffix (4.0.1)
-    rake (12.3.3)
+    rake (13.0.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -58,7 +58,7 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     safe_yaml (1.0.5)
-    simplecov (0.17.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -66,7 +66,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    webmock (3.7.3)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -79,7 +79,7 @@ PLATFORMS
 DEPENDENCIES
   at_coder_friends!
   bundler (~> 2.0)
-  rake (~> 12.3)
+  rake (~> 13.0)
   rspec (~> 3.0)
   simplecov (~> 0.10)
   webmock (~> 3.0)

data/README.md

@@ -35,17 +35,6 @@ Or install it yourself as:
 
     $ gem install at_coder_friends
 
-## Configuration
-
-Create ```.at_coder_friends.yml``` and place it in the working directory (or parent of working directory).
-
-```yaml
-user: <user>
-password: <password>
-```
-
-See [CONFIGURATION.md](docs/CONFIGURATION.md) for details.
-
 ## Usage
 
 ### Setup
@@ -91,7 +80,11 @@ at_coder_friends submit    /path/to/contest/source_file
 - Suffixes (start with underscore) may be added to the file name (e.g. ```A_v2.rb```),
   so that you can try multiple codes for one problem.
 
-### Notes
+## Configuration
+
+See [CONFIGURATION.md](docs/CONFIGURATION.md) for details.
+
+## Notes
 
 - Compilation is not supported.
 - Source generator supports only ruby and C++.
@@ -107,41 +100,64 @@ It is convenient to use AtCoderFriends from Sublime Text plugin.
 - Run **Configure Tasks** from the global Terminal menu.
 - Select the **Create tasks.json file from template** entry.
 - Select **Others** from the list.
-- Add following tasks to ```tasks.json```.
+- Add following settings to ```tasks.json```.
 
 ```JSON
 {
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "af test-one",
+      "label": "AtCoderFriends:New Contest",
+      "type": "shell",
+      "command": "at_coder_friends",
+      "args": [
+        "setup",
+        "${input:contestName}"
+      ],
+      "problemMatcher": [],
+      "group": "none"
+    },
+    {
+      "label": "AtCoderFriends:Test One",
       "type": "shell",
       "command": "at_coder_friends",
       "args": [
         "test-one",
         "${file}"
       ],
-      "group": "none",
+      "problemMatcher": [],
+      "group": "none"
     },
     {
-      "label": "af test-all",
+      "label": "AtCoderFriends:Test All",
       "type": "shell",
       "command": "at_coder_friends",
       "args": [
         "test-all",
         "${file}"
       ],
+      "problemMatcher": [],
       "group": "none"
     },
     {
-      "label": "af submit",
+      "label": "AtCoderFriends:Submit",
       "type": "shell",
       "command": "at_coder_friends",
       "args": [
         "submit",
         "${file}"
       ],
+      "problemMatcher": [],
       "group": "none",
+    },
+    ...
+  ],
+  "inputs": [
+    {
+      "id": "contestName",
+      "type": "promptString",
+      "default": "",
+      "description": "Contest Name"
     }
   ]
 }

data/at_coder_friends.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mechanize', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.10'
   spec.add_development_dependency 'webmock', '~> 3.0'

data/docs/CONFIGURATION.md

@@ -2,15 +2,23 @@
 
 ## Configuration file
 
+You can specify AtCoderFriends settings  
+in the configuration file ```.at_coder_friends.yml```.  
+Place it in your working directory (or higher).
+
 AtCoderFriends の動作に関する設定は  
-設定ファイル 「.at_coder_friends.yml」 に記述します。  
+設定ファイル ```.at_coder_friends.yml``` に記述します。  
 このファイルは作業ディレクトリ（またはその上位ディレクトリ）に配置します。
 
 ## Default settings
 
-デフォルトは以下のような設定になっています。  
-「.at_coder_friends.yml」が見つかると、その内容がデフォルト設定にマージされるので、  
-新しい設定項目の追加や、既存の設定項目の上書きが可能です。  
+The default settings are as follows.  
+If you add new settings or change existing settings in ```.at_coder_friends.yml```,  
+Its contents are merged with the default settings.
+
+デフォルトの設定は以下のようになっています。  
+```.at_coder_friends.yml```で新しい設定項目の追加や、既存の設定項目の変更をすると、  
+その内容がデフォルト設定にマージされます。
 
 ```YAML
 user: ~
@@ -106,34 +114,49 @@ ext_settings:
 ## Configuration options
 
 - user  
-  AtCoderのログインユーザーID
+  AtCoder username  
+  If omitted, you are prompted to enter it on the first run.  
+  AtCoderのユーザ名  
+  省略した場合、初回の実行時に入力を求められます
 
 - password  
-  AtCoderのログインパスワード
+  AtCoder password  
+  If omitted, you are prompted to enter it on the first run.  
+  AtCoderのパスワード  
+  省略した場合、初回の実行時に入力を求められます
 
 - ext_settings  
+  Extension specific settings  
   拡張子ごとの設定
 
   - _'ext'_  
+    Target extension name  
     対象となる拡張子
 
     - submit_lang  
+      Language ID of submission language  
       提出言語の言語ID
 
     - test_cmd  
+      Execution command for test  
+      If not set, the test will run using AtCoder "Custom Test" page.  
       テストで使用する実行コマンドの設定  
-      未設定の場合はAtCoderの「コードテスト」ページでテストをします
+      未設定の場合、テストはAtCoderの「コードテスト」ページを使用して行われます
 
       - default  
+        Default execution command  
         デフォルトの実行コマンド
 
       - wndows  
+        Execution command for Windows(optional)  
         Windows専用実行コマンド(あれば設定)
 
       - macosx  
+        Execution command for MacOS(optional)  
         MacOS専用実行コマンド(あれば設定)
 
       - linux  
+        Execution command for Linux(optional)  
         Linux専用実行コマンド(あれば設定)
 
 ### Language ID list (2019/09/16)
@@ -197,19 +220,24 @@ ext_settings:
 |3525|COBOL - Fixed (OpenCOBOL 1.1.0)|
 |3526|COBOL - Free (OpenCOBOL 1.1.0)|
 
-### Variables available in test_cmd
+### Variables in test_cmd string
+
+The following variables in test_cmd string  
+is substituted with the path information of the target file  
+during execution.
 
-test_cmd の文字列中の以下のパターンは、  
-テスト対象のソースファイルの情報に置換された後、実行されます。
+test_cmd 文字列中の以下の変数には、  
+実行時に対象ファイルのパス情報が展開されます。
 
-|パターン|設定値|
+| Variable | Descripton |
 |---|---|
-|{dir}|ソースファイルの置かれているディレクトリ|
-|{base}|ソースファイルの拡張子を除いたファイル名|
+|{dir}|the directory name of the file<br>ファイルの置かれているディレクトリ名|
+|{base}|the file name excluding the extension<br>拡張子を除いたファイル名|
 
 ## Examples of overwriting settings
 
-- .pyをローカル環境のPythonでテスト
+- Test .py with local Python  
+  .pyをローカル環境のPythonでテスト
   ```YAML
   ext_settings:
     'py':
@@ -217,21 +245,24 @@ test_cmd の文字列中の以下のパターンは、
         default: 'python "{dir}/{base}.py"'
   ```
 
-- .rb を「コードテスト」ページでテスト
+- Test .rb with "Custom Test" page  
+  .rb を「コードテスト」ページでテスト
   ```YAML
   ext_settings:
     'rb':
       test_cmd: ~
   ```
 
-- .pl6(Perl6)の設定を追加
+- Add .pl6(Perl6) settings  
+  .pl6(Perl6)の設定を追加
   ```YAML
   ext_settings:
     'pl6':
       submit_lang: '3522' # Perl6
   ```
 
-- .cxxの提出言語をC++14(Clang)に変更
+- Change submission language of .cxx to C++14(Clang)  
+  .cxxの提出言語をC++14(Clang)に変更
   ```YAML
   ext_settings:
     'cxx':

data/lib/at_coder_friends.rb

@@ -14,4 +14,5 @@ require 'at_coder_friends/format_parser'
 require 'at_coder_friends/ruby_generator'
 require 'at_coder_friends/cxx_generator'
 require 'at_coder_friends/emitter'
+require 'at_coder_friends/context'
 require 'at_coder_friends/cli'

data/lib/at_coder_friends/cli.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'launchy'
 
 module AtCoderFriends
   # command line interface
   class CLI
-    include PathUtil
-
     EXITING_OPTIONS = %i[version].freeze
-    OPTION_BANNER =
+    OPTION_BANNER   =
       <<~TEXT
         Usage:
           at_coder_friends setup        path/contest       # setup contest folder
@@ -21,12 +20,13 @@ module AtCoderFriends
     STATUS_SUCCESS  = 0
     STATUS_ERROR    = 1
 
+    attr_reader :ctx
+
     def run(args = ARGV)
       parse_options!(args)
       handle_exiting_option
       raise ParamError, 'command or path is not specified.' if args.size < 2
 
-      @config = ConfigLoader.load_config(args[1])
       exec_command(*args)
       STATUS_SUCCESS
     rescue AtCoderFriends::ParamError => e
@@ -46,6 +46,9 @@ module AtCoderFriends
         opts.on('-v', '--version', 'Display version.') do
           @options[:version] = true
         end
+        opts.on('-d', '--debug', 'Display debug info.') do
+          @options[:debug] = true
+        end
       end
       @usage = op.to_s
       @options = {}
@@ -61,73 +64,72 @@ module AtCoderFriends
       exit STATUS_SUCCESS
     end
 
-    def exec_command(command, path, id = nil)
+    def exec_command(command, path, *args)
+      @ctx = Context.new(@options, path)
       case command
       when 'setup'
-        setup(path)
+        setup
       when 'test-one'
-        test_one(path, id)
+        test_one(*args)
       when 'test-all'
-        test_all(path)
+        test_all
       when 'submit'
-        submit(path)
+        submit
       when 'judge-one'
-        judge_one(path, id)
+        judge_one(*args)
       when 'judge-all'
-        judge_all(path)
+        judge_all
       when 'open-contest'
-        open_contest(path)
+        open_contest
       else
         raise ParamError, "unknown command: #{command}"
       end
+      ctx.post_process
     end
 
-    def setup(path)
+    def setup
+      path = ctx.path
       raise AppError, "#{path} is not empty." \
         if Dir.exist?(path) && !Dir["#{path}/*"].empty?
 
-      agent = ScrapingAgent.new(contest_name(path), @config)
       parser = FormatParser.new
       rb_gen = RubyGenerator.new
       cxx_gen = CxxGenerator.new
-      emitter = Emitter.new(path)
-      agent.fetch_all do |pbm|
+      ctx.scraping_agent.fetch_all do |pbm|
         parser.process(pbm)
         rb_gen.process(pbm)
         cxx_gen.process(pbm)
-        emitter.emit(pbm)
+        ctx.emitter.emit(pbm)
       end
     end
 
-    def test_one(path, id)
-      id ||= 1
-      SampleTestRunner.new(path, @config).test_one(id)
+    def test_one(id = 1)
+      ctx.sample_test_runner.test_one(id)
     end
 
-    def test_all(path)
-      SampleTestRunner.new(path, @config).test_all
-      Verifier.new(path).verify
+    def test_all
+      ctx.sample_test_runner.test_all
+      ctx.verifier.verify
     end
 
-    def submit(path)
-      vf = Verifier.new(path)
+    def submit
+      vf = ctx.verifier
       raise AppError, "#{vf.file} has not been tested." unless vf.verified?
 
-      ScrapingAgent.new(contest_name(path), @config).submit(path)
+      ctx.scraping_agent.submit
       vf.unverify
     end
 
-    def judge_one(path, id)
-      id ||= ''
-      JudgeTestRunner.new(path, @config).judge_one(id)
+    def judge_one(id = '')
+      ctx.judge_test_runner.judge_one(id)
     end
 
-    def judge_all(path)
-      JudgeTestRunner.new(path, @config).judge_all
+    def judge_all
+      ctx.judge_test_runner.judge_all
     end
 
-    def open_contest(path)
-      ScrapingAgent.new(contest_name(path), @config).open_contest
+    def open_contest
+      Launchy.open(ctx.scraping_agent.contest_url)
     end
   end
 end

data/lib/at_coder_friends/config_loader.rb

@@ -7,12 +7,12 @@ module AtCoderFriends
   # loads configuration file from the specified directory.
   class ConfigLoader
     DOTFILE = '.at_coder_friends.yml'
-    ACF_HOME = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
+    ACF_HOME = File.realpath(File.join(__dir__, '..', '..'))
     DEFAULT_FILE = File.join(ACF_HOME, 'config', 'default.yml')
 
     class << self
-      def load_config(target_dir)
-        path = config_file_for(target_dir)
+      def load_config(ctx)
+        path = config_file_for(ctx.path)
         config = load_yaml(path)
         return config if path == DEFAULT_FILE
 
@@ -43,7 +43,7 @@ module AtCoderFriends
       end
 
       def merge(base_hash, derived_hash)
-        res = base_hash.merge(derived_hash) do |_, base_val, derived_val|
+        res = base_hash.merge(derived_hash || {}) do |_, base_val, derived_val|
           if base_val.is_a?(Hash) && derived_val.is_a?(Hash)
             merge(base_val, derived_val)
           else

data/lib/at_coder_friends/context.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module AtCoderFriends
+  # Holds applicaion global information
+  # - command line options
+  # - target path
+  # - configuration
+  # - application modules
+  class Context
+    attr_reader :options, :path
+
+    def initialize(options, path)
+      @options = options
+      @path = File.expand_path(path)
+    end
+
+    def config
+      @config ||= ConfigLoader.load_config(self)
+    end
+
+    def scraping_agent
+      @scraping_agent ||= ScrapingAgent.new(self)
+    end
+
+    def sample_test_runner
+      @sample_test_runner ||= SampleTestRunner.new(self)
+    end
+
+    def judge_test_runner
+      @judge_test_runner ||= JudgeTestRunner.new(self)
+    end
+
+    def verifier
+      @verifier ||= Verifier.new(self)
+    end
+
+    def emitter
+      @emitter ||= Emitter.new(self)
+    end
+
+    def post_process
+      @scraping_agent&.save_session
+    end
+  end
+end

data/lib/at_coder_friends/emitter.rb

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

data/lib/at_coder_friends/judge_test_runner.rb

@@ -5,8 +5,8 @@ module AtCoderFriends
   class JudgeTestRunner < TestRunner
     include PathUtil
 
-    def initialize(path, config)
-      super(path, config)
+    def initialize(ctx)
+      super(ctx)
       @cases_dir = cases_dir(@dir)
       @smp_dir = smp_dir(@dir)
     end

data/lib/at_coder_friends/path_util.rb

@@ -9,13 +9,11 @@ module AtCoderFriends
     CASES_DIR = 'cases'
 
     def contest_name(path)
-      path = File.expand_path(path)
       dir = File.file?(path) ? File.dirname(path) : path
       File.basename(dir).delete('#').downcase
     end
 
     def split_prg_path(path)
-      path = File.expand_path(path)
       dir, prg = File.split(path)
       base, ext = prg.split('.')
       q = base.split('_')[0]

data/lib/at_coder_friends/sample_test_runner.rb

@@ -5,8 +5,8 @@ module AtCoderFriends
   class SampleTestRunner < TestRunner
     include PathUtil
 
-    def initialize(path, config)
-      super(path, config)
+    def initialize(ctx)
+      super(ctx)
       @smp_dir = smp_dir(@dir)
     end
 

data/lib/at_coder_friends/scraping_agent.rb

@@ -1,39 +1,62 @@
 # frozen_string_literal: true
 
 require 'uri'
+require 'cgi'
+require 'json'
 require 'mechanize'
 require 'logger'
 require 'English'
-require 'launchy'
-require 'json'
+require 'io/console'
 
 module AtCoderFriends
   # scrapes AtCoder contest site and
   # - fetches problems
   # - submits sources
+  # - runs tests on custom_test page
   class ScrapingAgent
     include PathUtil
-    BASE_URL = 'https://atcoder.jp/'
+    BASE_URL      = 'https://atcoder.jp/'
     XPATH_SECTION = '//h3[.="%<title>s"]/following-sibling::section'
+    XPATH_USERNAME = '//*[@id="navbar-collapse"]/ul[2]/li[2]/a'
+    SESSION_STORE =
+      File.join(Dir.home, '.at_coder_friends', '%<user>s_session.yml')
 
-    attr_reader :contest, :config, :agent
+    attr_reader :ctx, :agent
 
-    def initialize(contest, config)
-      @contest = contest
-      @config = config
+    def initialize(ctx)
+      @ctx = ctx
       @agent = Mechanize.new
-      @agent.pre_connect_hooks << proc { sleep 0.1 }
-      # @agent.log = Logger.new(STDERR)
+      agent.pre_connect_hooks << proc { sleep 0.1 }
+      agent.log = Logger.new(STDERR) if ctx.options[:debug]
+      agent.cookie_jar.load(session_store) if File.exist?(session_store)
+    end
+
+    def save_session
+      dir = File.dirname(session_store)
+      Dir.mkdir(dir) unless Dir.exist?(dir)
+      agent.cookie_jar.save_as(session_store)
+    end
+
+    def contest
+      @contest ||= contest_name(ctx.path)
+    end
+
+    def config
+      ctx.config
     end
 
     def common_url(path)
       File.join(BASE_URL, path)
     end
 
-    def contest_url(path)
+    def contest_url(path = '')
       File.join(BASE_URL, 'contests', contest, path)
     end
 
+    def session_store
+      @session_store ||= format(SESSION_STORE, user: config['user'])
+    end
+
     def constraints_pat
       config['constraints_pat'] || '^制約$'
     end
@@ -50,47 +73,71 @@ module AtCoderFriends
       config['output_smp_pat'] || '^出力例\s*(?<no>[\d０-９]+)$'
     end
 
-    def fetch_all
-      puts "***** fetch_all #{@contest} *****"
-      login
-      fetch_assignments.map do |q, url|
-        pbm = fetch_problem(q, url)
-        yield pbm if block_given?
-        pbm
+    def fetch_with_auth(url)
+      begin
+        page = agent.get(url)
+      rescue Mechanize::ResponseCodeError => e
+        raise e unless e.response_code == '404'
+        raise e if username_link(e.page)
+
+        page = agent.get(common_url('login') + '?continue=' + CGI.escape(url))
+      end
+
+      if page.uri.path == '/login'
+        user, pass = read_auth
+        form = page.forms[1]
+        form.field_with(name: 'username').value = user
+        form.field_with(name: 'password').value = pass
+        page = form.submit
       end
+
+      page.uri.path == '/login' && (raise AppError, 'Authentication failed.')
+      show_username(page)
+      page
     end
 
-    def submit(path)
-      path, _dir, prg, _base, ext, q = split_prg_path(path)
-      puts "***** submit #{prg} *****"
-      src = File.read(path, encoding: Encoding::UTF_8)
-      login
-      post_src(q, ext, src)
+    def read_auth
+      user = config['user'].to_s
+      if user.empty?
+        print('Enter username:')
+        user = STDIN.gets.chomp
+      end
+      pass = config['password'].to_s
+      if pass.empty?
+        print("Enter password for #{user}:")
+        pass = STDIN.noecho(&:gets).chomp
+        puts
+      end
+      [user, pass]
     end
 
-    def code_test(path, infile)
-      path, _dir, _prg, _base, ext, _q = split_prg_path(path)
-      src = File.read(path, encoding: Encoding::UTF_8)
-      data = File.read(infile)
-      login
-      code_test_loop(ext, src, data)
+    def show_username(page)
+      username_old = @username
+      link = username_link(page)
+      @username = (link ? link.text.strip : '-')
+      return if @username == username_old || @username == '-'
+
+      puts "Logged in as #{@username}"
     end
 
-    def login
-      return unless config['user'] && !config['user'].empty?
-      return unless config['password'] && !config['password'].empty?
+    def username_link(page)
+      link = page.search(XPATH_USERNAME)[0]
+      link && link[:href] == '#' && link
+    end
 
-      page = agent.get(common_url('login'))
-      form = page.forms[1]
-      form.field_with(name: 'username').value = config['user']
-      form.field_with(name: 'password').value = config['password']
-      form.submit
+    def fetch_all
+      puts "***** fetch_all #{contest} *****"
+      fetch_assignments.map do |q, url|
+        pbm = fetch_problem(q, url)
+        yield pbm if block_given?
+        pbm
+      end
     end
 
     def fetch_assignments
       url = contest_url('tasks')
       puts "fetch list from #{url} ..."
-      page = agent.get(url)
+      page = fetch_with_auth(url)
       page
         .search('//table[1]//td[1]//a')
         .each_with_object({}) do |a, h|
@@ -100,7 +147,7 @@ module AtCoderFriends
 
     def fetch_problem(q, url)
       puts "fetch problem from #{url} ..."
-      page = agent.get(url)
+      page = fetch_with_auth(url)
       Problem.new(q) do |pbm|
         pbm.html = page.body
         if contest == 'arc001'
@@ -136,8 +183,12 @@ module AtCoderFriends
       end
     end
 
-    def post_src(q, ext, src)
-      page = agent.get(contest_url('submit'))
+    def submit
+      path, _dir, prg, _base, ext, q = split_prg_path(ctx.path)
+      puts "***** submit #{prg} *****"
+      src = File.read(path, encoding: Encoding::UTF_8)
+
+      page = fetch_with_auth(contest_url('submit'))
       form = page.forms[1]
       form.field_with(name: 'data.TaskScreenName') do |sel|
         option = sel.options.find { |op| op.text.start_with?(q) }
@@ -148,18 +199,22 @@ module AtCoderFriends
       form.submit
     end
 
-    def code_test_loop(ext, src, data)
-      page = agent.get(contest_url('custom_test'))
+    def code_test(infile)
+      path, _dir, _prg, _base, ext, _q = split_prg_path(ctx.path)
+      src = File.read(path, encoding: Encoding::UTF_8)
+      data = File.read(infile)
+
+      page = fetch_with_auth(contest_url('custom_test'))
       script = page.search('script').text
       csrf_token = script.scan(/var csrfToken = "(.*)"/)[0][0]
-      payload = {
+
+      page = agent.post(
+        contest_url('custom_test/submit/json'),
         'data.LanguageId' => lang_id(ext),
         'sourceCode' => src,
         'input' => data,
         'csrf_token' => csrf_token
-      }
-
-      page = agent.post(contest_url('custom_test/submit/json'), payload)
+      )
       msg = page.body
       raise AppError, msg unless msg.empty?
 
@@ -178,7 +233,7 @@ module AtCoderFriends
 
     def lang_list
       @lang_list ||= begin
-        page = agent.get(contest_url('custom_test'))
+        page = fetch_with_auth(contest_url('custom_test'))
         form = page.forms[1]
         sel = form.field_with(name: 'data.LanguageId')
         sel && sel
@@ -206,9 +261,5 @@ module AtCoderFriends
         raise AppError, msg
       )
     end
-
-    def open_contest
-      Launchy.open(contest_url(''))
-    end
   end
 end

data/lib/at_coder_friends/test_runner.rb

@@ -7,10 +7,15 @@ module AtCoderFriends
   class TestRunner
     include PathUtil
 
-    def initialize(path, config)
-      @contest = contest_name(path)
-      @path, @dir, @prg, @base, @ext, @q = split_prg_path(path)
-      @config = config
+    attr_reader :ctx
+
+    def initialize(ctx)
+      @ctx = ctx
+      @path, @dir, @prg, @base, @ext, @q = split_prg_path(ctx.path)
+    end
+
+    def config
+      ctx.config
     end
 
     # rubocop:disable Metrics/MethodLength
@@ -53,8 +58,7 @@ module AtCoderFriends
     end
 
     def remote_test(infile, outfile)
-      agent = ScrapingAgent.new(@contest, @config)
-      res = agent.code_test(@path, infile)
+      res = ctx.scraping_agent.code_test(infile)
       unless res && res['Result']
         File.write(outfile, 'Remote test failed.')
         return false
@@ -72,7 +76,7 @@ module AtCoderFriends
 
     def test_cmd
       @test_cmd ||= begin
-        cmds = @config.dig('ext_settings', @ext, 'test_cmd')
+        cmds = config.dig('ext_settings', @ext, 'test_cmd')
         cmd = cmds && (cmds[which_os.to_s] || cmds['default'])
         return nil unless cmd
 

data/lib/at_coder_friends/verifier.rb

@@ -6,11 +6,12 @@ module AtCoderFriends
   # marks and checks if the source has been verified.
   class Verifier
     attr_reader :path, :file, :vdir, :vpath
-    def initialize(path)
-      @path = File.expand_path(path)
-      @file = File.basename(@path)
-      @vdir = File.join(File.dirname(@path), '.tmp')
-      @vpath = File.join(@vdir, "#{@file}.verified")
+
+    def initialize(ctx)
+      @path = ctx.path
+      @file = File.basename(path)
+      @vdir = File.join(File.dirname(path), '.tmp')
+      @vpath = File.join(vdir, "#{file}.verified")
     end
 
     def verify

data/lib/at_coder_friends/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: at_coder_friends
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - lib/at_coder_friends.rb
 - lib/at_coder_friends/cli.rb
 - lib/at_coder_friends/config_loader.rb
+- lib/at_coder_friends/context.rb
 - lib/at_coder_friends/cxx_generator.rb
 - lib/at_coder_friends/emitter.rb
 - lib/at_coder_friends/errors.rb