green_day 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dec8f7c9c721bbd5e652f18959de01d9a90d6ec3a1d7caf57eed76aa31ad9378
-  data.tar.gz: c2afef234af2730e3a2ac2fff659dcfc85489b0292d2395f6382bab3a73d2f37
+  metadata.gz: f6db900740eb86bf00384ad3f97895ecd146d5f112f96db362c28a28cbfb391f
+  data.tar.gz: c4f4a09dd97c634b671434735896294c13f5ad3992d97378db3cde64e804efae
 SHA512:
-  metadata.gz: 9a6f108363c5e35d96b5739184318260d64da36187a259449ac5fde602d6d70a16d7bfab01f64f4a8794fcbbfa49322bdfb13ae408a7ffd0299820a5eac2f806
-  data.tar.gz: 9e6d545f778fd361853c082fcd1d67564d59edef0bbe88ac2f47189c0bcc1b1c4603f35374cf0d8728c455b8c0ed33f18e96eb54ddf5e8432a72a688d1684de8
+  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,19 +10,34 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby:
-          - 2.7.1
+        ruby-version:
+          - 2.7.1 # AtCoder公式が使用しているrubyは2.7.1
+          - 3.1
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby ${{ matrix.ruby }}
-        uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Rspec with rake
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Bundle install
+        run: bundle install
+      - name: Run Rspec
         env:
           USER_NAME: ${{ secrets.USER_NAME }}
           PASSWORD: ${{ secrets.PASSWORD }}
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: |
-          bundle install --jobs 4 --retry 3
-          script -e -c rake
+        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/.gitignore

@@ -7,7 +7,6 @@
 /spec/reports/
 /tmp/
 .idea
-.env
 # rspec failure tracking
 .rspec_status
 Gemfile.lock

data/.rubocop.yml

@@ -1,4 +1,9 @@
+require: 
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
+  NewCops: enable
   Exclude:
     - 'spec/spec_helper.rb'
 Style/Documentation:
@@ -9,5 +14,11 @@ Layout/LineLength:
   Max: 90
 Metrics/BlockLength:
   Exclude:
-  - 'spec/*'
+  - 'spec/*/**'
   - 'green_day.gemspec'
+RSpec/NamedSubject:
+  Enabled: false
+RSpec/NestedGroups:
+  Max: 7
+RSpec/ExampleLength:
+  Enabled: false

data/README.md

@@ -1,5 +1,5 @@
 # GreenDay
-Automatically create workspace and tests for Atcoder contests  
+Green Day creates workspaces and tests for Atcoder contests
 （日本語で解説した記事は[こちら](https://qiita.com/QWYNG/items/0e2e6b72bd1969d0d751))
 ## Installation
 
@@ -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+")
@@ -86,8 +84,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
-You need create `.env` and set `USER_NAME` and `PASSWORD` for spec. see `env.sample`  
-Those env is already set as secret on CI.  
 Bug reports and pull requests are welcome on GitHub at https://github.com/QWYNG/green_day. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
@@ -96,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,6 +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.name          = 'green_day'
   spec.executables   = ['green_day']
   spec.version       = GreenDay::VERSION
@@ -26,15 +27,20 @@ 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 'rspec', '~> 3.0'
   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

@@ -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'..'Z').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

@@ -7,16 +7,15 @@ require 'io/console'
 require_relative 'atcoder_client'
 require_relative 'contest'
 require_relative 'test_builder'
-require_relative 'snippet_builder'
 
 module GreenDay
   class Cli < Thor
     desc 'login Atcoder', 'login Atcoder and save session'
     def login
       print 'username:'
-      username = STDIN.gets(chomp: true)
+      username = $stdin.gets(chomp: true)
       print 'password:'
-      password = STDIN.noecho { |stdin| stdin.gets(chomp: true) }.tap { puts }
+      password = $stdin.noecho { |stdin| stdin.gets(chomp: true) }.tap { puts }
 
       AtcoderClient.new.login(username, password)
       puts(
@@ -28,41 +27,37 @@ module GreenDay
     desc 'new [contest name]', 'create contest workspace and spec'
     def new(contest_name)
       contest = Contest.new(contest_name, AtcoderClient.new)
-      FileUtils.makedirs("#{contest_name}/spec")
+      FileUtils.makedirs("#{contest.name}/spec")
 
-      Parallel.each(contest.tasks) do |task|
-        create_submit_file!(contest_name, task)
-        create_spec_file!(contest_name, task)
+      Parallel.each(contest.tasks, in_threads: THREAD_COUNT) do |task|
+        create_submit_file(task)
+        create_spec_file(task)
       end
 
-      puts "Successfully created #{contest_name} directory".colorize(:green)
+      puts "Successfully created #{contest.name} directory".colorize(:green)
     end
 
     private
 
-    def create_submit_file!(contest_name, task)
-      File.open(submit_file_path(contest_name, task), 'w') do |f|
-        f.write(SnippetBuilder.build)
-      end
+    def create_submit_file(task)
+      File.open(submit_file_path(task), 'w')
     end
 
-    def create_spec_file!(contest_name, task)
+    def create_spec_file(task)
       test =
         TestBuilder.build_test(
-          submit_file_path(contest_name, task),
-          task.input_output_hash
+          submit_file_path(task),
+          task.sample_answers
         )
-      File.open(spec_file_path(contest_name, task), 'w') do |f|
-        f.write(test)
-      end
+      File.write(spec_file_path(task), test)
     end
 
-    def submit_file_path(contest_name, task)
-      "#{contest_name}/#{task.code}.rb"
+    def submit_file_path(task)
+      "#{task.contest.name}/#{task.name}.rb"
     end
 
-    def spec_file_path(contest_name, task)
-      "#{contest_name}/spec/#{task.code}_spec.rb"
+    def spec_file_path(task)
+      "#{task.contest.name}/spec/#{task.name}_spec.rb"
     end
   end
 end

data/lib/green_day/contest.rb

@@ -1,18 +1,35 @@
 # 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
-      @tasks = Parallel.map(client.fetch_task_codes(self)) do |task_code|
-        Task.new(self, task_code, client)
+
+      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)
+        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

data/lib/green_day/task.rb

@@ -1,26 +1,37 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module GreenDay
   class Task
-    attr_reader :contest, :code, :input_output_hash
-    def initialize(contest, code, client)
+    extend Forwardable
+    delegate get_parsed_body: :@client
+
+    attr_reader :contest, :name, :path, :sample_answers
+
+    def initialize(contest, name, path, client)
+      @client = client
       @contest = contest
-      @code = code
-      @input_output_hash = create_input_output_hash(client)
+      @name = name
+      @path = path
+      @sample_answers = create_sample_answers_hash
     end
 
     private
 
-    def create_input_output_hash(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 }
 
-      hash = {}
-      input_samples.zip(output_samples).each do |input, output|
-        hash[input] = output
-      end
+      inputs, outputs = samples.partition.with_index { |_sample, i| i.even? }
 
-      hash
+      [inputs, outputs]
     end
   end
 end

data/lib/green_day/test_builder.rb

@@ -6,8 +6,6 @@ module GreenDay
 
     def build_test(submit_file_path, input_output_hash)
       <<~SPEC
-        require 'rspec'
-
         RSpec.describe 'test' do
         #{input_output_hash.map { |input, output| build_example(submit_file_path, input, output) }.join("\n")}
         end

data/lib/green_day/version.rb

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

data/lib/green_day.rb

@@ -5,4 +5,5 @@ require_relative 'green_day/cli'
 
 module GreenDay
   class Error < StandardError; end
+  THREAD_COUNT = 6 # There are usually six questions on Atcoder.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 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
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !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
@@ -178,6 +192,48 @@ dependencies:
     - - ">="
       - !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
@@ -186,7 +242,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.sample"
+- ".github/workflows/publish_to_rubygems.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -204,7 +260,6 @@ files:
 - lib/green_day/atcoder_client.rb
 - lib/green_day/cli.rb
 - lib/green_day/contest.rb
-- lib/green_day/snippet_builder.rb
 - lib/green_day/task.rb
 - lib/green_day/test_builder.rb
 - lib/green_day/version.rb
@@ -214,6 +269,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/QWYNG/green_day
   source_code_uri: https://github.com/QWYNG/green_day
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -222,14 +278,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: CLI tool for AtCoder and Ruby

data/.env.sample

@@ -1,3 +0,0 @@
-# for spec
-USER_NAME=
-PASSWORD=

data/lib/green_day/snippet_builder.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module GreenDay
-  module SnippetBuilder
-    ARRAY_INPUT_SNIPPET = 'gets.split.map(&:to_i)'
-    MULTIPLE_LINE_INPUT_SNIPPET =
-      'readlines.map(&:chomp!).map { |e| e.split.map(&:to_i) }'
-
-    module_function
-
-    def build
-      [ARRAY_INPUT_SNIPPET, MULTIPLE_LINE_INPUT_SNIPPET]
-        .map { |snippet| '# ' + snippet }
-        .join("\n") + "\n"
-    end
-  end
-end