judge_system 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 66a5e610c3f04a03a3c5995f8f7f340c80d6aa6c
-  data.tar.gz: 8725d6e567c79b14271dddaf3d71ea08ee1961f6
+SHA256:
+  metadata.gz: deedcb6c209d6d4347977067d57a107056eb4cc5280cc14aec8cd18d265941af
+  data.tar.gz: f12a9381ca98d08279567bd8c62edea48f8c4dc9b1521bdd15a9d73d202d8a45
 SHA512:
-  metadata.gz: f75e46f42cf3cb8d26fd82095c88b7f9acbd8aba2e437e78b33ce7c22749b8a45f6349b29d60312f40a556096e88579e50bced2acec1ef5d619fe80978b0a9d8
-  data.tar.gz: 29258383872cd55bc5a4f5c1b8cfc40e3df33781e407a3676d82bb32e8e67a15bda25610afb8045e962f0d08f7a804c0fe5474d2be147a044c3e11615143746a
+  metadata.gz: a8ac21bfe06bea7d6c915396098c403fdbb30cb7805d15e5fdf5daa6a7f62f4ad0312f54d9d6574343ed1990b08d171d0b70fb1582a2edfd07050cd34b95fc37
+  data.tar.gz: bb85301eb0aacafb478b2423b56df0be6d38e72f749920ccf62611e17355810ade002ff4aa7b8fc9b269b6caaa6f94035358fa39accf28b009d7545787a39484

data/.gitignore

@@ -7,4 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
-/lib/old_compile_systems/
+/lib/old_compile_systems/

data/.rubocop.yml

@@ -13,9 +13,6 @@ Style/Documentation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Metrics/BlockLength:
-  Exclude:
-
 MethodLength:
   Max: 20
 

data/README.md

@@ -1,11 +1,11 @@
-[![wercker status](https://app.wercker.com/status/0964573b38729ce98909559e3779cca5/m/master "wercker status")](https://app.wercker.com/project/byKey/0964573b38729ce98909559e3779cca5) 
+[![wercker status](https://app.wercker.com/status/0964573b38729ce98909559e3779cca5/m/master "wercker status")](https://app.wercker.com/project/byKey/0964573b38729ce98909559e3779cca5)
 # JudgeSystem
 
-Judge_system is a compile and judge system for online judge.  
-This system work on [melpon/wandbox](https://github.com/melpon/wandbox).  
-That means you don't have to concern about dangerous codes if you use judge_system.  
-Judge_system returns four results ('AC', 'WA', 'RE', 'TLE').  
-Now, it can compile c, c++, ruby, go, python3, swift, haskell.  
+Judge_system is a compile and judge system for online judge.
+This system work on [melpon/wandbox](https://github.com/melpon/wandbox).
+That means you don't have to concern about dangerous codes if you use judge_system.
+Judge_system returns four results ('AC', 'WA', 'RE', 'TLE').
+Now, it can compile c, c++, ruby, go, python3, swift.
 
 ## Installation
 
@@ -35,7 +35,7 @@ JudgeSystem.judge_result lang: (string text), code: (string text), answer: (stri
 
 ```
 
-example  
+example
 
 ```ruby
 require 'judge_system'

data/judge_system.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'judge_system/version'
 
@@ -28,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'rbzip2'
   spec.add_dependency 'ffi'
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake',    '~> 10.0'
-  spec.add_development_dependency 'rspec',   '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.42.0'
+  spec.add_dependency 'rbzip2'
+  spec.add_development_dependency 'bundler', '~> 1.17.1'
+  spec.add_development_dependency 'rake',    '~> 12.0'
+  spec.add_development_dependency 'rspec',   '~> 3.4'
+  spec.add_development_dependency 'rubocop', '~> 0.60.0'
 end

data/lib/judge_system.rb

@@ -22,20 +22,25 @@ module JudgeSystem
     end
 
     def self.run(lang, code, input, time)
-      path = File.expand_path('../', __FILE__)
+      path = File.expand_path(__dir__)
       sys = File.open("#{path}/compile_systems/#{lang}_system.rb", 'r').read
-      data = nil
       spliter = "\n<$><*><$>\n"
-      stdin = BZip2Input.compress(code + spliter + input + spliter + format('%f', time))
+      stdin = BZip2Input.compress(code + spliter + input + spliter + format('%<time>f', time: time))
+
       begin
         data = compile(compiler: 'ruby-head', code: sys, stdin: stdin)
-      rescue
+      rescue StandardError
         return 'RE'
       end
+
       error = data['program_error']
       result = data['program_output']
-      return 'TLE' if error == "Killed\n"
-      return 'RE'  if result.nil? && error
+
+      if error == "Killed\n"
+        result = 'TLE'
+      elsif result.nil? && error
+        result = 'RE'
+      end
       result
     end
 
@@ -43,15 +48,17 @@ module JudgeSystem
 
     def self.judge(lang, code, answer, stdin, time)
       output = run(lang, code, stdin, time)
-      return 'TLE' if output == 'TLE'
-      return 'RE'  if output == 'RE'
-      output == answer ? 'AC' : 'WA'
+      if %w[TLE RE].include?(output)
+        output
+      else
+        output == answer ? 'AC' : 'WA'
+      end
     end
   end
 
+  module_function
+
   def judge_result(lang: '', code: '', answer: '', stdin: '', time: 20)
     WandBox.judge(lang, code, answer, stdin, time)
   end
-
-  module_function :judge_result
 end

data/lib/judge_system/version.rb

@@ -1,3 +1,3 @@
 module JudgeSystem
-  VERSION = '1.7.3'.freeze
+  VERSION = '1.7.4'.freeze
 end

data/lib/zlib_input.rb

@@ -1,6 +1,8 @@
 require 'rbzip2'
 require 'base64'
 module BZip2Input
+  module_function
+
   def compress(input)
     string = StringIO.new
     bz2 = RBzip2::FFI::Compressor.new string
@@ -8,5 +10,4 @@ module BZip2Input
     bz2.close
     Base64.encode64(string.string)
   end
-  module_function :compress
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: judge_system
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - getty104
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rbzip2
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: rbzip2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,56 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.60.0
 description: "This is a judge system for online judge. \nThis gem work on the wandbox
   api."
 email:
@@ -117,7 +117,6 @@ files:
 - lib/compile_systems/c_system.rb
 - lib/compile_systems/cpp_system.rb
 - lib/compile_systems/go_system.rb
-- lib/compile_systems/hs_system.rb
 - lib/compile_systems/py_system.rb
 - lib/compile_systems/rb_system.rb
 - lib/compile_systems/swift_system.rb
@@ -145,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This is a judge system for online judge

data/lib/compile_systems/hs_system.rb

@@ -1,25 +0,0 @@
-require 'base64'
-
-File.open('stdin.txt.bz2', 'wb') do |file|
-  file.write Base64.decode64 $stdin.read
-  file.close
-end
-
-system('bunzip2 stdin.txt.bz2')
-
-stdin = File.open('stdin.txt').read.split("\n<$><*><$>\n")
-code = stdin[0]
-input = stdin[1]
-time = stdin[2]
-
-File.open('./main.hs', 'w') do |file|
-  file.puts code
-  file.close
-end
-
-File.open('./test.in', 'w') do |file|
-  file.puts input
-  file.close
-end
-
-system('timeout -s 9 ' + time + ' /opt/wandbox/ghc-head/bin/runghc main.hs < test.in')