green_day 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6db900740eb86bf00384ad3f97895ecd146d5f112f96db362c28a28cbfb391f
-  data.tar.gz: c4f4a09dd97c634b671434735896294c13f5ad3992d97378db3cde64e804efae
+  metadata.gz: 971ee30b1f0c5e28050c22c9dad43ec540df4b62a8c98732cc087bd6073264ce
+  data.tar.gz: b466d89cbb1b7bf4b80bd4b6e6376c62b6bfab1582e0dacea346ceddd43e4996
 SHA512:
-  metadata.gz: 15d1dfd04be33f629ec7f6f74ff7666175e39bd62e3dcb80f2d5ae936c86001ba479db6fe2a084839d7e12fedaede50b3d85c9c65d4ae9c88700127204c4a33e
-  data.tar.gz: c5e5b31671f907460705f3baac9e9ebc6a0142fb3d2678e1783b3b8a382e266cb06cf4e793a096768632b8451f2925d6968550c32ae5ef355738f3ee23e8153c
+  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

@@ -11,8 +11,7 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - 2.7.1 # AtCoder公式が使用しているrubyは2.7.1
-          - 3.1
+          - 3.2.1 # Atcoderが採用しているバージョン
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby-version }}
@@ -33,7 +32,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.2.1
       - name: Bundle install
         run: bundle install
       - name: Run rubocop

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/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
@@ -30,17 +30,6 @@ Gem::Specification.new do |spec|
   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,18 +2,25 @@
 
 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
@@ -21,17 +28,17 @@ module GreenDay
     end
 
     def get_parsed_body(path)
-      res = client.get(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
@@ -56,11 +63,11 @@ 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?

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.name}.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.name}_spec.rb"
+    def task_file_name(task)
+      "#{task.contest.name}/#{task.name}.rb"
     end
   end
 end

data/lib/green_day/contest.rb

@@ -1,31 +1,30 @@
 # frozen_string_literal: true
 
-require 'forwardable'
 require_relative 'task'
 
 module GreenDay
   class Contest
-    extend Forwardable
-    delegate get_parsed_body: :@client
-
     attr_reader :name, :tasks
 
-    def initialize(contest_name, client)
-      @client = client
+    def initialize(contest_name)
       @name = contest_name
 
-      task_names_and_paths = fetch_task_names_and_paths
-      @tasks =
-        Parallel.map(task_names_and_paths,
-                     in_threads: THREAD_COUNT) do |task_name, task_path|
-          Task.new(self, task_name, task_path, @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 = get_parsed_body("contests/#{name}/tasks")
+      body = AtcoderClient.get_parsed_body("contests/#{name}/tasks")
       task_elements = body.search('tbody tr td:first a')
 
       task_elements.to_h do |element|

data/lib/green_day/task.rb

@@ -1,16 +1,10 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-
 module GreenDay
   class Task
-    extend Forwardable
-    delegate get_parsed_body: :@client
-
     attr_reader :contest, :name, :path, :sample_answers
 
-    def initialize(contest, name, path, client)
-      @client = client
+    def initialize(contest, name, path)
       @contest = contest
       @name = name
       @path = path
@@ -26,7 +20,7 @@ module GreenDay
     end
 
     def fetch_inputs_and_outputs
-      body = get_parsed_body(path)
+      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? }

data/lib/green_day/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GreenDay
-  VERSION = '0.5.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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -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,7 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/publish_to_rubygems.yml"
+- ".github/workflows/bump_version_and_push_to_rubygems.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -278,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.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: CLI tool for AtCoder and Ruby

data/.github/workflows/publish_to_rubygems.yml

@@ -1,31 +0,0 @@
-name: Publish to RubyGems
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Ruby 3.1
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1
-      - run: bundle install
-
-      - 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}}"