diff --git a/lib/github_changelog_generator.rb b/lib/github_changelog_generator.rb index e1689a4..5c0f534 100755 --- a/lib/github_changelog_generator.rb +++ b/lib/github_changelog_generator.rb @@ -15,8 +15,8 @@ module GitHubChangelogGenerator attr_accessor :options, :all_tags, :github PER_PAGE_NUMBER = 30 - GH_RATE_LIMIT_EXCEEDED_MSG = 'Warning: GitHub API rate limit exceed (5000 per hour), change log may not ' \ - 'contain some issues. You can limit the number of issues fetched using the `--max-issues NUM` argument' + GH_RATE_LIMIT_EXCEEDED_MSG = "Warning: GitHub API rate limit (5000 per hour) exceeded, change log may be " \ + "missing some issues. You can limit the number of issues fetched using the `--max-issues NUM` argument." def initialize @options = Parser.parse_options @@ -95,7 +95,7 @@ module GitHubChangelogGenerator commit = @github.git_data.commits.get @options[:user], @options[:project], event[:commit_id] issue[:actual_date] = commit[:author][:date] rescue - puts "Warning: can't fetch commit #{event[:commit_id]} probably it referenced from another repo.".yellow + puts "Warning: Can't fetch commit #{event[:commit_id]}. It is probably referenced from another repo.".yellow issue[:actual_date] = issue[:closed_at] end end @@ -139,7 +139,7 @@ module GitHubChangelogGenerator } if @options[:verbose] - puts 'Fetching merged dates... Done!' + puts "Fetching merged dates: Done!" end end @@ -210,7 +210,7 @@ module GitHubChangelogGenerator output_filename = "#{@options[:output]}" File.open(output_filename, 'w') { |file| file.write(log) } - puts 'Done!' + puts "Done!" puts "Generated log placed in #{`pwd`.strip!}/#{output_filename}" end @@ -218,13 +218,13 @@ module GitHubChangelogGenerator fetch_tags_dates if @options[:verbose] - puts 'Sorting tags..' + puts "Sorting tags..." end @all_tags.sort_by! { |x| get_time_of_tag(x) }.reverse! if @options[:verbose] - puts 'Generating log..' + puts "Generating log..." end log = '' @@ -248,7 +248,7 @@ module GitHubChangelogGenerator def fetch_tags_dates if @options[:verbose] - print "Fetching tags dates..\r" + print "Fetching tag dates...\r" end # Async fetching tags: @@ -317,8 +317,8 @@ module GitHubChangelogGenerator env_var = @options[:token] ? @options[:token] : (ENV.fetch 'CHANGELOG_GITHUB_TOKEN', nil) unless env_var - puts 'Warning: No token provided (-t option) and variable $CHANGELOG_GITHUB_TOKEN was not found.'.yellow - puts 'This script can make only 50 requests to GitHub API per hour without token!'.yellow + puts "Warning: No token provided (-t option) and variable $CHANGELOG_GITHUB_TOKEN was not found.".yellow + puts "This script can make only 50 requests per hour to GitHub API without a token!".yellow end @github_token ||= env_var @@ -382,7 +382,7 @@ module GitHubChangelogGenerator end def delete_by_time(array, hash_key, older_tag = nil, newer_tag = nil) - fail 'At least one of the tags should be not nil!' if older_tag.nil? && newer_tag.nil? + fail "At least one of the tags should be not nil!" if older_tag.nil? && newer_tag.nil? newer_tag_time = get_time_of_tag(newer_tag) older_tag_time = get_time_of_tag(older_tag)