newsman 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f089cfc5c61266ac51d4c8ed7648268d8c7e7ef61a7476c48d08f099e96bb8d2
-  data.tar.gz: f5ac355f83f8a93e59a36a3a663931f22af7ef117d995bda73f63502f41bb4ed
+  metadata.gz: e0b76df23c180a0cc0a30bdc4d60fd675ece0c5201605bcbdea44bd0a7d25bce
+  data.tar.gz: 72e37a051f065fcc3a625ba3175439b1351e28acc6e0b2cc33a352c3f5dda652
 SHA512:
-  metadata.gz: 59575806b0b0ff92dc1b93740c4286bd538ee3710a2429ed44ffecd467ed19787ddd30bfa035dbd7bf14324d2bdebcdea75c6908aa6ca45e550eb652ce811764
-  data.tar.gz: 7a3a4c2345f72501b5ce10a36ee3675f0ee6f3e687c881878914a17a7c0178e035382515ab01ff27c07e776e4b033eaaa4d2641dd00310e8c62a528917ab5a3b
+  metadata.gz: e66602a260c38095c76e367b8a84f52f1f16bc6a74b103e3b0c0e6e8690e8bea1d1d54b41ca97cc0c259c55b571485e788864b3f788251730759ffd19ce356ec
+  data.tar.gz: e4d0aef6d9a2958084402468adc84f2e24d8f7da507ea8a2dab7515f5855411f6e6a73e1969a4cc30f413e180eee2ceaab520c5addb7d59fa780090516dc7e76

data/README.md

@@ -65,4 +65,4 @@ And you should see a welcome message from newsman.
 
 ## Examples
 
-You can find examples of generated reports [here](https://github.com/volodya-lombrozo/newsman/tree/gh-pages)
+You can find examples of generated reports [here](https://volodya-lombrozo.github.io/newsman/)

data/lib/newsman/issues.rb

@@ -5,25 +5,33 @@ require 'net/http'
 
 class Issue
   attr_accessor :title, :body, :repo, :number
+  attr_reader :url
 
-  def initialize(title, body, repo, number)
+  def initialize(title, body, repo, number, url: 'undefined')
     @title = title
     @body = body
     @repo = repo
     @number = number
+    @url = url
   end
 
   def to_s
     "title: ```#{@title}```,\ndescription: ```#{@body}```,\nrepo: ```#{@repo}```,\nissue number: \##{@number}\n"
   end
+
+  def detailed_title 
+    "title: #{@title}, repo: #{@repo}, number: \##{@number}, url: #{@url}"
+  end
+    
 end
 
 class PddIssue
-  def initialize(title, body, repo, number)
+  def initialize(title, body, repo, number, url: 'undefined')
     @title = title
     @body = body
     @repo = repo
     @number = number
+    @url = url 
   end
 
   def extract_real_body
@@ -42,4 +50,9 @@ class PddIssue
   def to_s
     "title: ```#{@title}```,\ndescription: ```#{extract_real_body}```,\nrepo: ```#{@repo}```,\nissue number: \##{@number}\n"
   end
+
+  def detailed_title
+    "title: #{@title}, repo: #{@repo}, issue number: \##{@number}, url: #{@url}"
+  end
+
 end

data/lib/newsman/pull_request.rb

@@ -2,14 +2,21 @@
 
 class PullRequest
   attr_accessor :repository, :title, :description
+  attr_reader :url
 
-  def initialize(repository, title, description)
+  def initialize(repository, title, description, url: 'undefined')
     @repository = repository
     @title = title
     @description = description
+    @url = url
   end
 
   def to_s
     "title: ```#{@title}```,\ndescription: ```#{@description}```,\nrepo: ```#{@repository}```\n"
   end
+
+  def detailed_title
+    "title: #{@title}, repo: #{@repository}, url: #{@url}"
+  end
+
 end

data/lib/newsman/report.rb

@@ -2,15 +2,22 @@
 # frozen_string_literal: true
 
 class Report
-  def initialize(user, position, title)
+  def initialize(user, position, title, additional: ReportItems.new([],[]))
     @user = user
     @position = position
     @title = title
+    @additional = additional
   end
 
   def build(achievements, plans, risks, date)
-    "From: #{@user}\nSubject: #{week_of_a_year(@title,
+    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;
   end
 end
 
@@ -18,3 +25,23 @@ def week_of_a_year(project, today)
   number = today.strftime('%U').to_i + 1
   "WEEK #{number} #{project}"
 end
+
+
+class ReportItems
+  
+  def initialize(prs, issues)
+    @prs = prs || []
+    @issues = issues || []
+  end
+
+  # Returns true if there are no pull requests or issues, false otherwise
+  def empty?
+    @prs.empty? && @issues.empty?
+  end
+
+  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}"
+  end
+end

data/lib/newsman.rb

@@ -91,9 +91,10 @@ def generate
     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)
+    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")
 
   puts "Searching issues using the following query: '#{issues_query}'"
@@ -105,11 +106,12 @@ def generate
     number = issue.number.to_s
     puts "Found issue in #{repository}:[##{number}] #{title}"
     issues << if issue.user.login == '0pdd'
-                PddIssue.new(title, body, repository, number)
+                PddIssue.new(title, body, repository, number, url: issue.html_url)
               else
-                Issue.new(title, body, repository, number)
+                Issue.new(title, body, repository, number, url: issue.html_url)
               end
   end
+  raw_issues = issues
   issues = issues.map(&:to_s).join("\n\n\n")
   # puts "Found issues:\n #{issues}"
 
@@ -179,7 +181,7 @@ some-repository-name-y:
 
   output_mode = options[:output]
   puts "Output mode is '#{output_mode}'"
-  full_answer = Report.new(reporter, reporter_position, options[:title]).build(answer, issues_full_answer,
+  full_answer = Report.new(reporter, reporter_position, options[:title], additional: ReportItems.new(raw_prs, raw_issues)).build(answer, issues_full_answer,
                                                                                risks_full_answer, Date.today)
   if output_mode.eql? 'txt'
     puts 'Print result to txy file'

data/test/test_report.rb

@@ -23,6 +23,8 @@
 
 require 'minitest/autorun'
 require_relative '../lib/newsman/report'
+require_relative '../lib/newsman/issues'
+require_relative '../lib/newsman/pull_request'
 
 class TestReport < Minitest::Test
   def test_report
@@ -51,4 +53,16 @@ Developer
                        "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
+
+    puts actual 
+    assert_equal expected, actual
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newsman
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Volodya Lombrozo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-14 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest