green_day 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb303ceba54c7b5585ffaed2dba8a9a7edecfee68b59959df974232d862523e
-  data.tar.gz: 4fc51ebca94c8723c6f2781abd3937cbf428c56e371617736832d2f12e215233
+  metadata.gz: cb3f3fbe2293b67258b8ac02f28db7c0660eb4f7a7a18d07816bf4b3e1e616df
+  data.tar.gz: a13045a2ffc2266ccd2ebbd4eea4ad99605af4f24de9fd3a1b2b503ab718b872
 SHA512:
-  metadata.gz: c737e153a711c5bffee4938df8d63a2ea15397411b1c6c09b289eb2af43b0e8ff3312d5e3c76de7be6ca3b70e3587d8b293d6c241c0ccf8f992c3702d023410a
-  data.tar.gz: d798edaf3d568a90e29424e9e1595a1bcc24e206accfaad63b12c6f6692382a6495abd5d0f5fb21b4f4d48e445feeb23c36d638c12158b3b794606a437817f29
+  metadata.gz: aa65f82bc5b568a4d954b5a1546020f327b06ece50089d905c0877ae08ba08780456668dc6f219830284c86e012318251714e2319812714a7f9a9a17de91fd6a
+  data.tar.gz: 1c08eeacdc7e22142ff5522f2bac98af0c68914d62ccf629bda4b60a5d3d10385ed8cec972687b7123bc4cc1070a81c41c9a90995f1ab6ed9169a4f2ca98cd54

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

data/.rubocop.yml

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

data/green_day.gemspec

@@ -31,7 +31,8 @@ Gem::Specification.new do |spec|
   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/cli.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'io/console'
 require_relative 'atcoder_client'
 require_relative 'contest'
 require_relative 'test_builder'
+require_relative 'snippet_builder'
 
 module GreenDay
   class Cli < Thor
@@ -12,7 +12,8 @@ module GreenDay
     def login
       print 'username:'
       username = STDIN.gets.chomp!
-      password = STDIN.getpass('password:').chomp!
+      print 'password:'
+      password = STDIN.gets.chomp!
 
       AtcoderClient.new.login(username, password)
     end
@@ -23,14 +24,36 @@ module GreenDay
       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)
+        create_submit_file!(contest_name, task)
+        create_spec_file!(contest_name, task)
+      end
+    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
 
-        File.open("#{contest.name}/spec/#{task_code}_spec.rb", 'w') do |f|
-          f.write(test)
-        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/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/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.5'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -94,6 +94,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 +126,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 +176,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