green_day 0.1.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa59fb5ccbedf8faf233f5519d89b260b6885161754a96744a28e5419b689aa7
-  data.tar.gz: 89c55070f70ac636b94c5259c979d5b3ea1571d68cb0dbb381177ae003558bd8
+  metadata.gz: 06bcfc1dc4b42165710a01e2d1d4836e0ad829a4b33040d5f35613b836ce15af
+  data.tar.gz: 39899f57ae69c44e702b7a9a0990e332d8842867584fe97462f01d89edcae461
 SHA512:
-  metadata.gz: 383b488e31d8b09339485ff01551e6b3fa9a940eb6ceb55991048cf64adfeb6bfacdd9af24e5be69ee1794ccd8af9fedfbe3f775d4ddb7e5fc4575b5625070d1
-  data.tar.gz: 74d9dc5ae1b1a1a0147cfb91918e4b85ed203cca1a21a764977e23c70da2e68ea051df8c01d1706c7424c3500bc7bde62dec1cd9cdc4313e780ad9c3b8b40506
+  metadata.gz: 54eacd28a4a76464d6a740bc6b670ecf33c8f264cc33b3e32cd8943d6df3f5e85d822c21f09712cf339e0c5d8e2f43626a9d845c8f84c31e0d8b1e818aecfc8a
+  data.tar.gz: 16e9b1390526d3d55ea2eeaef27f964844aaf23997236f108efecbc8bd2f781c04e04bef3b3a100248072205b075425eb09d7eb016cdbab7ddade4c3598cda2f

data/.github/workflows/ruby.yml

@@ -1,60 +1,34 @@
 name: Ruby
 
-on: [push]
+on:
+  pull_request:
+  push:
+    branches: [ master ]
 
 jobs:
-  build:
-
-    runs-on: ${{ matrix.runner }}
-
+  rspec:
+    runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
-
       matrix:
         ruby:
-          - 2.3.3
-          - 2.7.0
-        include:
-          - ruby: 2.3.3
-            runner: ubuntu-16.04
-          - ruby: 2.7.0
-            runner: ubuntu-latest
-
+          - 2.7.1 # AtCoder公式が使用しているrubyは2.7.1
+          - 3.1.0
     steps:
       - uses: actions/checkout@v2
-
-      - name: Set up rbenv
-        uses: masa-iwasaki/setup-rbenv@1.1.0
-
-      - name: Cache RBENV_ROOT
-        uses: actions/cache@v1
-        id: cache_rbenv
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
         with:
-          path: ~/.rbenv/versions
-          key: v1-rbenv-${{ runner.os }}-${{ matrix.ruby }}
-
-      - name: Reinstall libssl-dev
-        run: |
-          set -xe
-          sudo apt-get remove -y libssl-dev
-          sudo apt-get install -y libssl-dev=1.0.2g-1ubuntu4.15
-        if: matrix.runner == 'ubuntu-16.04'
-
-      - name: Install Ruby
-        env:
-          RBENV_VERSION: ${{ matrix.ruby }}
-        run: |
-          set -xe
-          eval "$(rbenv init -)"
-          rbenv install -s $RBENV_VERSION
-          gem install bundler || true
-
-      - name: test with Rake
+          ruby-version: ${{ matrix.ruby }}
+      - name: bundle install
+        run: bundle install
+      - name: Rubocop
+        run: bundle exec rubocop
+      - name: Rspec
         env:
           USER_NAME: ${{ secrets.USER_NAME }}
           PASSWORD: ${{ secrets.PASSWORD }}
-          RBENV_VERSION: ${{ matrix.ruby }}
-        run: |
-          eval "$(rbenv init -)"
-          bundle install --jobs 4 --retry 3
-          bundle exec rake
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: script -e -c "rake spec"
+      
+
+

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: 4
+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
 
@@ -18,11 +18,11 @@ Or install it yourself as:
     $ gem install green_day
 
 ## Usage
-login(this command stores your cookie as `cookie-store` in current directory)
+login(this command stores your cookie as `.cookie-store` in current directory)
 
     $ bundle exec green_day login
     
-If you want to delete session, remove `cookie-store`
+If you want to delete session, remove `.cookie-store`
     
 This command creates directory and spec.
    
@@ -86,8 +86,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

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
@@ -25,13 +26,21 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'colorize'
   spec.add_dependency 'faraday', '< 1.0'
   spec.add_dependency 'faraday-cookie_jar'
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'rspec', '~> 3.0'
+  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

@@ -8,7 +8,7 @@ require 'nokogiri'
 module GreenDay
   class AtcoderClient
     ATCODER_ENDPOINT = 'https://atcoder.jp'
-    COOKIE_DB = 'cookie-store'
+    COOKIE_FILE_NAME = '.cookie-store'
     attr_reader :client, :cookie_jar
 
     def initialize
@@ -30,7 +30,7 @@ module GreenDay
 
       # 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)
+      ('A'..'ZZ').to_a.shift(tasks_size)
     end
 
     def fetch_inputs_and_outputs(contest, task)
@@ -57,14 +57,20 @@ module GreenDay
         raise Error, CGI.unescape(select_flash_cookie.value).split('.').shift
       end
 
-      cookie_jar.save(COOKIE_DB)
+      cookie_jar.save(COOKIE_FILE_NAME)
     end
 
     private
 
     def create_or_load_cookie_jar
       jar = HTTP::CookieJar.new
-      jar.load(COOKIE_DB) if File.exist?(COOKIE_DB)
+      if File.exist?(COOKIE_FILE_NAME)
+        jar.load(COOKIE_FILE_NAME)
+      elsif File.exist?('cookie-store')
+        warn 'cookie-store needs rename .cookie-store'
+        jar.load('cookie-store')
+      end
+
       jar
     end
 

data/lib/green_day/cli.rb

@@ -1,65 +1,63 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'parallel'
+require 'colorize'
+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!
+      username = $stdin.gets(chomp: true)
       print 'password:'
-      password = STDIN.gets.chomp!
+      password = $stdin.noecho { |stdin| stdin.gets(chomp: true) }.tap { puts }
 
       AtcoderClient.new.login(username, password)
+      puts(
+        "Successfully created #{AtcoderClient::COOKIE_FILE_NAME}"
+        .colorize(:green)
+      )
     end
 
     desc 'new [contest name]', 'create contest workspace and spec'
     def new(contest_name)
-      contest = Contest.new(contest_name)
-      FileUtils.makedirs("#{contest_name}/spec")
+      contest = Contest.new(contest_name, AtcoderClient.new)
+      FileUtils.makedirs("#{contest.name}/spec")
 
-      contest.tasks.each do |task|
-        task_code = task.code
-
-        create_submit_file!(contest_name, task_code)
-        create_spec_file!(contest_name, task_code, task.input_output_hash)
+      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)
     end
 
     private
 
-    def create_submit_file!(contest_name, task_code)
-      File.open(submit_file_path(contest_name, task_code), 'w') do |f|
-        f.write(SnippetBuilder.build)
-      end
-
-      true
+    def create_submit_file(task)
+      File.open(submit_file_path(task), 'w')
     end
 
-    def create_spec_file!(contest_name, task_code, input_output_hash)
+    def create_spec_file(task)
       test =
         TestBuilder.build_test(
-          submit_file_path(contest_name, task_code),
-          input_output_hash
+          submit_file_path(task),
+          task.sample_answers
         )
-      File.open(spec_file_path(contest_name, task_code), 'w') do |f|
-        f.write(test)
-      end
-
-      true
+      File.write(spec_file_path(task), test)
     end
 
-    def submit_file_path(contest_name, task_code)
-      "#{contest_name}/#{task_code}.rb"
+    def submit_file_path(task)
+      "#{task.contest.name}/#{task.code}.rb"
     end
 
-    def spec_file_path(contest_name, task_code)
-      "#{contest_name}/spec/#{task_code}_spec.rb"
+    def spec_file_path(task)
+      "#{task.contest.name}/spec/#{task.code}_spec.rb"
     end
   end
 end

data/lib/green_day/contest.rb

@@ -7,14 +7,16 @@ module GreenDay
   class Contest
     attr_reader :atcoder_client, :name, :tasks
 
-    def initialize(contest_name)
-      client = AtcoderClient.new
+    def initialize(contest_name, client)
       raise GreenDay::Error 'cant find contest' unless client.contest_exist?(contest_name)
 
       @name = contest_name
-      @tasks = client.fetch_task_codes(self).map do |task_code|
-        Task.new(self, task_code)
-      end
+
+      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)
+        end
     end
   end
 end

data/lib/green_day/task.rb

@@ -2,27 +2,21 @@
 
 module GreenDay
   class Task
-    attr_reader :contest, :code, :input_output_hash
-    def initialize(contest, code)
+    attr_reader :contest, :code, :sample_answers
+
+    def initialize(contest, code, client)
       @contest = contest
       @code = code
-      @input_output_hash = create_input_output_hash
+      @sample_answers = create_sample_answers(client)
     end
 
     private
 
-    def create_input_output_hash
-      client = AtcoderClient.new
-
+    def create_sample_answers(client)
       input_samples, output_samples =
         client.fetch_inputs_and_outputs(contest, self)
 
-      hash = {}
-      input_samples.zip(output_samples).each do |input, output|
-        hash[input] = output
-      end
-
-      hash
+      input_samples.zip(output_samples).to_h
     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.1.9'
+  VERSION = '0.4.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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.4.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: parallel
   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
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ 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
@@ -94,6 +122,20 @@ dependencies:
     - - "~>"
       - !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
@@ -122,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
@@ -136,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
@@ -144,7 +242,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.sample"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -162,7 +259,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
@@ -172,6 +268,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:
@@ -180,14 +277,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.1.6
 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,14 +0,0 @@
-# frozen_string_literal: true
-
-module SnippetBuilder
-  ARRAY_INPUT_SNIPPET = 'n = gets.split.map(&:to_i)'
-  MULTIPLE_LINE_INPUT_SNIPPET = 'array = readlines.map(&:chomp!).map { |e| e.split.map(&:to_i) }'
-
-  module_function
-
-  def build
-    constants
-      .map { |snippet| '# ' + eval(snippet.to_s) }
-      .join("\n") + "\n"
-  end
-end