gix bug in logic
This commit is contained in:
		
							parent
							
								
									36fbe509fa
								
							
						
					
					
						commit
						fa4ccb7e9c
					
				@ -4,6 +4,8 @@
 | 
			
		||||
#### 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))
 | 
			
		||||
 | 
			
		||||
@ -91,6 +91,7 @@ module GitHubChangelogGenerator
 | 
			
		||||
        end
 | 
			
		||||
        return filtered_pull_requests
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      pull_requests
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@ -227,7 +228,7 @@ module GitHubChangelogGenerator
 | 
			
		||||
          t = Time.parse(req[hash_key]).utc
 | 
			
		||||
 | 
			
		||||
          if older_tag_time.nil?
 | 
			
		||||
            tag_is_older_of_older = false
 | 
			
		||||
            tag_is_older_of_older = true
 | 
			
		||||
          else
 | 
			
		||||
            tag_is_older_of_older = t > older_tag_time
 | 
			
		||||
          end
 | 
			
		||||
 | 
			
		||||
@ -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}
 | 
			
		||||
      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('--[no-]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|
 | 
			
		||||
        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|
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user