at_coder_friends 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf2c089d89bcf9e3a8acf248715fdcaf59cb24f
-  data.tar.gz: baa90cc2da792563e25da6f7f33e55d479e3c58e
+  metadata.gz: 529abf515e1ac88d91324d75878b5230a06f0950
+  data.tar.gz: e8cac75318fac06d78e33a2541250fc2f3d511d9
 SHA512:
-  metadata.gz: 0dc062e9b96728474290d66d65b1434abb4dda89c83004e30dcab3e59045427d260e779ba6117460c0357b13aa002a179c0175d6083e6d77308d2e0f19830624
-  data.tar.gz: 7115e84fda7ec09bb036ad13912c871780149ec91e5ccabfb30be2326e9781006270805767aa55e700d632e9766c00b884a7d5b9f13e9e88287dc9df59cc7453
+  metadata.gz: 0c0c9ccf130759df1c6fb7eca64abf5dcfd0a404bbbda4d4b307d95a9e00a5c6695b048f87fb3b08f9d347be404ae058927c81ed56440961cabeb988216cf9e1
+  data.tar.gz: a2804299f1870c9a5a4e7975bec387cc0c52cba798b6fffb546162f47aaf996adb866c71dd6aee146276ec59b15815a2e6eae652600206073f24d5abcefc82f4

data/.rubocop.yml

@@ -1,11 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.3
   Exclude:
     - 'templates/**/*'
     - 'spec/fixtures/**/*'
     - 'regression/**/*'
-  TargetRubyVersion: 2.3
 
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -26,5 +26,5 @@ Metrics/ModuleLength:
   Exclude:
     - 'spec/**/*.rb'
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   MinNameLength: 1

data/.rubocop_todo.yml

@@ -6,3 +6,19 @@ Metrics/ClassLength:
 
 Metrics/MethodLength:
   Max: 15
+
+# enable new cops to avoid warnings
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## master (unreleased)
 
+## 0.6.6 (2020-05-29)
+### Added
+- open submission list after submit.
+- enable -%> in ERBs.
+- error handling in fetch_problem.
+- remove \mathrm{...} from expressions.
+
+### Changed
+- change task id match pattern on submission.
+- treat input more than 19 digits as string.
+
 ## 0.6.5 (2020-04-15)
 ### Added
 - multiple language version support.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    at_coder_friends (0.6.5)
+    at_coder_friends (0.6.6)
       colorize (~> 0.8.1)
-      launchy (~> 2.4.3)
+      launchy (>= 2.4.3, < 2.6.0)
       mechanize (~> 2.0)
 
 GEM
@@ -36,29 +36,29 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (3.1.0)
+    net-http-persistent (4.0.0)
       connection_pool (~> 2.2)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     safe_yaml (1.0.5)
     simplecov (0.17.1)
       docile (~> 1.1)
@@ -67,7 +67,7 @@ GEM
     simplecov-html (0.10.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

data/at_coder_friends.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'at_coder_friends/version'
+require_relative 'lib/at_coder_friends/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'at_coder_friends'
@@ -35,11 +33,11 @@ Gem::Specification.new do |spec|
   spec.metadata = {
     'homepage_uri' => spec.homepage,
     'source_code_uri' => spec.homepage,
-    'changelog_uri' => 'https://github.com/nejiko96/at_coder_friends/blob/master/CHANGELOG.md'
+    'changelog_uri' => spec.homepage + '/blob/master/CHANGELOG.md'
   }
 
   spec.add_dependency 'colorize', '~> 0.8.1'
-  spec.add_dependency 'launchy', '~> 2.4.3'
+  spec.add_dependency 'launchy', '>= 2.4.3', '< 2.6.0'
   spec.add_dependency 'mechanize', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

data/lib/at_coder_friends/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'launchy'
 
 module AtCoderFriends
   # command line interface
@@ -116,6 +117,7 @@ module AtCoderFriends
 
       ctx.scraping_agent.submit
       vf.unverify
+      open_submission_list
     end
 
     def check_and_go
@@ -124,6 +126,7 @@ module AtCoderFriends
         # submit automatically
         ctx.scraping_agent.submit
         vf.unverify
+        open_submission_list
       else
         # enable manual submit
         vf.verify
@@ -139,8 +142,13 @@ module AtCoderFriends
     end
 
     def open_contest
-      require 'launchy'
       Launchy.open(ctx.scraping_agent.contest_url)
     end
+
+    def open_submission_list
+      url = ctx.scraping_agent.contest_url('submissions/me')
+      puts "submission status : #{url}"
+      Launchy.open(url)
+    end
   end
 end

data/lib/at_coder_friends/generator/base.rb

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

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

@@ -61,6 +61,7 @@ module AtCoderFriends
           .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/scraping/submission.rb

@@ -18,7 +18,7 @@ module AtCoderFriends
         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/version.rb

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

data/templates/cxx_builtin.cxx.erb

@@ -1,17 +1,20 @@
 // <%= pbm.url %>
-<%
-if pbm.options.interactive
-%>
+
 #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() {
 }
 
 //------------------------------------------------------------------------------
-<% gen_consts.each do |const| %><%= const %>
-<% end %>
-<% gen_decls.each do |dcl| %><%= dcl %>
-<% end %>
+<% end -%>
+<% gen_consts.each do |line| -%>
+<%= line %>
+<% end -%>
+
+<% gen_decls.each do |line| -%>
+<%= line %>
+<% end -%>
+
 void solve() {
+<% if pbm.options.interactive -%>
   printf("! %s\n", ans);
   fflush(stdout);
 #ifdef DEBUG
@@ -47,48 +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() {
-<% gen_inputs.each do |input| %>  <%= input %>
-<% end
-%>#ifdef DEBUG
+<% 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++)
-
-<% gen_consts.each do |const| %><%= const %>
-<% end %>
-<% gen_decls.each do |dcl| %><%= dcl %>
-<% end %>
-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() {
-<% gen_inputs.each do |input| %>  <%= input %>
-<% end
-%>}
-<%
-end
-%>
 int main() {
   input();
   solve();

data/templates/ruby_builtin.rb.erb

@@ -1,7 +1,6 @@
 # <%= pbm.url %>
-<%
-if pbm.options.interactive
-%>
+
+<% if pbm.options.interactive -%>
 def query(*args)
   puts "? #{args.join(' ')}"
   STDOUT.flush
@@ -15,15 +14,23 @@ end
 
 $DEBUG = true
 
-<% gen_consts.each do |const| %><%= const %>
-<% end %>
-<% gen_decls.each do |dcl| %><%= dcl %>
-<% end %>
+<% end -%>
+<% gen_consts.each do |line| -%>
+<%= line %>
+<% end -%>
+
+<% 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,18 +40,9 @@ if $DEBUG
   puts "query results:"
   @responses.each { |res| puts res }
   puts "----------------------------------------"
-end<%
-else
-%>
-<% gen_consts.each do |const| %><%= const %>
-<% end %>
-<% gen_decls.each do |dcl| %><%= dcl %>
-<% end %>
-<%
-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.5
+  version: 0.6.6
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -28,16 +28,22 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement