green_day 0.9.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53785392f34ac5d93be96ca0132fef875d4b733a389e2f7d6e1a82bd1880b15a
-  data.tar.gz: 1bf1044369856380a00ac3c9009d86282011b94c3e05fe6f59d529093c5733f7
+  metadata.gz: 7a382b709216ac2a7d03cbfd4ffe96a8922d3057306129182c47598202e89db5
+  data.tar.gz: 16a3e1f16df20721da2c285c066f5d3546beb83e01158bc5c60f91bd06532cfb
 SHA512:
-  metadata.gz: 7d03782bc7b38addeb0c458b58b0ef863ab0f5f8f3e1af0e835522e51a3908fd19dbd4433d1e8c6e37d4a58a99f77a8e3b33866816d7d9d0e059ec2a95f060f6
-  data.tar.gz: 746dba21f2edf01245e1e33f7717bd9f513feaa2ed92629f9ebb58c1106752baab462eafc45916e769bf25a0f46c4030aa755b7ba69b653e2bf52188f5427081
+  metadata.gz: 2f2c9365890badf1c788e73a1e8eb38e25bf15188cbfbd4adcab43fd701fcb5e706d64a10057ed14d070ea45da944be9ec6d5f980cb8fe8fab1e9b53dbc6c9ee
+  data.tar.gz: 80c5a108f8909d61f2f8d35718d6f2020da1dd5c233f1c17195680cb41a17895397e454dcc9c8e349a34d39168c2b3aa278c39fdccef84756bec20003215b5c4

data/README.md

@@ -21,17 +21,17 @@ Or install it yourself as:
 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`
-    
+
 This command creates directory and spec.
-   
+
     $ bundle exec green_day new <contest-name>
 
-For example 
-   
+For example
+
     $ bundle exec green_day new abc150
-   
+
    ```
     abc150
     ├── A.rb
@@ -48,69 +48,44 @@ For example
         ├── E_spec.rb
         └── F_spec.rb
    ```
-   
-   Example of output spec
+
+### Example of output spec
 
 ```ruby
 RSpec.describe 'abc150/A.rb' do
   it 'test with "2 900\n"' do
-    if ENV['GD_REPL']
-      File.chmod(0o755, 'abc150/A.rb')
-      system(%q(expect -c 'set timeout 2; spawn ruby abc150/A.rb; send "2 900\n\\004"; interact'))
-    else
-      io = IO.popen('ruby abc150/A.rb', 'w+')
-      io.puts("2 900\n")
-      io.close_write
-      expect(io.readlines.join).to eq("Yes\n")
-    end
+    io = IO.popen('ruby abc150/A.rb', 'w+')
+    io.puts("2 900\n")
+    io.close_write
+    expect(io.readlines.join).to eq("Yes\n")
   end
 
   it 'test with "1 501\n"' do
-    if ENV['GD_REPL']
-      File.chmod(0o755, 'abc150/A.rb')
-      system(%q(expect -c 'set timeout 2; spawn ruby abc150/A.rb; send "1 501\n\\004"; interact'))
-    else
-      io = IO.popen('ruby abc150/A.rb', 'w+')
-      io.puts("1 501\n")
-      io.close_write
-      expect(io.readlines.join).to eq("No\n")
-    end
+    io = IO.popen('ruby abc150/A.rb', 'w+')
+    io.puts("1 501\n")
+    io.close_write
+    expect(io.readlines.join).to eq("No\n")
   end
 
   it 'test with "4 2000\n"' do
-    if ENV['GD_REPL']
-      File.chmod(0o755, 'abc150/A.rb')
-      system(%q(expect -c 'set timeout 2; spawn ruby abc150/A.rb; send "4 2000\n\\004"; interact'))
-    else
-      io = IO.popen('ruby abc150/A.rb', 'w+')
-      io.puts("4 2000\n")
-      io.close_write
-      expect(io.readlines.join).to eq("Yes\n")
-    end
+    io = IO.popen('ruby abc150/A.rb', 'w+')
+    io.puts("4 2000\n")
+    io.close_write
+    expect(io.readlines.join).to eq("Yes\n")
   end
 
 end
-
 ```
-## Debugging with REPL
-You can debug your code with sample input and REPL by setting `GD_REPL` environment variable.
 
-```
-$ GD_REPL=1 bundle exec rspec abc150/spec/A_spec.rb
-
-abc150/A.rb
-spawn ruby abc150/A.rb
-2 900
-
-From: abc150/A.rb @ line 2 :
+### template
+You can use template file for creating spec.
+GreenDay uses `template.rb` in the working directory as a template file.
 
-    1: a, b = gets.split.map(&:to_i)
- => 2: binding.irb
-    3: puts "Yes"
-
-irb(main):001:0> a
-=> 2
+```ruby
+requires "math"
+x = gets.to_i
 ```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/green_day/atcoder_client.rb

@@ -29,6 +29,12 @@ module GreenDay
 
     def get_parsed_body(path)
       res = conn.get(path)
+      if res.status == 429
+        puts "429 error with #{path} retrying..."
+        sleep 1
+        return get_parsed_body(path)
+      end
+
       Nokogiri::HTML.parse(res.body)
     end
 

data/lib/green_day/cli.rb

@@ -1,12 +1,11 @@
 # 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 'task_source_to_file_worker'
 
 module GreenDay
   class Cli < Thor
@@ -29,33 +28,8 @@ module GreenDay
       contest = Contest.new(contest_name)
       FileUtils.makedirs("#{contest.name}/spec")
 
-      contest.tasks.map do |task|
-        create_files_in_thread(task)
-      end.each(&:join)
-
+      TaskSourceToFileWorker.run_threads(contest.task_sources).each(&:join)
       puts "Successfully created #{contest.name} directory".colorize(:green)
     end
-
-    private
-
-    def create_files_in_thread(task)
-      Thread.new do
-        create_task_file(task)
-        create_task_spec_file(task)
-      end
-    end
-
-    def create_task_file(task)
-      FileUtils.touch(task_file_name(task))
-    end
-
-    def create_task_spec_file(task)
-      test_content = TestBuilder.build_test(task_file_name(task), task.sample_answers)
-      File.write("#{task.contest.name}/spec/#{task.name}_spec.rb", test_content)
-    end
-
-    def task_file_name(task)
-      "#{task.contest.name}/#{task.name}.rb"
-    end
   end
 end

data/lib/green_day/contest.rb

@@ -4,21 +4,15 @@ require_relative 'task'
 
 module GreenDay
   class Contest
-    attr_reader :name, :tasks
+    TaskSource = Struct.new(:name, :path, :contest_name)
+    attr_reader :name, :task_sources
 
     def initialize(contest_name)
       @name = contest_name
 
-      @tasks = fetch_task_names_and_paths.map.with_index do |(task_name, task_path), i|
-        if !i.zero? && (i % 10).zero? && !ENV['CI']
-          puts 'Sleeping 2 second to avoid 429 error'
-          sleep 2
-        end
-
-        Thread.new do
-          Task.new(self, task_name, task_path)
-        end
-      end.map(&:value)
+      @task_sources = fetch_task_names_and_paths.map do |name, path|
+        TaskSource.new(name, path, @name)
+      end
     end
 
     private

data/lib/green_day/task.rb

@@ -2,21 +2,43 @@
 
 module GreenDay
   class Task
-    attr_reader :contest, :name, :path, :sample_answers
+    SampleAnswer = Struct.new(:input, :output)
+    attr_reader :name, :path, :contest_name
 
-    def initialize(contest, name, path)
-      @contest = contest
+    def initialize(name, path, contest_name)
       @name = name
       @path = path
-      @sample_answers = create_sample_answers_hash
+      @contest_name = contest_name
+    end
+
+    def create_file
+      template = if File.exist?(GreenDay::TEMPLATE_FILE_PATH)
+                   File.read(GreenDay::TEMPLATE_FILE_PATH)
+                 end
+
+      File.write(file_name, template)
+    end
+
+    def file_name
+      "#{contest_name}/#{name}.rb"
+    end
+
+    def create_spec_file
+      test_content = TestBuilder.build_test(
+        file_name,
+        sample_answers
+      )
+      File.write("#{contest_name}/spec/#{name}_spec.rb", test_content)
     end
 
     private
 
-    def create_sample_answers_hash
+    def sample_answers
       input_samples, output_samples = fetch_inputs_and_outputs
 
-      input_samples.zip(output_samples).to_h
+      input_samples.zip(output_samples).map do |input, output|
+        SampleAnswer.new(input, output)
+      end
     end
 
     def fetch_inputs_and_outputs

data/lib/green_day/task_source_to_file_worker.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative 'test_builder'
+
+module GreenDay
+  class TaskSourceToFileWorker
+    def self.run_threads(task_sources)
+      new(task_sources).run_threads
+    end
+
+    def initialize(task_sources)
+      @task_sources = task_sources
+    end
+
+    def run_threads
+      @task_sources.map.with_index do |task_source, i|
+        # avoid 429 error
+        sleep 1 if (i % 7).zero? && !i.zero?
+
+        Thread.new do
+          task = Task.new(task_source.name,
+                          task_source.path,
+                          task_source.contest_name)
+          task.create_file
+          task.create_spec_file
+        end
+      end
+    end
+  end
+end

data/lib/green_day/test_builder.rb

@@ -4,31 +4,24 @@ module GreenDay
   module TestBuilder
     module_function
 
-    def build_test(submit_file_path, input_output_hash)
+    def build_test(submit_file_path, sample_answers)
       <<~SPEC
         RSpec.describe '#{submit_file_path}' do
-        #{input_output_hash.map { |input, output| build_example(submit_file_path, input, output) }.join("\n")}
+        #{sample_answers.map { |sample_answer| build_example(submit_file_path, sample_answer.input, sample_answer.output) }.join("\n")}
         end
       SPEC
     end
 
-    # rubocop:disable Metrics/AbcSize
     def build_example(submit_file_path, input, output)
       <<~SPEC
         #{tab}it 'test with #{unify_cr_lf(input).chomp}' do
-        #{tab}#{tab}if ENV['GD_REPL']
-        #{tab}#{tab}#{tab}File.chmod(0o755, '#{submit_file_path}')
-        #{tab}#{tab}#{tab}system(%q(expect -c 'set timeout 2; spawn ruby #{submit_file_path}; send #{unify_cr_lf("#{input}\\004")}; interact'))
-        #{tab}#{tab}else
-        #{tab}#{tab}#{tab}io = IO.popen('ruby #{submit_file_path}', 'w+')
-        #{tab}#{tab}#{tab}io.puts(#{unify_cr_lf(input)})
-        #{tab}#{tab}#{tab}io.close_write
-        #{tab}#{tab}#{tab}expect(io.readlines.join).to eq(#{unify_cr_lf(output)})
-        #{tab}#{tab}end
+        #{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)})
         #{tab}end
       SPEC
     end
-    # rubocop:enable Metrics/AbcSize
 
     def unify_cr_lf(string)
       return unless string # たまに画像で例を出してくるとsampleの文字がなくなる

data/lib/green_day/version.rb

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

data/lib/green_day.rb

@@ -5,4 +5,5 @@ require_relative 'green_day/cli'
 
 module GreenDay
   class Error < StandardError; end
+  TEMPLATE_FILE_PATH = File.expand_path('green_day/template.rb', __dir__)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_day
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
 platform: ruby
 authors:
 - qwyng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -107,6 +107,7 @@ files:
 - lib/green_day/cli.rb
 - lib/green_day/contest.rb
 - lib/green_day/task.rb
+- lib/green_day/task_source_to_file_worker.rb
 - lib/green_day/test_builder.rb
 - lib/green_day/version.rb
 homepage: https://github.com/QWYNG/green_day
@@ -116,7 +117,7 @@ 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: CLI tool for AtCoder and Ruby
 test_files: []