green_day 0.1.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f5b0679f10107fc35099cf83129628c78a00ae6eba65897a2220834be605a31
-  data.tar.gz: 46a41ff725c660eccf8561048da49cfb05997ec8cbf7b24c58f9922fef87b166
+  metadata.gz: dec8f7c9c721bbd5e652f18959de01d9a90d6ec3a1d7caf57eed76aa31ad9378
+  data.tar.gz: c2afef234af2730e3a2ac2fff659dcfc85489b0292d2395f6382bab3a73d2f37
 SHA512:
-  metadata.gz: ecc4dfeed26338f8bc22ad7e0e6380b82a523b86d3f0ae7352be6567027869baa1ff00f5c6694aa886145d863c9e30cc2cf816718d4ff9cb8d0516f4df1a6a28
-  data.tar.gz: 3651746ff097ccc98e359a3fe5ee941cfe2aefede5969990171d0d7e79bf86ae2edafd3ea6a2bb46eea9673fa54cbb6db8abaa36534768bc17763689da0c2b70
+  metadata.gz: 9a6f108363c5e35d96b5739184318260d64da36187a259449ac5fde602d6d70a16d7bfab01f64f4a8794fcbbfa49322bdfb13ae408a7ffd0299820a5eac2f806
+  data.tar.gz: 9e6d545f778fd361853c082fcd1d67564d59edef0bbe88ac2f47189c0bcc1b1c4603f35374cf0d8728c455b8c0ed33f18e96eb54ddf5e8432a72a688d1684de8

data/.github/workflows/ruby.yml

@@ -1,60 +1,28 @@
 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
     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: actions/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: Rspec with rake
         env:
           USER_NAME: ${{ secrets.USER_NAME }}
           PASSWORD: ${{ secrets.PASSWORD }}
-          RBENV_VERSION: ${{ matrix.ruby }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
-          eval "$(rbenv init -)"
           bundle install --jobs 4 --retry 3
-          bundle exec rake
+          script -e -c rake

data/.rubocop.yml

@@ -10,4 +10,4 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
   - 'spec/*'
-
+  - 'green_day.gemspec'

data/README.md

@@ -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.
    

data/green_day.gemspec

@@ -25,13 +25,16 @@ 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 'parallel'
   spec.add_dependency 'rspec', '~> 3.0'
   spec.add_dependency 'thor'
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'dotenv'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rubocop'
 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
@@ -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,37 +1,68 @@
 # 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)
+      contest = Contest.new(contest_name, AtcoderClient.new)
       FileUtils.makedirs("#{contest_name}/spec")
 
-      contest.tasks.each do |task|
-        task_code = task.code
-        answer = File.open("#{contest_name}/#{task_code}.rb", 'w')
-        test = TestBuilder.build_test(answer, task.input_output_hash)
+      Parallel.each(contest.tasks) do |task|
+        create_submit_file!(contest_name, task)
+        create_spec_file!(contest_name, task)
+      end
+
+      puts "Successfully created #{contest_name} directory".colorize(:green)
+    end
 
-        File.open("#{contest.name}/spec/#{task_code}_spec.rb", 'w') do |f|
-          f.write(test)
-        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
     end
+
+    def create_spec_file!(contest_name, task)
+      test =
+        TestBuilder.build_test(
+          submit_file_path(contest_name, task),
+          task.input_output_hash
+        )
+      File.open(spec_file_path(contest_name, task), 'w') do |f|
+        f.write(test)
+      end
+    end
+
+    def submit_file_path(contest_name, task)
+      "#{contest_name}/#{task.code}.rb"
+    end
+
+    def spec_file_path(contest_name, task)
+      "#{contest_name}/spec/#{task.code}_spec.rb"
+    end
   end
 end

data/lib/green_day/contest.rb

@@ -7,13 +7,12 @@ 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)
+      @tasks = Parallel.map(client.fetch_task_codes(self)) do |task_code|
+        Task.new(self, task_code, client)
       end
     end
   end

data/lib/green_day/snippet_builder.rb

@@ -0,0 +1,17 @@
+# 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

data/lib/green_day/task.rb

@@ -3,17 +3,15 @@
 module GreenDay
   class Task
     attr_reader :contest, :code, :input_output_hash
-    def initialize(contest, code)
+    def initialize(contest, code, client)
       @contest = contest
       @code = code
-      @input_output_hash = create_input_output_hash
+      @input_output_hash = create_input_output_hash(client)
     end
 
     private
 
-    def create_input_output_hash
-      client = AtcoderClient.new
-
+    def create_input_output_hash(client)
       input_samples, output_samples =
         client.fetch_inputs_and_outputs(contest, self)
 

data/lib/green_day/test_builder.rb

@@ -4,20 +4,20 @@ module GreenDay
   module TestBuilder
     module_function
 
-    def build_test(answer, input_output_hash)
+    def build_test(submit_file_path, input_output_hash)
       <<~SPEC
         require 'rspec'
 
         RSpec.describe 'test' do
-        #{input_output_hash.map { |input, output| build_example(answer, input, output) }.join("\n")}
+        #{input_output_hash.map { |input, output| build_example(submit_file_path, input, output) }.join("\n")}
         end
       SPEC
     end
 
-    def build_example(answer, input, output)
+    def build_example(submit_file_path, input, output)
       <<~SPEC
         #{tab}it 'test with #{unify_cr_lf(input)}' do
-        #{tab}#{tab}io = IO.popen("ruby #{answer.path}", "w+")
+        #{tab}#{tab}io = IO.popen("ruby #{submit_file_path}", "w+")
         #{tab}#{tab}io.puts(#{unify_cr_lf(input)})
         #{tab}#{tab}io.close_write
         #{tab}#{tab}expect(io.readlines.join).to eq(#{unify_cr_lf(output)})
@@ -26,6 +26,8 @@ module GreenDay
     end
 
     def unify_cr_lf(string)
+      return unless string # たまに画像で例を出してくるとsampleの文字がなくなる
+
       string.gsub(/\R/, "\n").dump
     end
 

data/lib/green_day/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-07-16 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
@@ -52,6 +66,20 @@ 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: rspec
   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
@@ -112,16 +154,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +204,7 @@ 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