green_day 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dec8f7c9c721bbd5e652f18959de01d9a90d6ec3a1d7caf57eed76aa31ad9378
-  data.tar.gz: c2afef234af2730e3a2ac2fff659dcfc85489b0292d2395f6382bab3a73d2f37
+  metadata.gz: 36a5e97dca37d3a8c3763cc0ac411b143c70a9bb9371b415a0e64828141613fb
+  data.tar.gz: 4c3101ee0d718b79907850334211d6f92671c2817322eb22862c74077eaa8a40
 SHA512:
-  metadata.gz: 9a6f108363c5e35d96b5739184318260d64da36187a259449ac5fde602d6d70a16d7bfab01f64f4a8794fcbbfa49322bdfb13ae408a7ffd0299820a5eac2f806
-  data.tar.gz: 9e6d545f778fd361853c082fcd1d67564d59edef0bbe88ac2f47189c0bcc1b1c4603f35374cf0d8728c455b8c0ed33f18e96eb54ddf5e8432a72a688d1684de8
+  metadata.gz: ea1311da8032a5403d8fccb3e53acb74e5bd36b443d9e985b3d79a8a8dab47151151a5413b645c4ff8f98290011a970daece21f2329727b6f6511878ce75740b
+  data.tar.gz: 65683e77ffb9e1beb340a2131ab0bd60b92e35276cafd4740f6ce1df5ca165c77b4d1ab72dbaccaba9067ef17824d2fea47ef61b500d8ec2cd75a233252aea98

data/.github/workflows/ruby.yml

@@ -12,17 +12,23 @@ jobs:
       matrix:
         ruby:
           - 2.7.1
+          - 3.0.0
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Rspec with rake
+      - name: bundle install
+        run: bundle install
+      - name: Rubocop
+        run: bundle exec rubocop
+      - name: 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"
+      
+
+

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  
+Automatically create workspace and tests for Atcoder contest  
 （日本語で解説した記事は[こちら](https://qiita.com/QWYNG/items/0e2e6b72bd1969d0d751))
 ## Installation
 

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
@@ -30,11 +31,14 @@ Gem::Specification.new do |spec|
   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'
 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,39 @@ 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)
+        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|
+      File.open(spec_file_path(task), 'w') do |f|
         f.write(test)
       end
     end
 
-    def submit_file_path(contest_name, task)
-      "#{contest_name}/#{task.code}.rb"
+    def submit_file_path(task)
+      "#{task.contest.name}/#{task.code}.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.code}_spec.rb"
     end
   end
 end

data/lib/green_day/task.rb

@@ -2,25 +2,21 @@
 
 module GreenDay
   class Task
-    attr_reader :contest, :code, :input_output_hash
+    attr_reader :contest, :code, :sample_answers
+
     def initialize(contest, code, client)
       @contest = contest
       @code = code
-      @input_output_hash = create_input_output_hash(client)
+      @sample_answers = create_sample_answers(client)
     end
 
     private
 
-    def create_input_output_hash(client)
+    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.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - qwyng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -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,34 @@ 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'
 description: CLI tool for AtCoder and Ruby
 email:
 - ikusawasi@gmail.com
@@ -204,7 +246,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
@@ -222,14 +263,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.2.3
 signing_key: 
 specification_version: 4
 summary: CLI tool for AtCoder and Ruby

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