omegaup 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444fc13885fc5e35380254f0b820c54d3fe2134f5f271e3b420e9245acf84d03
-  data.tar.gz: cd81162a29dc5d7ceeedffefca870c37c4260d425bd5ba61431d0352425a3f3a
+  metadata.gz: 767e4b440acdf0d4b4f07d2fa568b0c05e78a8e066e1280765d49c6d62b23c46
+  data.tar.gz: 4151f5ade0af99d594d81e7cb1dae1259532d0627cc1c02f0499e1db03c4cec3
 SHA512:
-  metadata.gz: c98905259ad2bfb854142e4be40226417586edaada2da806916dfa1446f16a8bfae18bd619a47c6707fcba4e32f80888a99d12903f10a9011cefe74443a78bee
-  data.tar.gz: cd133c92f5fb7332fc90c371227459c6d3a488a2456700036cca833c3eb9bb1a100dd7cf7686b893471d1db568fb66860ead28f8e3b769714167cd43fdd43b7d
+  metadata.gz: 2511e42ce423bb7530f9e696e2a8f436fe547a9526731e3fc119952d63a014c0ef151b2ed78087b033009ee3420fe5bfee6495fe0b35f33a92aff90d62ee1488
+  data.tar.gz: b0816baf5e9fb16c43a9dbdb2e00b8c1462fd0f77ae33ce843c9fc03d42f6491e75d492a4d3847591cd9cf225589a6b2b23601ce333ee90c23873814cce80e90

data/.rubocop.yml

@@ -1,3 +1,7 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   NewCops: enable
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+Style/Documentation:
+  Enabled: false

data/lib/omega/cli/contest.rb

@@ -24,6 +24,16 @@ module Omega
         puts "Failed users: \n- #{failed.join("\n- ")}"
       end
 
+      def copy_users(contest, from)
+        target = omega.contest(contest)
+        source = omega.contest(from)
+        source.users.each do |user|
+          target.add_user(user)
+        rescue StandardError => e
+          puts "Error adding #{user}: #{e.message}"
+        end
+      end
+
       def user_data(user)
         puts omega.user(user).full_data.to_yaml
       end
@@ -41,6 +51,23 @@ module Omega
         puts "#{contest_name}: #{e.message}"
       end
 
+      def add_problem(contest_name, problem_name)
+        contest = omega.contest(contest_name)
+        contest.add_problem(problem_name)
+      rescue StandardError => e
+        puts "Error adding #{problem_name}: #{e.message}"
+      end
+
+      def copy_problems(contest_name, from)
+        contest = omega.contest(contest_name)
+        source = omega.contest(from)
+        source.problems.each do |problem|
+          contest.add_problem(problem[:alias])
+        rescue StandardError => e
+          puts "Error adding #{problem[:alias]}: #{e.message}"
+        end
+      end
+
       def download_sources(contest_name, path)
         Dir.mkdir(path) unless File.directory?(path)
         contest = omega.contest(contest_name)

data/lib/omega/cli.rb

@@ -19,40 +19,54 @@ module Omega
       help
     ].freeze
 
-    def print_help
-      puts %(
+    GENERAL_DOC = %(
 OmegaUp CLI. Developed by OMIJal https://github.com/omijal/omegaup-cli.
 Tool for interacting with omegaup from CLI and available throug ruby gems.
 Commands:
- - register-users  Add a user or a bunch of users to the a contest.
- - user            Generates a dump of the user data in yml format.
- - scoreboard      Gets contest scoreboard with users and score.
- - clarifications  Gets contest clarifications.
- - sources         Downloads all code sources into path
+- register-users  Add a user or a bunch of users to the a contest.
+- copy-problems   Adds prob from another contest
+- user            Generates a dump of the user data in yml format.
+- scoreboard      Gets contest scoreboard with users and score.
+- clarifications  Gets contest clarifications.
+- sources         Downloads all code sources into path
 Parametes:
- --contest         Contest name
- --user            Username or email
- --user-file       A file path containing a list of user one per line without
-                   header
- --open            Filter to only open clarifications
- --path            Path to store results
+--contest         Contest name
+--user            Username or email
+--user-file       A file path containing a list of user one per line without
+                 header
+--open            Filter to only open clarifications
+--path            Path to store results
 Setup:
 You need to add two env variables with your omegaup credentials.
 OMEGAUP_URL  *Optional* This is intended for development purpose, it will target
-                        to https://omegaup.com by default.
+                      to https://omegaup.com by default.
 OMEGAUP_USER *Required* Your OmegaUp Username or Email
 OMEGAUP_PASS *Required* Your OmegaUp Password
-      )
+    )
+
+    def print_help
+      puts GENERAL_DOC
     end
 
     def initialize(_)
       @cmd = ARGV.shift
 
       @cmd_opts = case @cmd
+                  when 'copy-problems'
+                    Optimist.options do
+                      opt :contest, 'Contest ShortName or identifier', type: :string
+                      opt :from, 'Another constest that allows to clone users from another contest', type: :string
+                    end
+                  when 'add-problem'
+                    Optimist.options do
+                      opt :contest, 'Contest ShortName or identifier', type: :string
+                      opt :problem, 'Problem name', type: :string
+                    end
                   when 'register-users'
                     Optimist.options do
                       opt :contest, 'Contest ShortName or identifier', type: :string
                       opt :user, 'Username or email', type: :string
+                      opt :from, 'Another constest that allows to clone users from another contest', type: :string
                       opt :user_file, 'A file containing the users list one per line and without header', type: :string
                     end
                   when 'user'
@@ -92,8 +106,8 @@ OMEGAUP_PASS *Required* Your OmegaUp Password
       config = {
         'omega' => {
           'endpoint' => ENV['OMEGAUP_URL'] || 'https://omegaup.com',
-          'user' => ENV['OMEGAUP_USER'],
-          'pass' => ENV['OMEGAUP_PASS']
+          'user' => ENV.fetch('OMEGAUP_USER', nil),
+          'pass' => ENV.fetch('OMEGAUP_PASS', nil)
         }
       }
 
@@ -107,6 +121,7 @@ OMEGAUP_PASS *Required* Your OmegaUp Password
       when 'register-users'
         register_user(@cmd_opts[:contest], @cmd_opts[:user]) if @cmd_opts[:user]
         register_users(@cmd_opts[:contest], @cmd_opts[:user_file]) if @cmd_opts[:user_file]
+        copy_users(@cmd_opts[:contest], @cmd_opts[:from]) if @cmd_opts[:from]
       when 'user'
         user_data(@cmd_opts[:user])
       when 'scoreboard'
@@ -115,6 +130,10 @@ OMEGAUP_PASS *Required* Your OmegaUp Password
         clarifications(@cmd_opts[:contest], @cmd_opts[:open])
       when 'sources'
         download_sources(@cmd_opts[:contest], @cmd_opts[:path])
+      when 'copy-problems'
+        copy_problems(@cmd_opts[:contest], @cmd_opts[:from])
+      when 'add-problem'
+        add_problem(@cmd_opts[:contest], @cmd_opts[:problem])
       end
     end
   end

data/lib/omega/client.rb

@@ -4,10 +4,16 @@ require_relative 'contest'
 require_relative 'scoreboard'
 require_relative 'user'
 require_relative 'contest_run'
+require 'json'
+require 'nokogiri'
 
 require 'httparty'
 
 module Omega
+  KAREL_LANGS = 'kp,kj'
+  OMI_LANGS = 'c11-gcc,c11-clang,cpp11-gcc,cpp11-clang,cpp17-gcc,cpp17-clang,cpp20-gcc,cpp20-clang'
+  ALL_LANGS = 'kp,kj,c11-gcc,c11-clang,cpp11-gcc,cpp11-clang,cpp17-gcc,cpp17-clang,cpp20-gcc,cpp20-clang,java,kt,py2,py3,rb,cs,pas,cat,hs,lua,go,rs,js'
+
   class OmegaError < StandardError
     attr_reader :data
 
@@ -18,6 +24,14 @@ module Omega
     def message
       "#{@data[:errorname]}::#{@data[:errorcode]} >> #{@data[:error]}"
     end
+
+    def errorname
+      @data[:errorname]
+    end
+
+    def errorcode
+      @data[:errorcode]
+    end
   end
 
   class Client
@@ -30,7 +44,7 @@ module Omega
     def perform_request(method, endpoint, data, retried = false)
       url = "#{@config['endpoint']}#{endpoint}"
       response = self.class.send(method, url, body: data)
-      body = JSON.parse(response.body, symbolize_names: true)
+      body = ::JSON.parse(response.body, symbolize_names: true)
 
       if body[:errorcode] == 401 && !retried
         login
@@ -67,6 +81,58 @@ module Omega
       retry
     end
 
+    def problem_details(problem_alias)
+      post('/api/problem/details', { problem_alias: })
+    end
+
+    def create_group(name, description: nil, alias: nil)
+      post('/api/group/create', name:, alias:, description:)
+    end
+
+    def create_contest(name:, short_name:, description:, start_time:, finish_time:,
+                       public: false, penalty_calc_policy: 'sum', show_penalty: true,
+                       points_decay_factor: '0', submissions_gap: '60', languages: ALL_LANGS, feedback: 'none',
+                       penalty: '0', scoreboard: '100', penalty_type: 'none',
+                       default_show_all_contestants_in_scoreboard:	false,
+                       show_scoreboard_after:	true,
+                       score_mode:	'partial',
+                       needs_basic_information:	false,
+                       requests_user_information:	'no',
+                       contest_for_teams:	false)
+      post('/api/contest/create/', {
+             admin: true,
+             admission_mode:	(public ? 'public' : 'private'),
+             alias: short_name,
+             archived:	false,
+             opened:	false,
+             penalty_calc_policy:,
+             show_penalty:,
+             title: name,
+             description:,
+             has_submissions:	false,
+             start_time: start_time.to_time.to_i,
+             finish_time:	finish_time.to_time.to_i,
+             points_decay_factor:,
+             submissions_gap:,
+             languages:,
+             feedback:,
+             penalty:,
+             scoreboard:,
+             penalty_type:,
+             default_show_all_contestants_in_scoreboard:,
+             show_scoreboard_after:,
+             score_mode:,
+             needs_basic_information:,
+             requests_user_information:,
+             contest_for_teams:
+           })
+      contest(short_name)
+    rescue OmegaError => e
+      raise e unless e.errorname == 'aliasInUse'
+
+      contest(short_name)
+    end
+
     def scoreboard(name)
       data = post('/api/contest/scoreboard/', { contest_alias: name })
       Scoreboard.new(self, data)
@@ -86,6 +152,12 @@ module Omega
       User.new(self, data)
     end
 
+    def add_admin_group(contest, group)
+      post('/api/contest/addGroupAdmin', { contest_alias: contest, group: })
+    rescue OmegaError
+      # Omega seems to have a bug
+    end
+
     def add_user_to_contest(user, contest)
       post('/api/contest/addUser', { contest_alias: contest, usernameOrEmail: user })
     end
@@ -99,8 +171,50 @@ module Omega
     end
 
     def contest_runs(contest, offset, page_size)
-      data = post('/api/contest/runs/', { contest_alias: contest, offset: offset, rowcount: page_size })
+      data = post('/api/contest/runs/', { contest_alias: contest, offset:, rowcount: page_size })
       data[:runs].map { |run| ContestRun.new(self, run) }
     end
+
+    def add_problem_to_contest(contest, problem, points = 100)
+      post('/api/contest/addProblem', contest_alias: contest, problem_alias: problem, points:)
+    end
+
+    def add_user_to_group(group_name, username)
+      post('/api/group/addUser', group_alias: group_name, usernameOrEmail: username)
+    rescue OmegaError => e
+      raise if e.errorname != 'identityInGroup'
+    end
+
+    def get_payload_from_response_by_id(response_body, id)
+      page = Nokogiri::HTML(response_body)
+      script = page.at_css("script##{id}")
+      unless script
+        raise OmegaError.new(errorname: 'ScrapingError', errorcode: 404,
+                             error: "Script with id #{id} not found")
+      end
+
+      script_content = script.content
+      # Extrayendo el contenido JSON del script
+      begin
+        ::JSON.parse(script_content, symbolize_names: true)
+      rescue JSON::ParserError
+        raise OmegaError.new(errorname: 'ScrapingError', errorcode: 500, error: 'Unable to parse JSON data')
+      end
+    end
+
+    def scrap_get(endpoint, id = 'payload')
+      url = "#{@config['endpoint']}#{endpoint}"
+      response = self.class.get(url)
+      unless response.success?
+        raise OmegaError.new(errorname: 'HttpError', errorcode: response.code,
+                             error: response.message)
+      end
+
+      body = get_payload_from_response_by_id(response.body, id)
+
+      raise OmegaError, body if body[:error]
+
+      body
+    end
   end
 end

data/lib/omega/contest.rb

@@ -9,6 +9,10 @@ module Omega
       @client.scoreboard(data[:alias])
     end
 
+    def problems
+      @data[:problems]
+    end
+
     def runs(offset = 0, page_size = 100)
       @client.contest_runs(data[:alias], offset, page_size)
     end
@@ -27,6 +31,14 @@ module Omega
       sources
     end
 
+    def full_details
+      @full_details ||= @client.scrap_get("/contest/#{data[:alias]}/edit/")
+    end
+
+    def group_admin?(group_name)
+      full_details[:group_admins].any? { |group| group[:alias].casecmp(group_name).zero? }
+    end
+
     def add_user(user)
       if user.is_a?(String)
         @client.add_user_to_contest(user, data[:alias])
@@ -39,6 +51,22 @@ module Omega
       @client.clarifications(data[:alias])
     end
 
+    def users
+      scoreboard.users
+    end
+
+    def alias
+      @data[:alias].downcase
+    end
+
+    def add_problem(name)
+      @client.add_problem_to_contest(data[:alias], name)
+    end
+
+    def add_admin_group(group)
+      @client.add_admin_group(data[:alias], group)
+    end
+
     def observe(score_notifier, clar_noritifer)
       last = current = scoreboard
       sleep(5)
@@ -47,8 +75,8 @@ module Omega
           clarifications.select { |clar| clar[:answer].nil? || clar[:answer].empty? }
                         .each { |clar| clar_noritifer.call(clar) }
           sleep(300)
-        rescue StandardError => ex
-          puts ex.message
+        rescue StandardError => e
+          puts e.message
           sleep(3000)
         end
       end
@@ -62,14 +90,17 @@ module Omega
             current_problem = current_score.score_for(name)
             last_points = problem[:points]
             current_points = current_problem[:points]
-            score_notifier.call(data[:alias], score.username, name, current_points, last_points, data[:alias]) if current_points != last_points
+            if current_points != last_points
+              score_notifier.call(data[:alias], score.username, name, current_points, last_points,
+                                  data[:alias])
+            end
           end
         end
         # puts '-' * 60
         last = current
         sleep(15)
-      rescue StandardError => ex
-        puts ex.message
+      rescue StandardError => e
+        puts e.message
         sleep(3000)
       end
     end

data/lib/omega/contest_run.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module Omega
@@ -11,7 +13,7 @@ module Omega
     end
 
     def save_at(path)
-      File.write("#{path}/#{@data[:guid]}.yaml", { details: details, data: @data }.to_yaml)
+      File.write("#{path}/#{@data[:guid]}.yaml", { details:, data: @data }.to_yaml)
     end
   end
 end

data/lib/omega/scoreboard.rb

@@ -9,9 +9,8 @@ module Omega
 
     def initialize(client, entry)
       @username = entry[:username]
-      @client = client
       @problems = entry[:problems] || []
-      @data = entry
+      super
     end
 
     def merge(score)
@@ -38,6 +37,10 @@ module Omega
       end
       nil
     end
+
+    def to_h
+      @data[:problems]
+    end
   end
 
   class Scoreboard < Base
@@ -50,6 +53,10 @@ module Omega
       end
     end
 
+    def to_h
+      @data[:ranking].map { |username, entry| { username:, score: entry.to_h } }
+    end
+
     def merge(board)
       result = clone
       board.data[:ranking].each do |user, score|

data/lib/omega/user.rb

@@ -7,7 +7,7 @@ module Omega
     def full_data
       {
         data: @data,
-        problems_solved: problems_solved,
+        problems_solved:,
         resume: report
       }
     end
@@ -16,6 +16,10 @@ module Omega
       @client.problems_solved(data[:username])[:problems]
     end
 
+    def username
+      @data[:username]
+    end
+
     def report
       data = { score: 0, count: 0 }
       problems_solved.each do |p|

data/lib/omega/version.rb

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

data/omega.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'omegaup'
   spec.version       = Omega::VERSION
   spec.authors       = ['Gilberto Vargas']
-  spec.email         = ['tachoguitar@gmail.com']
+  spec.email         = ['tachomexgems@gmail.com']
 
   spec.summary       = 'File created for encrypting files using ssh keys'
   spec.description   = 'Allows to encrypt files using ssh keys'
@@ -25,6 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'amazing_print'
   spec.add_development_dependency 'httparty'
   spec.add_development_dependency 'minitest', '~> 5'
+  spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'optimist'
+  spec.add_development_dependency 'rack-minitest'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'webmock'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omegaup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Gilberto Vargas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,9 +108,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows to encrypt files using ssh keys
 email:
-- tachoguitar@gmail.com
+- tachomexgems@gmail.com
 executables:
 - omega
 extensions: []
@@ -105,7 +161,8 @@ files:
 homepage: https://github.com/omijal/omegaup-cli
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -121,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.14
 signing_key: 
 specification_version: 4
 summary: File created for encrypting files using ssh keys