newsman 0.1.14 → 0.2.0

data/lib/newsman/report.rb

@@ -1,8 +1,29 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# Copyright (c) 2024 Volodya Lombrozo
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# This class builds entire report based on issues and pull requests passed.
 class Report
-  def initialize(user, position, title, additional: ReportItems.new([],[]))
+  def initialize(user, position, title, additional: ReportItems.new([], []))
     @user = user
     @position = position
     @title = title
@@ -10,14 +31,30 @@ class Report
   end
 
   def build(achievements, plans, risks, date)
-    start = "From: #{@user}\nSubject: #{week_of_a_year(@title,
-                                               date)}\n\nHi all,\n\nLast week achievements:\n#{achievements}\n\nNext week plans:\n#{plans}\n\nRisks:\n#{risks}\n\nBest regards,\n#{@user}\n#{@position}\n#{date}"
-
-    finish = ''
-    if !@additional.empty?
-      finish = "\n------\n" + @additional.to_s
-    end
-    return start + finish;
+    <<~TEMPLATE
+      From: #{@user}
+      Subject: #{week_of_a_year(@title, date)}
+
+      Hi all,
+
+      Last week achievements:
+      #{achievements}
+
+      Next week plans:
+      #{plans}
+
+      Risks:
+      #{risks}
+
+      Best regards,
+      #{@user}
+      #{@position}
+      #{date}
+    TEMPLATE
+  end
+
+  def append_additional(report)
+    "#{report}\n#{"------\n#{@additional}" unless @additional.empty?}"
   end
 end
 
@@ -26,9 +63,8 @@ def week_of_a_year(project, today)
   "WEEK #{number} #{project}"
 end
 
-
+# Report items inner class.
 class ReportItems
-  
   def initialize(prs, issues)
     @prs = prs || []
     @issues = issues || []
@@ -41,7 +77,7 @@ class ReportItems
 
   def to_s
     prs_list = @prs.map(&:detailed_title).map { |obj| " - #{obj}\n" }.join
-    issues_list = @issues.map(&:detailed_title).map { |obj| " - #{obj}\n" }.join 
-    return "Closed Pull Requests:\n#{prs_list}\nOpen Issues:\n#{issues_list}"
+    issues_list = @issues.map(&:detailed_title).map { |obj| " - #{obj}\n" }.join
+    "Closed Pull Requests:\n#{prs_list}\nOpen Issues:\n#{issues_list}"
   end
 end

data/lib/newsman/stdout_output.rb

@@ -1,5 +1,27 @@
 # frozen_string_literal: true
 
+#
+# Copyright (c) 2024 Volodya Lombrozo
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# This class prints report to a console.
 class Stdout
   def print(report)
     puts 'Print a report to stdout'

data/lib/newsman/txt_output.rb

@@ -1,5 +1,26 @@
 # frozen_string_literal: true
 
+# Copyright (c) 2024 Volodya Lombrozo
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# This class knows how to print a report to a separate file.
 class Txtout
   def initialize(root = '.')
     @root = root

data/lib/newsman.rb

@@ -1,6 +1,27 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+#
+# Copyright (c) 2024 Volodya Lombrozo
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 require 'octokit'
 require 'openai'
 require 'dotenv'
@@ -12,7 +33,9 @@ require_relative 'newsman/txt_output'
 require_relative 'newsman/html_output'
 require_relative 'newsman/report'
 require_relative 'newsman/assistant'
+require_relative 'newsman/github'
 
+# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 def generate
   # Load all options required
   # Pay attention that some of them have default values.
@@ -26,7 +49,9 @@ def generate
       options[:username] = u
     end
     opts.on('-r', '--repository REPOSITORIES',
-            "Specify which repositories to include in a report. You can specify several repositories using a comma separator, for example: '-r objectionary/jeo-maven-plugin,objectionary/opeo-maven-plugin'") do |r|
+            'Specify which repositories to include in a report.'\
+            'You can specify several repositories using a comma separator,'\
+            "for example: '-r objectionary/jeo-maven-plugin,objectionary/opeo-maven-plugin'") do |r|
       options[:repositories] = r
     end
     opts.on('-p', '--position POSITION',
@@ -34,7 +59,8 @@ def generate
       options[:position] = p
     end
     opts.on('-o', '--output OUTPUT',
-            "Output type. Newsman prints a report to a stdout by default. You can choose another options like '-o html', '-o txt' or even '-o html'") do |o|
+            'Output type. Newsman prints a report to a stdout by default.'\
+            "You can choose another options like '-o html', '-o txt' or even '-o html'") do |o|
       options[:output] = o
     end
     opts.on('-t', '--title TITLE', 'Project Title. Empty by default') do |t|
@@ -45,118 +71,61 @@ def generate
   def options.require_option(key, message)
     raise OptionParser::MissingArgument, message if self[key].nil?
   end
-
   # Check for required options
   options.require_option(:name, 'Reporter name is required. Please specify using -n or --name.')
   options.require_option(:username, 'GitHub username is required. Please specify using -u or --username.')
   options.require_option(:repositories,
-                         'GitHub repository is required. Please specify one or several repositories using -r or --repositories.')
+                         'GitHub repository is required.'\
+                         ' Please specify one or several repositories using -r or --repositories.')
   options[:position] ||= 'Software Developer'
   options[:output] ||= 'stdout'
   options[:title] ||= ''
   all_params = options.map { |key, value| "#{key}: #{value}" }.join(', ')
   puts "Parsed parameters: #{all_params}"
-
-  # Load all required environment variables
-  Dotenv.load
-  Dotenv.require_keys('GITHUB_TOKEN', 'OPENAI_TOKEN')
-
-  # Init all required parameters
-  # Reporter Info
+  load_environment_variables
+  # Init all required parameters Reporter Info
   reporter = options[:name]
   reporter_position = options[:position]
   # GitHub
   github_username = options[:username]
   github_repositories = options[:repositories].split(',').map { |repo| "repo:#{repo}" }.join(' ')
-
   # Your GitHub personal access token
   # Make sure it has the 'repo'
   github_token = ENV['GITHUB_TOKEN']
   # Your OpenAI personal access token
   openai_token = ENV['OPENAI_TOKEN']
   # Create a GitHub client instance with your access token
-  client = Octokit::Client.new(github_token: github_token)
-  # Calculate the date one week ago
-  one_week_ago = date_one_week_ago(Date.today)
-  one_month_ago = Date.today.prev_month.strftime('%Y-%m-%d')
-  # Display pull request
-  query = "is:pr author:#{github_username} created:>=#{one_week_ago} #{github_repositories}"
-  issues_query = "is:issue is:open author:#{github_username} author:0pdd created:>=#{one_month_ago} #{github_repositories}"
-  puts "Searching pull requests for #{github_username}."
-  puts "Newsman uses the following request to GitHub to gather the required information about user activity: '#{query}'"
-  prs = []
-  pull_requests = client.search_issues(query)
-  pull_requests.items.each do |pr|
-    title = pr.title.to_s
-    description = pr.body.to_s
-    repository = pr.repository_url.split('/').last
-    puts "Found PR in #{repository}: #{title}"
-    # Create a new PullRequest object and add it to the list
-    pr = PullRequest.new(repository, title, description, url: pr.html_url)
-    prs << pr
-  end
-  raw_prs = prs
-  prs = prs.map(&:to_s).join("\n\n\n")
-  grouped_prs = raw_prs.group_by { |pr| pr.repository }
-
-  puts "Searching issues using the following query: '#{issues_query}'"
-  issues = []
-  client.search_issues(issues_query).items.each do |issue|
-    title = issue.title.to_s
-    body = issue.body.to_s
-    repository = issue.repository_url.split('/').last
-    number = issue.number.to_s
-    puts "Found issue in #{repository}:[##{number}] #{title}"
-    issues << if issue.user.login == '0pdd'
-                PddIssue.new(title, body, repository, number, url: issue.html_url)
-              else
-                Issue.new(title, body, repository, number, url: issue.html_url)
-              end
-  end
-  raw_issues = issues
-  issues = issues.map(&:to_s).join("\n\n\n")
-  grouped_issues = raw_issues.group_by { |iss| iss.repo }
-
+  github = Github.new(github_token)
+  prs = github.pull_requests(github_username, github_repositories)
+  issues = github.issues(github_username, github_repositories)
   puts "\nNow lets test some aggregation using OpenAI\n\n"
-  openai_client = OpenAI::Client.new(access_token: openai_token)
-  
   assistant = Assistant.new(openai_token)
-  
-  old_way = false
-  if old_way
-    answer = assistant.old_prev_results(prs)
-    issues_full_answer = assistant.old_next_plans(issues) 
-    risks_full_answer = assistant.old_risks(prs)
- else
-    puts "Assistant builds a report using a new approach, using groupping"
-    # Build previous results
-    answer = "" 
-    grouped_prs.each do |repository, rprs|
-      puts "Building a results report for the repository: #{repository}"
-      answer = answer + assistant.prev_results(rprs.map(&:to_s).join("\n\n\n"))
-    end
-    # Build next plans 
-    issues_full_answer = "" 
-    grouped_issues.each do |repository, rissues|
-      puts "Building a future plans report for the repository: #{repository}"
-      issues_full_answer = issues_full_answer + assistant.next_plans(rissues.map(&:to_s).join("\n\n\n"))
-    end
-    # Find risks
-    risks_full_answer = assistant.risks(prs)
+  # Build previous results
+  answer = ''
+  prs.group_by(&:repository).each do |repository, rprs|
+    puts "Building a results report for the repository: #{repository}"
+    answer = "#{answer}\n#{assistant.prev_results(join(rprs))}"
   end
-
-  full_answer = Report.new(
-    reporter, 
-    reporter_position, 
+  # Build next plans
+  issues_full_answer = ''
+  issues.group_by(&:repo).each do |repository, rissues|
+    puts "Building a future plans report for the repository: #{repository}"
+    issues_full_answer = "#{issues_full_answer}\n#{assistant.next_plans(join(rissues))}"
+  end
+  # Build report
+  report = Report.new(
+    reporter,
+    reporter_position,
     options[:title],
-    additional: ReportItems.new(raw_prs, raw_issues)
-  ).build(
-    answer, 
-    issues_full_answer,
-    risks_full_answer, 
-    Date.today
+    additional: ReportItems.new(prs, issues)
   )
-
+  full_answer = assistant.format(report.build(
+                                   answer,
+                                   issues_full_answer,
+                                   assistant.risks(join(prs)),
+                                   Date.today
+                                 ))
+  full_answer = report.append_additional(full_answer)
   output_mode = options[:output]
   puts "Output mode is '#{output_mode}'"
   if output_mode.eql? 'txt'
@@ -173,20 +142,15 @@ def generate
     output.print(full_answer)
   end
 end
+# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
-def date_one_week_ago(today)
-  # Convert today to a Date object if it's not already
-  today = Date.parse(today) unless today.is_a?(Date)
-  # Subtract 7 days to get the date one week ago
-  one_week_ago = today - 7
-  # Format the date as "YYYY-MM-DD"
-  one_week_ago.strftime('%Y-%m-%d')
-  # Return the formatted date
+def load_environment_variables
+  Dotenv.load
+  Dotenv.require_keys('GITHUB_TOKEN', 'OPENAI_TOKEN')
 end
 
-def week_of_a_year(project, today)
-  number = today.strftime('%U').to_i + 1
-  "WEEK #{number} #{project}"
+def join(items)
+  "[#{items.map(&:to_json).join(',')}]"
 end
 
 # Execute the function only if this script is run directly like `./newsman.rb`

data/test/test_assistant.rb

@@ -26,8 +26,13 @@ require_relative '../lib/newsman/assistant'
 
 class TestAssistant < Minitest::Test
   def test_creates_default_assistant
-    assistant = Assistant::new('test-token');
-    assert_equal "I'm an assistant that can work with OpenAI client. Please, use me, if you need any help. I'm using gpt-3.5-turbo, with 0.3 temperature.", assistant.say_hello
+    assistant = Assistant.new('test-token')
+    expected = <<~EXPECTED
+      I'm an assistant that can work with OpenAI client.
+      Please, use me, if you need any help.
+      I'm using gpt-3.5-turbo, with 0.3 temperature.
+    EXPECTED
+    assert_equal expected,
+                 assistant.say_hello
   end
 end
-

data/test/test_htmlout.rb

@@ -42,7 +42,7 @@ List is here:<br/>
 
 </body>
 </html>
-"
+".freeze
 
   def test_writes_to_a_html_file
     Dir.mktmpdir do |temp_dir|

data/test/test_issue.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Volodya Lombrozo
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../lib/newsman/issues'
+
+class TestIssue < Minitest::Test
+  def test_converts_issue_to_json
+    issue = Issue.new(
+      'AnnotationsApplication.java:32-35: Check default values...',
+      'TEST_BODY',
+      'jeo-maven-plugin',
+      531
+    )
+    expected = <<~JSON.chomp
+      {"number":531,"title":"AnnotationsApplication.java:32-35: Check default values...","description":"TEST_BODY","repository":"jeo-maven-plugin","url":"undefined"}
+    JSON
+    assert_equal expected, issue.to_json
+  end
+
+  def test_important_issue
+    issue = Issue.new(
+      'Important Issue Title',
+      'Important Issue Body',
+      'jeo-maven-plugin',
+      531,
+      labels: ['soon']
+    )
+    assert issue.important?
+  end
+
+  def test_unimportant_issue
+    issue = Issue.new(
+      'Unimportant Issue Title',
+      'Unimportant Issue Body',
+      'jeo-maven-plugin',
+      531,
+      labels: ['not-soon']
+    )
+    assert !issue.important?
+  end
+end

data/test/test_pdd_issue.rb

@@ -25,7 +25,7 @@ require 'minitest/autorun'
 require_relative '../lib/newsman/issues'
 
 class TestPddIssue < Minitest::Test
-  TEST_BODY = "
+  TEST_BODY = <<~BODY
     The puzzle `531-462261de` from #531 has to be resolved:
 
     https://github.com/objectionary/jeo-maven-plugin/blob/5a42b2c9f7e0ff01cbb2c4626e1dc5dc3f8aa7b8/src/it/annotations/src/main/java/org/eolang/jeo/annotations/AnnotationsApplication.java#L32-L35
@@ -34,11 +34,18 @@ class TestPddIssue < Minitest::Test
 
     Estimate: 90 minutes,  role: DEV.
 
-    If you have any technical questions, don't ask me, submit new tickets instead. The task will be \"done\" when the problem is fixed and the text of the puzzle is _removed_ from the source code. Here is more about [PDD](http://www.yegor256.com/2009/03/04/pdd.html) and [about me](http://www.yegor256.com/2017/04/05/pdd-in-action.html).
-      "
+    If you have any technical questions, don't ask me, submit new tickets instead.
+    The task will be "done" when the problem is fixed and the text of the puzzle is _removed_ from the source code.
+    Here is more about [PDD](http://www.yegor256.com/2009/03/04/pdd.html) and [about me](http://www.yegor256.com/2017/04/05/pdd-in-action.html).
+  BODY
 
-  EXPECTED_DESCRIPTION = ["     * @todo #531:90min Check default values for annotation properties.\n",
-                          "     *  We still encounter some problems with annotation processing.\n", "     *  Especially with Autowired annotation from Spring Framework.\n", "     *  It's relatively simple annotation, but it's not processed correctly.\n", "     */\n"].freeze
+  EXPECTED_DESCRIPTION = [
+    "     * @todo #531:90min Check default values for annotation properties.\n",
+    "     *  We still encounter some problems with annotation processing.\n",
+    "     *  Especially with Autowired annotation from Spring Framework.\n",
+    "     *  It's relatively simple annotation, but it's not processed correctly.\n",
+    "     */\n"
+  ].freeze
 
   def test_parses_pdd_issue
     issue = PddIssue.new('AnnotationsApplication.java:32-35: Check default values...',
@@ -46,4 +53,27 @@ class TestPddIssue < Minitest::Test
                          'jeo-maven-plugin', 531)
     assert_equal(EXPECTED_DESCRIPTION, issue.extract_real_body)
   end
+
+  def test_converts_to_json
+    issue = PddIssue.new('AnnotationsApplication.java:32-35: Check default values...',
+                         'TEST_BODY',
+                         'jeo-maven-plugin', 531)
+    expected = <<~JSON.chomp
+      {"number":531,"title":"AnnotationsApplication.java:32-35: Check default values...","description":"TEST_BODY","repository":"jeo-maven-plugin","url":"undefined"}
+    JSON
+    assert_equal(
+      expected,
+      issue.to_json
+    )
+  end
+
+  def test_important_issue
+    issue = PddIssue.new('Title', 'Body', 'jeo-maven-plugin', 531, labels: ['soon'])
+    assert issue.important?
+  end
+
+  def test_unimportant_issue
+    issue = PddIssue.new('Title', 'Body', 'jeo-maven-plugin', 531)
+    assert !issue.important?
+  end
 end

data/test/test_pull_request.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Volodya Lombrozo
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../lib/newsman/pull_request'
+
+class TestPullRequest < Minitest::Test
+  def test_converts_pr_to_json
+    pr = PullRequest.new(
+      'jeo-maven-plugin',
+      'Interesting Title',
+      'Pr description'
+    )
+    assert_equal(
+      '{"title":"Interesting Title","description":"Pr description","repository":"jeo-maven-plugin","url":"undefined"}',
+      pr.to_json
+    )
+  end
+end

data/test/test_report.rb

@@ -27,42 +27,50 @@ require_relative '../lib/newsman/issues'
 require_relative '../lib/newsman/pull_request'
 
 class TestReport < Minitest::Test
-  def test_report
-    expected = "From: User
-Subject: WEEK 11 Project
+  REPORT_EXAMPLE = <<~EXPECTED
+    From: User
+    Subject: WEEK 11 Project
+
+    Hi all,
 
-Hi all,
+    Last week achievements:
+    repository-a:
+     - Did a lot of for (a) repository
 
-Last week achievements:
-repository-a:
- - Did a lot of for (a) repository
+    Next week plans:
+    repository-b:
+     - I will do a lot for repository (b)
 
-Next week plans:
-repository-b:
- - I will do a lot for repository (b)
+    Risks:
+    - <todo>
 
-Risks:
-- <todo>
+    Best regards,
+    User
+    Developer
+    2024-03-14
+  EXPECTED
 
-Best regards,
-User
-Developer
-2024-03-14"
+  def test_report
+    expected = REPORT_EXAMPLE
     report = Report.new('User', 'Developer', 'Project')
     out = report.build("repository-a:\n - Did a lot of for (a) repository",
-                       "repository-b:\n - I will do a lot for repository (b)", '- <todo>', Date.new(2024, 3, 14))
+                       "repository-b:\n - I will do a lot for repository (b)",
+                       '- <todo>',
+                       Date.new(2024, 3, 14))
     assert_equal expected, out
   end
 
   def test_report_items
-    expected = "Closed Pull Requests:\n - title: title, repo: repo, url: http://some.url.com\n\nOpen Issues:\n - title: title, repo: repo, number: #123, url: http://google.com\n"
-    issues = [ Issue::new('title', 'body', 'repo', '123', url: 'http://google.com')]
-    prs = [ PullRequest::new('repo', 'title', 'body', url: 'http://some.url.com') ]
-    actual = ReportItems.new(prs, issues).to_s
+    expected = <<~EXPECTED
+      Closed Pull Requests:
+       - title: title, repo: repo, url: http://some.url.com
 
-    puts actual 
+      Open Issues:
+       - title: title, repo: repo, number: #123, url: http://google.com, labels: []
+    EXPECTED
+    issues = [Issue.new('title', 'body', 'repo', '123', url: 'http://google.com')]
+    prs = [PullRequest.new('repo', 'title', 'body', url: 'http://some.url.com')]
+    actual = ReportItems.new(prs, issues).to_s
     assert_equal expected, actual
   end
-
-
 end

data/test/test_week_before.rb

@@ -22,7 +22,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require_relative '../lib/newsman'
+require_relative '../lib/newsman/github'
 
 class TestDateOneWeekAgo < Minitest::Test
   def test_date_one_week_ago