github_changelog_generator 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d90423721767edc0514ae6301fb296e3dacca8
-  data.tar.gz: 2ab86b4d1d8fc0ab004eafc26ffede1a6bd0e08a
+  metadata.gz: 252bfdf546f6b2c416fcf8b85dd231fb96417153
+  data.tar.gz: ff44c3c803bfd6609e2728d9e96d68fae222a88e
 SHA512:
-  metadata.gz: bcc94ae00a530a5202704fc94ed76b8118234d1b1a45b6a78f928470bdb49e3f6cd9d38dc6af6e2a4cc5d63cc92df4041fcf769c6febc8f306d23036d1b50381
-  data.tar.gz: e5a2346e221265eb2e620d2a3224f3a6a584c80d49392711b8ee3aebafdec166bdeda33d5ae19efdefd0d9ec19fafbb226784788cad82f67f4da53a2b5b5c38e
+  metadata.gz: 0b67d7a6b43035f09de7d98886df5bd8e48243d9135b370811fd3c9679ff171937d6c3e2916673690c5b9b1036b3a7b9bb2157d0a9ecc7e5aed400ec510b6a25
+  data.tar.gz: 4054d1d2c7e3f60947b9a783a9f73d7125f8dc5498cb440341a213869750dabd572a03bc50a18f09c019ea38696d65f788009e9b37054356ff20a134c58ed323

data/CHANGELOG.md

@@ -1,8 +1,18 @@
 # Changelog
 
+## [1.2.0] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.0)
+#### 19/11/14
+- *Merged pull-request:* Add filter for pull-requests labels. (option --filter-pull-requests) [\#27](https://github.com/skywinder/Github-Changelog-Generator/pull/27) ([skywinder](https://github.com/skywinder))
+
+- *Merged pull-request:* Test Pull-Request [\#26](https://github.com/skywinder/Github-Changelog-Generator/pull/26) ([skywinder](https://github.com/skywinder))
+
+- *Merged pull-request:* Add ability to insert authors of pull-requests (--[no-]author option) [\#25](https://github.com/skywinder/Github-Changelog-Generator/pull/25) ([skywinder](https://github.com/skywinder))
+
+- *Merged pull-request:* Don't receive issues in case of --no-isses flag specied [\#24](https://github.com/skywinder/Github-Changelog-Generator/pull/24) ([skywinder](https://github.com/skywinder))
+
 ## [1.1.4] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.4)
 #### 18/11/14
-- *Merged pull-request:* Sort tags by date [\#23](https://github.com/skywinder/Github-Changelog-Generator/pull/23)
+- *Merged pull-request:* Sort tags by date [\#23](https://github.com/skywinder/Github-Changelog-Generator/pull/23) ([skywinder](https://github.com/skywinder))
 
 - *Implemented enhancement:* Implement ability to retrieve GitHub token from ENV variable (to not put it to script directly) [\#19](https://github.com/skywinder/Github-Changelog-Generator/issues/19)
 
@@ -10,17 +20,17 @@
 
 ## [1.1.2] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.2)
 #### 12/11/14
-- *Merged pull-request:* Fix bug with dot signs in project name [\#18](https://github.com/skywinder/Github-Changelog-Generator/pull/18)
+- *Merged pull-request:* Fix bug with dot signs in project name [\#18](https://github.com/skywinder/Github-Changelog-Generator/pull/18) ([skywinder](https://github.com/skywinder))
 
-- *Merged pull-request:* Fix bug with dot signs in user name [\#17](https://github.com/skywinder/Github-Changelog-Generator/pull/17)
+- *Merged pull-request:* Fix bug with dot signs in user name [\#17](https://github.com/skywinder/Github-Changelog-Generator/pull/17) ([skywinder](https://github.com/skywinder))
 
 ## [1.1.1] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.1)
 #### 10/11/14
-- *Merged pull-request:* Remove duplicates of issues and pull-requests with same number [\#15](https://github.com/skywinder/Github-Changelog-Generator/pull/15)
+- *Merged pull-request:* Remove duplicates of issues and pull-requests with same number [\#15](https://github.com/skywinder/Github-Changelog-Generator/pull/15) ([skywinder](https://github.com/skywinder))
 
-- *Merged pull-request:* Sort issues by tags [\#14](https://github.com/skywinder/Github-Changelog-Generator/pull/14)
+- *Merged pull-request:* Sort issues by tags [\#14](https://github.com/skywinder/Github-Changelog-Generator/pull/14) ([skywinder](https://github.com/skywinder))
 
-- *Merged pull-request:* Add ability to add or exclude issues without any labels [\#13](https://github.com/skywinder/Github-Changelog-Generator/pull/13)
+- *Merged pull-request:* Add ability to add or exclude issues without any labels [\#13](https://github.com/skywinder/Github-Changelog-Generator/pull/13) ([skywinder](https://github.com/skywinder))
 
 ## [1.1.0] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.0)
 #### 10/11/14
@@ -32,13 +42,13 @@
 
 ## [1.0.1] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.0.1)
 #### 10/11/14
-- *Merged pull-request:* Implement support of different tags. [\#8](https://github.com/skywinder/Github-Changelog-Generator/pull/8)
+- *Merged pull-request:* Implement support of different tags. [\#8](https://github.com/skywinder/Github-Changelog-Generator/pull/8) ([skywinder](https://github.com/skywinder))
 
 ## [1.0.0] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.0.0)
 #### 07/11/14
-- *Merged pull-request:* Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/Github-Changelog-Generator/pull/7)
+- *Merged pull-request:* Add support for issues in CHANGELOG [\#7](https://github.com/skywinder/Github-Changelog-Generator/pull/7) ([skywinder](https://github.com/skywinder))
 
-- *Merged pull-request:* Fix parsing date of pull request [\#3](https://github.com/skywinder/Github-Changelog-Generator/pull/3)
+- *Merged pull-request:* Fix parsing date of pull request [\#3](https://github.com/skywinder/Github-Changelog-Generator/pull/3) ([skywinder](https://github.com/skywinder))
 
 - *Implemented enhancement:* Implement option to specify output filename [\#4](https://github.com/skywinder/Github-Changelog-Generator/issues/4)
 
@@ -48,9 +58,9 @@
 
 ## [0.1.0] (https://github.com/skywinder/Github-Changelog-Generator/tree/0.1.0)
 #### 07/11/14
-- *Merged pull-request:* Add changelog generation for last tag [\#2](https://github.com/skywinder/Github-Changelog-Generator/pull/2)
+- *Merged pull-request:* Add changelog generation for last tag [\#2](https://github.com/skywinder/Github-Changelog-Generator/pull/2) ([skywinder](https://github.com/skywinder))
 
-- *Merged pull-request:* Add option (-o --output) to specify name of the output file. [\#1](https://github.com/skywinder/Github-Changelog-Generator/pull/1)
+- *Merged pull-request:* Add option (-o --output) to specify name of the output file. [\#1](https://github.com/skywinder/Github-Changelog-Generator/pull/1) ([skywinder](https://github.com/skywinder))
 
 ## [0.0.2] (https://github.com/skywinder/Github-Changelog-Generator/tree/0.0.2)
 #### 06/11/14

data/README.md

@@ -8,6 +8,8 @@ Changelog generation has never been so easy.
 This script automatically generate change-log from your tags and merged pull-requests.
 
 ## Installation:
+You're almost done!
+
 	[sudo] gem install github_changelog_generator
 
 ## Usage
@@ -44,8 +46,8 @@ Type `github_changelog_generator --help` for detailed usage.
 
 ## Examples:
 
-- Look at changelog for **[CHANGELOG.md](https://github.com/skywinder/Github-Changelog-Generator/blob/master/CHANGELOG.md)** for this project
-- This changelog: [ActionSheetPicker-3.0/CHANGELOG.md](https://github.com/skywinder/ActionSheetPicker-3.0/blob/master/CHANGELOG.md)  was generated by command:
+- Look at **[CHANGELOG.md](https://github.com/skywinder/Github-Changelog-Generator/blob/master/CHANGELOG.md)** for **this** project
+- [ActionSheetPicker-3.0/CHANGELOG.md](https://github.com/skywinder/ActionSheetPicker-3.0/blob/master/CHANGELOG.md)  was generated by command:
 
 		github_changelog_generator -u skywinder -p ActionSheetPicker-3.0
 

data/lib/github_changelog_generator.rb

@@ -15,6 +15,12 @@ module GitHubChangelogGenerator
 
       @options = Parser.parse_options
 
+      if options[:verbose]
+        puts 'Input options:'
+        pp options
+        puts ''
+      end
+
       github_token
 
       if @github_token.nil?
@@ -39,7 +45,7 @@ module GitHubChangelogGenerator
     end
 
     def exec_command(cmd)
-      exec_cmd = "cd #{$project_path} && #{cmd}"
+      exec_cmd = "cd #{$project_path} and #{cmd}"
       %x[#{exec_cmd}]
     end
 
@@ -91,6 +97,7 @@ module GitHubChangelogGenerator
         end
         return filtered_pull_requests
       end
+
       pull_requests
     end
 
@@ -103,7 +110,7 @@ module GitHubChangelogGenerator
 
       if @options[:last]
         log += self.generate_log_between_tags(self.all_tags[0], self.all_tags[1])
-      elsif @options[:tag1] && @options[:tag2]
+      elsif @options[:tag1] and @options[:tag2]
 
         tag1 = @options[:tag1]
         tag2 = @options[:tag2]
@@ -221,23 +228,23 @@ module GitHubChangelogGenerator
     end
 
     def delete_by_time(array, hash_key, newer_tag_time, older_tag_time = nil)
-      array_new = Array.new(array)
-      array_new.delete_if { |req|
+      array.select { |req|
         if req[hash_key]
           t = Time.parse(req[hash_key]).utc
 
           if older_tag_time.nil?
-            tag_is_older_of_older = false
+            tag_in_range_old = true
           else
-            tag_is_older_of_older = t > older_tag_time
+            tag_in_range_old = t > older_tag_time
           end
 
-          tag_is_newer_than_new = t <= newer_tag_time
+          tag_in_range_new = t <= newer_tag_time
 
-          tag_not_in_range = (tag_is_older_of_older) && (tag_is_newer_than_new)
-          !tag_not_in_range
+          tag_in_range = (tag_in_range_old) && (tag_in_range_new)
+          
+          tag_in_range
         else
-          true
+          false
         end
       }
     end
@@ -339,13 +346,8 @@ module GitHubChangelogGenerator
 
     def get_all_issues
 
-      if @options[:verbose]
-        puts 'Fetching closed issues..'
-      end
-
       response = @github.issues.list user: @options[:user], repo: @options[:project], state: 'closed', filter: 'all', labels: nil
 
-
       issues = []
       response.each_page do |page|
         issues.concat(page)

data/lib/github_changelog_generator/parser.rb

@@ -6,7 +6,7 @@ require_relative 'version'
 module GitHubChangelogGenerator
   class Parser
     def self.parse_options
-      options = {:tag1 => nil, :tag2 => nil, :format => '%d/%m/%y', :output => 'CHANGELOG.md', :labels => %w(bug enhancement), :pulls => true, :issues => true, :verbose => true, :add_issues_wo_labels => true, :merge_prefix => '*Merged pull-request:* ', :author => true, :pull_request_labels => %w(bug enhancement)}
+      options = {:tag1 => nil, :tag2 => nil, :format => '%d/%m/%y', :output => 'CHANGELOG.md', :labels => %w(bug enhancement), :pulls => true, :issues => true, :verbose => true, :add_issues_wo_labels => true, :merge_prefix => '*Merged pull-request:* ', :author => true, :pull_request_labels => nil}
 
       parser = OptionParser.new { |opts|
         opts.banner = 'Usage: changelog_generator [options]'
@@ -50,7 +50,7 @@ module GitHubChangelogGenerator
         opts.on('--labels  x,y,z', Array, 'Issues with that labels will be included to changelog. Default is \'bug,enhancement\'') do |list|
           options[:labels] = list
         end
-        opts.on('--filter-pull-requests  x,y,z', Array, 'Pull requests with that labels will be included to changelog. pull requests w\o labels will be included anyway.  Default is \'bug,enhancement\'') do |list|
+        opts.on('--filter-pull-requests  x,y,z', Array, 'Pull requests with that labels will be included to changelog. pull requests w\o labels will be included anyway.') do |list|
           options[:pull_request_labels] = list
         end
         opts.on('-v', '--version', 'Print version number') do |v|
@@ -61,12 +61,6 @@ module GitHubChangelogGenerator
 
       parser.parse!
 
-      if options[:verbose]
-        puts 'Input options:'
-        pp options
-        puts ''
-      end
-
       #udefined case with 1 parameter:
       if ARGV[0] && !ARGV[1]
         puts parser.banner

data/lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_changelog_generator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Petr Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler