green_day 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06bcfc1dc4b42165710a01e2d1d4836e0ad829a4b33040d5f35613b836ce15af
-  data.tar.gz: 39899f57ae69c44e702b7a9a0990e332d8842867584fe97462f01d89edcae461
+  metadata.gz: f6db900740eb86bf00384ad3f97895ecd146d5f112f96db362c28a28cbfb391f
+  data.tar.gz: c4f4a09dd97c634b671434735896294c13f5ad3992d97378db3cde64e804efae
 SHA512:
-  metadata.gz: 54eacd28a4a76464d6a740bc6b670ecf33c8f264cc33b3e32cd8943d6df3f5e85d822c21f09712cf339e0c5d8e2f43626a9d845c8f84c31e0d8b1e818aecfc8a
-  data.tar.gz: 16e9b1390526d3d55ea2eeaef27f964844aaf23997236f108efecbc8bd2f781c04e04bef3b3a100248072205b075425eb09d7eb016cdbab7ddade4c3598cda2f
+  metadata.gz: 15d1dfd04be33f629ec7f6f74ff7666175e39bd62e3dcb80f2d5ae936c86001ba479db6fe2a084839d7e12fedaede50b3d85c9c65d4ae9c88700127204c4a33e
+  data.tar.gz: c5e5b31671f907460705f3baac9e9ebc6a0142fb3d2678e1783b3b8a382e266cb06cf4e793a096768632b8451f2925d6968550c32ae5ef355738f3ee23e8153c

data/.github/workflows/publish_to_rubygems.yml

@@ -0,0 +1,31 @@
+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}}"

data/.github/workflows/ruby.yml

@@ -10,25 +10,34 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby:
+        ruby-version:
           - 2.7.1 # AtCoder公式が使用しているrubyは2.7.1
-          - 3.1.0
+          - 3.1
     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.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/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

@@ -27,7 +27,7 @@ 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'

data/lib/green_day/atcoder_client.rb

@@ -20,28 +20,9 @@ module GreenDay
       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 = client.get(path)
+      Nokogiri::HTML.parse(res.body)
     end
 
     def login(username, password)
@@ -54,7 +35,7 @@ module GreenDay
 
       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)
@@ -83,17 +64,13 @@ module GreenDay
     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

@@ -53,11 +53,11 @@ module GreenDay
     end
 
     def submit_file_path(task)
-      "#{task.contest.name}/#{task.code}.rb"
+      "#{task.contest.name}/#{task.name}.rb"
     end
 
     def spec_file_path(task)
-      "#{task.contest.name}/spec/#{task.code}_spec.rb"
+      "#{task.contest.name}/spec/#{task.name}_spec.rb"
     end
   end
 end

data/lib/green_day/contest.rb

@@ -1,22 +1,36 @@
 # frozen_string_literal: true
 
-require_relative 'atcoder_client'
+require 'forwardable'
 require_relative 'task'
 
 module GreenDay
   class Contest
-    attr_reader :atcoder_client, :name, :tasks
+    extend Forwardable
+    delegate get_parsed_body: :@client
 
-    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, client)
+      @client = client
       @name = contest_name
 
-      task_codes = client.fetch_task_codes(self)
+      task_names_and_paths = fetch_task_names_and_paths
       @tasks =
-        Parallel.map(task_codes, in_threads: THREAD_COUNT) do |task_code|
-          Task.new(self, task_code, client)
+        Parallel.map(task_names_and_paths,
+                     in_threads: THREAD_COUNT) do |task_name, task_path|
+          Task.new(self, task_name, task_path, @client)
         end
     end
+
+    private
+
+    def fetch_task_names_and_paths
+      body = 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

@@ -1,22 +1,37 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module GreenDay
   class Task
-    attr_reader :contest, :code, :sample_answers
+    extend Forwardable
+    delegate get_parsed_body: :@client
+
+    attr_reader :contest, :name, :path, :sample_answers
 
-    def initialize(contest, code, client)
+    def initialize(contest, name, path, client)
+      @client = client
       @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 = 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.5.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.5.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -28,16 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/publish_to_rubygems.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -284,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: CLI tool for AtCoder and Ruby