green_day 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06bcfc1dc4b42165710a01e2d1d4836e0ad829a4b33040d5f35613b836ce15af
-  data.tar.gz: 39899f57ae69c44e702b7a9a0990e332d8842867584fe97462f01d89edcae461
+  metadata.gz: 971ee30b1f0c5e28050c22c9dad43ec540df4b62a8c98732cc087bd6073264ce
+  data.tar.gz: b466d89cbb1b7bf4b80bd4b6e6376c62b6bfab1582e0dacea346ceddd43e4996
 SHA512:
-  metadata.gz: 54eacd28a4a76464d6a740bc6b670ecf33c8f264cc33b3e32cd8943d6df3f5e85d822c21f09712cf339e0c5d8e2f43626a9d845c8f84c31e0d8b1e818aecfc8a
-  data.tar.gz: 16e9b1390526d3d55ea2eeaef27f964844aaf23997236f108efecbc8bd2f781c04e04bef3b3a100248072205b075425eb09d7eb016cdbab7ddade4c3598cda2f
+  metadata.gz: 89fbaca8563074011b950df0241164a97e0fbb0659126b00cc5a7a04a6cd4169dd0a63ece3d4d245aa19ccbb71421b2841d733bb209e893af48f3c22aeb4db3e
+  data.tar.gz: 02bcd53c57dd6c4d73e8871e0943cd494fe700b77ce61603d752f4f2ec4a97653288c9f9e03e4c9d91766d67d399a1647900ccd2ddd7a752d245310151057db4

data/.github/workflows/bump_version_and_push_to_rubygems.yml

@@ -0,0 +1,54 @@
+name: Bump version and Push to RubyGems
+
+on:
+  workflow_dispatch:
+    inputs:
+      miner-or-major:
+        description: 'Minor or major release'
+        required: true
+        default: 'minor'
+        options:
+          - 'minor'
+          - 'major'
+      email:
+        description: Your email
+        required: true
+        type: string
+
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - run: bundle install
+      - run: gem install gem-release
+
+      - name: config
+        run: |
+          git config --global user.email ${{ github.event.inputs.email }}
+          git config --global user.name ${{ github.actor }}
+
+      - name: Bump version
+        run: gem bump --version ${{ github.event.inputs.miner-or-major }}
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/ruby.yml

@@ -10,25 +10,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby:
-          - 2.7.1 # AtCoder公式が使用しているrubyは2.7.1
-          - 3.1.0
+        ruby-version:
+          - 3.2.1 # Atcoderが採用しているバージョン
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby ${{ matrix.ruby }}
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: bundle install
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Bundle install
         run: bundle install
-      - name: Rubocop
-        run: bundle exec rubocop
-      - name: Rspec
+      - name: Run Rspec
         env:
           USER_NAME: ${{ secrets.USER_NAME }}
           PASSWORD: ${{ secrets.PASSWORD }}
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: script -e -c "rake spec"
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2.1
+      - name: Bundle install
+        run: bundle install
+      - name: Run rubocop
+        run: bundle exec rubocop
       
 
 

data/.rubocop.yml

@@ -19,6 +19,6 @@ Metrics/BlockLength:
 RSpec/NamedSubject:
   Enabled: false
 RSpec/NestedGroups:
-  Max: 4
+  Max: 7
 RSpec/ExampleLength:
-  Enabled: false
+  Enabled: false

data/Gemfile

@@ -4,3 +4,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in green_day.gemspec
 gemspec
+
+gem 'bundler', '~> 2.0'
+gem 'codecov'
+gem 'dotenv'
+gem 'rake', '>= 12.3.3'
+gem 'rspec', '~> 3.0'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'vcr'

data/README.md

@@ -52,8 +52,6 @@ For example
    Example of output spec
    
    ```ruby
-  require 'rspec'
-
   RSpec.describe 'test' do
     it 'test with "2 900\\n"' do
       io = IO.popen("ruby abc150/A.rb", "w+")
@@ -94,4 +92,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the GreenDay project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/green_day/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the GreenDay project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/QWYNG/green_day/blob/master/CODE_OF_CONDUCT.md).

data/green_day.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'green_day/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 2.7.1'
+  spec.required_ruby_version = '>= 3.2.1'
   spec.name          = 'green_day'
   spec.executables   = ['green_day']
   spec.version       = GreenDay::VERSION
@@ -27,20 +27,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'colorize'
-  spec.add_dependency 'faraday', '< 1.0'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'faraday-cookie_jar'
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'parallel'
   spec.add_dependency 'thor'
-  spec.add_dependency 'webrick'
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'codecov'
-  spec.add_development_dependency 'dotenv'
-  spec.add_development_dependency 'rake', '>= 12.3.3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'vcr'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/green_day/atcoder_client.rb

@@ -2,59 +2,47 @@
 
 require 'faraday'
 require 'faraday-cookie_jar'
-require 'webrick/cookie'
 require 'nokogiri'
 
 module GreenDay
   class AtcoderClient
     ATCODER_ENDPOINT = 'https://atcoder.jp'
     COOKIE_FILE_NAME = '.cookie-store'
-    attr_reader :client, :cookie_jar
+    attr_reader :conn, :cookie_jar
+
+    def self.login(username, password)
+      new.login(username, password)
+    end
+
+    def self.get_parsed_body(path)
+      new.get_parsed_body(path)
+    end
 
     def initialize
       @cookie_jar = create_or_load_cookie_jar
-      @client = Faraday.new(url: ATCODER_ENDPOINT) do |builder|
+      @conn = Faraday.new(url: ATCODER_ENDPOINT) do |builder|
         builder.use :cookie_jar, jar: cookie_jar
         builder.request :url_encoded
         builder.adapter :net_http
       end
     end
 
-    def contest_exist?(contest_name)
-      res = client.get("contests/#{contest_name}")
-      res.status == 200
-    end
-
-    def fetch_task_codes(contest)
-      body = get_parsed_body("contests/#{contest.name}/tasks")
-
-      # 3問だったら<tbody>の中に<tr>が3 * 2個 </tbody> が1mh個
-      tasks_size = ((body.at('tbody').children.size - 1) / 2.0).ceil
-      ('A'..'ZZ').to_a.shift(tasks_size)
-    end
-
-    def fetch_inputs_and_outputs(contest, task)
-      contest_name = contest.name
-      path = "contests/#{contest_name}/tasks/#{contest_name}_#{task.code.downcase}"
-      body = get_parsed_body(path)
-      samples = body.css('.lang-ja > .part > section > pre').map { |e| e.children.text }
-
-      inputs, outputs = samples.partition.with_index { |_sample, i| i.even? }
-
-      [inputs, outputs]
+    def get_parsed_body(path)
+      res = conn.get(path)
+      Nokogiri::HTML.parse(res.body)
     end
 
     def login(username, password)
       csrf_token = obtain_atcoder_csrf_token
 
-      client.post('/login',
-                  username: username,
-                  password: password,
-                  csrf_token: csrf_token)
+      conn.post('/login',
+                username:,
+                password:,
+                csrf_token:)
 
       unless login_succeed?
         ## ex error:Username or Password is incorrect
-        raise Error, CGI.unescape(select_flash_cookie.value).split('.').shift
+        raise Error, CGI.unescape(flash_cookie.value).split('.').shift
       end
 
       cookie_jar.save(COOKIE_FILE_NAME)
@@ -75,25 +63,21 @@ module GreenDay
     end
 
     def obtain_atcoder_csrf_token
-      get_login_response = client.get('/login')
+      get_login_response = conn.get('/login')
       login_html = Nokogiri::HTML.parse(get_login_response.body)
       login_html.at('input[name="csrf_token"]')['value']
     rescue StandardError
-      raise Error, 'cant get_csrf_token'
+      raise Error, 'can not get_csrf_token'
     end
 
     def login_succeed?
-      flash_cookie = select_flash_cookie
       flash_cookie.value.include?('Welcome')
     end
 
-    def select_flash_cookie
-      cookie_jar.store.instance_variable_get(:@jar)['atcoder.jp']['/']['REVEL_FLASH']
-    end
-
-    def get_parsed_body(path)
-      res = client.get(path)
-      Nokogiri::HTML.parse(res.body)
+    def flash_cookie
+      @flash_cookie ||= cookie_jar.cookies("#{ATCODER_ENDPOINT}/login").find do |cookie|
+        cookie.name == 'REVEL_FLASH'
+      end
     end
   end
 end

data/lib/green_day/cli.rb

@@ -17,7 +17,7 @@ module GreenDay
       print 'password:'
       password = $stdin.noecho { |stdin| stdin.gets(chomp: true) }.tap { puts }
 
-      AtcoderClient.new.login(username, password)
+      AtcoderClient.login(username, password)
       puts(
         "Successfully created #{AtcoderClient::COOKIE_FILE_NAME}"
         .colorize(:green)
@@ -26,38 +26,36 @@ module GreenDay
 
     desc 'new [contest name]', 'create contest workspace and spec'
     def new(contest_name)
-      contest = Contest.new(contest_name, AtcoderClient.new)
+      contest = Contest.new(contest_name)
       FileUtils.makedirs("#{contest.name}/spec")
 
-      Parallel.each(contest.tasks, in_threads: THREAD_COUNT) do |task|
-        create_submit_file(task)
-        create_spec_file(task)
-      end
+      contest.tasks.map do |task|
+        create_files_in_thread(task)
+      end.each(&:join)
 
       puts "Successfully created #{contest.name} directory".colorize(:green)
     end
 
     private
 
-    def create_submit_file(task)
-      File.open(submit_file_path(task), 'w')
+    def create_files_in_thread(task)
+      Thread.new do
+        create_task_file(task)
+        create_task_spec_file(task)
+      end
     end
 
-    def create_spec_file(task)
-      test =
-        TestBuilder.build_test(
-          submit_file_path(task),
-          task.sample_answers
-        )
-      File.write(spec_file_path(task), test)
+    def create_task_file(task)
+      FileUtils.touch(task_file_name(task))
     end
 
-    def submit_file_path(task)
-      "#{task.contest.name}/#{task.code}.rb"
+    def create_task_spec_file(task)
+      test_content = TestBuilder.build_test(task_file_name(task), task.sample_answers)
+      File.write("#{task.contest.name}/spec/#{task.name}_spec.rb", test_content)
     end
 
-    def spec_file_path(task)
-      "#{task.contest.name}/spec/#{task.code}_spec.rb"
+    def task_file_name(task)
+      "#{task.contest.name}/#{task.name}.rb"
     end
   end
 end

data/lib/green_day/contest.rb

@@ -1,22 +1,35 @@
 # frozen_string_literal: true
 
-require_relative 'atcoder_client'
 require_relative 'task'
 
 module GreenDay
   class Contest
-    attr_reader :atcoder_client, :name, :tasks
-
-    def initialize(contest_name, client)
-      raise GreenDay::Error 'cant find contest' unless client.contest_exist?(contest_name)
+    attr_reader :name, :tasks
 
+    def initialize(contest_name)
       @name = contest_name
 
-      task_codes = client.fetch_task_codes(self)
-      @tasks =
-        Parallel.map(task_codes, in_threads: THREAD_COUNT) do |task_code|
-          Task.new(self, task_code, client)
+      @tasks = fetch_task_names_and_paths.map.with_index do |(task_name, task_path), i|
+        if !i.zero? && (i % 10).zero? && !ENV['CI']
+          puts 'Sleeping 2 second to avoid 429 error'
+          sleep 2
+        end
+
+        Thread.new do
+          Task.new(self, task_name, task_path)
         end
+      end.map(&:value)
+    end
+
+    private
+
+    def fetch_task_names_and_paths
+      body = AtcoderClient.get_parsed_body("contests/#{name}/tasks")
+      task_elements = body.search('tbody tr td:first a')
+
+      task_elements.to_h do |element|
+        [element.text, element[:href]]
+      end
     end
   end
 end

data/lib/green_day/task.rb

@@ -2,21 +2,30 @@
 
 module GreenDay
   class Task
-    attr_reader :contest, :code, :sample_answers
+    attr_reader :contest, :name, :path, :sample_answers
 
-    def initialize(contest, code, client)
+    def initialize(contest, name, path)
       @contest = contest
-      @code = code
-      @sample_answers = create_sample_answers(client)
+      @name = name
+      @path = path
+      @sample_answers = create_sample_answers_hash
     end
 
     private
 
-    def create_sample_answers(client)
-      input_samples, output_samples =
-        client.fetch_inputs_and_outputs(contest, self)
+    def create_sample_answers_hash
+      input_samples, output_samples = fetch_inputs_and_outputs
 
       input_samples.zip(output_samples).to_h
     end
+
+    def fetch_inputs_and_outputs
+      body = AtcoderClient.get_parsed_body(path)
+      samples = body.css('.lang-ja > .part > section > pre').map { |e| e.children.text }
+
+      inputs, outputs = samples.partition.with_index { |_sample, i| i.even? }
+
+      [inputs, outputs]
+    end
   end
 end

data/lib/green_day/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -26,20 +26,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,146 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  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: dotenv
-  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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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: rubocop-rake
-  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: rubocop-rspec
-  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: vcr
-  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: CLI tool for AtCoder and Ruby
 email:
 - ikusawasi@gmail.com
@@ -242,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/bump_version_and_push_to_rubygems.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -277,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.1
+      version: 3.2.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: CLI tool for AtCoder and Ruby