github_changelog_generator 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ce284350b7b4f261202e298057a84e911b67d1
-  data.tar.gz: f7f9f8d309212ef49989f283460fd2138cac4ec6
+  metadata.gz: ac3da4dd2dcab64819ab088aa8ed3acfa8ed79df
+  data.tar.gz: d15971ed4ac80d7bd2f58c43e055a1182b35be05
 SHA512:
-  metadata.gz: fa6ea6757cbe39acff9dba293a78acf05c153a9ebe17504f08cc7da39126744ce7fae306012b08ca03183ab3024a963c2300f7861fad7cff8a0ec968043437a9
-  data.tar.gz: f286b75ae31ea3c1ce9118cf3e6a6145a8a8c90f02b6b8e4df42eaf779a50115c3bb5263abc127869ed750747efd03be1a85c2a07a3de03935ae15af692d4271
+  metadata.gz: 5da1acfbda00a6d208375507d3303f717f96b83d48e9d57dc844619a2bcc0ab992849b0e6d84802a69cc31c79121487bce72fc5e557070542d2c5f053a5e3dac
+  data.tar.gz: ab9881fadfe743ed99a13d795dbdf0b6f663d695fd74c6347f673cc194bebbfae913d1f40d591ed9308e861a33fcd71c3e5d577126d958cf15e528d63b8e6885

data/lib/github_changelog_generator.rb

@@ -88,7 +88,8 @@ class ChangelogGenerator
     end
 
     log += "\n\n*This file was generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*"
-    output_filename = "#{@options[:project]}_CHANGELOG.md"
+
+    output_filename = "#{@options[:output]}"
     File.open(output_filename, 'w') { |file| file.write(log) }
 
     puts "Done! Generated log placed in #{output_filename}"
@@ -101,6 +102,8 @@ class ChangelogGenerator
       log += self.generate_log_between_tags(self.all_tags[index-1], self.all_tags[index])
     end
 
+    log += self.generate_log_before_tag(self.all_tags.last)
+
     log
   end
 
@@ -157,17 +160,32 @@ class ChangelogGenerator
     pull_requests = Array.new(@pull_requests)
 
     pull_requests.delete_if { |req|
-      t = Time.parse(req[:closed_at]).utc
-      true_classor_false_class = t > since_tag_time
-      classor_false_class = t < till_tag_time
+      t = Time.parse(req[:merged_at]).utc
+      tag_is_later_since = t > since_tag_time
+      tag_is_before_till = t <= till_tag_time
 
-      in_range = (true_classor_false_class) && (classor_false_class)
+      in_range = (tag_is_later_since) && (tag_is_before_till)
       !in_range
     }
 
     self.create_log(pull_requests, till_tag_name, till_tag_time)
   end
 
+  def generate_log_before_tag(tag)
+    tag_time = self.get_time_of_tag(tag)
+    tag_name = tag['name']
+
+    pull_requests = Array.new(@pull_requests)
+
+    pull_requests.delete_if { |req|
+      t = Time.parse(req[:closed_at]).utc
+      t > tag_time
+    }
+
+    self.create_log(pull_requests, tag_name, tag_time)
+
+  end
+
   def create_log(pull_requests, tag_name, tag_time)
 
     trimmed_tag = tag_name.tr('v', '')

data/lib/github_changelog_generator/parser.rb

@@ -3,17 +3,17 @@ require 'optparse'
 
 class Parser
   def self.parse_options
-    options = {:tag1 => nil, :tag2 => nil, :format => '%d/%m/%y'}
+    options = {:tag1 => nil, :tag2 => nil, :format => '%d/%m/%y', :output => 'CHANGELOG.md'}
 
     parser = OptionParser.new { |opts|
-      opts.banner = 'Usage: changelog_generator -u user_name -p project_name [-t 16-digit-GitHubToken] [options]'
-      opts.on('-u', '--user [USER]', 'your username on GitHub') do |last|
+      opts.banner = 'Usage: changelog_generator --user username --project project_name [options]'
+      opts.on('-u', '--user [USER]', 'Username of the owner of target GitHub repo (required)') do |last|
         options[:user] = last
       end
-      opts.on('-p', '--project [PROJECT]', 'name of project on GitHub') do |last|
+      opts.on('-p', '--project [PROJECT]', 'Name of project on GitHub (required)') do |last|
         options[:project] = last
       end
-      opts.on('-t', '--token [TOKEN]', 'To make more than 50 requests this app required your OAuth token for GitHub. You can generate it on https://github.com/settings/applications') do |last|
+      opts.on('-t', '--token [TOKEN]', 'To make more than 50 requests this script required your OAuth token for GitHub. You can generate it on https://github.com/settings/applications') do |last|
         options[:token] = last
       end
       opts.on('-h', '--help', 'Displays Help') do
@@ -23,12 +23,15 @@ class Parser
       opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
         options[:verbose] = v
       end
-      opts.on('-l', '--last-changes', 'generate log between last 2 tags') do |last|
+      opts.on('-l', '--last-changes', 'Generate log between only last 2 tags') do |last|
         options[:last] = last
       end
-      opts.on('-f', '--date-format [FORMAT]', 'date format. default is %d/%m/%y') do |last|
+      opts.on('-f', '--date-format [FORMAT]', 'Date format. Default is %d/%m/%y') do |last|
         options[:format] = last
       end
+      opts.on('-o', '--output [FORMAT]', 'Output file. Default is CHANGELOG.md') do |last|
+        options[:output] = last
+      end
     }
 
     parser.parse!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_changelog_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Petr Korolev