Merge branch 'release/1.2.4'

This reverts commit 4488ac8cc6.

.gitignore

@@ -1,2 +1 @@
-constants.rb
+/lib/CHANGELOG.md
-*.md

.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+before_install:
+  - gem update --system
+  - gem --version
+rvm:
+  - 2.1.0
+gemfile:
+  - Gemfile
+
+notifications:
+  email:
+    recipients:
+      - sky4winder+githubchangeloggenerator@gmail.com
+    on_success: never # [always|never|change]
+    on_failure: change # [always|never|change]

CHANGELOG.md

@@ -0,0 +1,81 @@
+# Changelog
+
+## [1.2.2] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.2)
+#### 10/12/14
+- *Merged pull-request:* Add a Bitdeli Badge to README [\#36](https://github.com/skywinder/Github-Changelog-Generator/pull/36) ([bitdeli-chef](https://github.com/bitdeli-chef))
+
+## [1.2.1] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.2.1)
+#### 22/11/14
+- *Merged pull-request:* Issues for last tag not in list [\#29](https://github.com/skywinder/Github-Changelog-Generator/pull/29) ([skywinder](https://github.com/skywinder))
+
+- *Merged pull-request:* Disable default --filter-pull-requests option. [\#28](https://github.com/skywinder/Github-Changelog-Generator/pull/28) ([skywinder](https://github.com/skywinder))
+
+## [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 SHOULD NOT APPEAR IN LOG! [\#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) ([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)
+
+- *Fixed bug:* Script fills changelog only for first 30 tags. [\#20](https://github.com/skywinder/Github-Changelog-Generator/issues/20)
+
+## [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) ([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) ([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) ([skywinder](https://github.com/skywinder))
+
+- *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) ([skywinder](https://github.com/skywinder))
+
+## [1.1.0] (https://github.com/skywinder/Github-Changelog-Generator/tree/1.1.0)
+#### 10/11/14
+- *Implemented enhancement:* Detect username and project form origin [\#11](https://github.com/skywinder/Github-Changelog-Generator/issues/11)
+
+- *Fixed bug:* Markdown formating in the last line wrong [\#9](https://github.com/skywinder/Github-Changelog-Generator/issues/9)
+
+- *Fixed bug:* Bug with wrong credentials in 1.0.1 [\#12](https://github.com/skywinder/Github-Changelog-Generator/issues/12)
+
+## [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) ([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) ([skywinder](https://github.com/skywinder))
+
+- *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)
+
+- *Implemented enhancement:* Add support for fixed issues and implemented enchanments. [\#6](https://github.com/skywinder/Github-Changelog-Generator/issues/6)
+
+- *Fixed bug:* Last tag not appeared in changelog [\#5](https://github.com/skywinder/Github-Changelog-Generator/issues/5)
+
+## [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) ([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) ([skywinder](https://github.com/skywinder))
+
+## [0.0.2] (https://github.com/skywinder/Github-Changelog-Generator/tree/0.0.2)
+#### 06/11/14
+## [0.0.1] (https://github.com/skywinder/Github-Changelog-Generator/tree/0.0.1)
+#### 06/11/14
+
+
+\* *This changelog was generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 gem 'github_api'
-gem 'httparty'
+gem 'colorize'
+gem 'rake'

Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
+    colorize (0.7.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     faraday (0.9.0)
@@ -14,17 +15,13 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.3.1)
+    hashie (3.3.2)
-    httparty (0.13.2)
+    jwt (1.2.0)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.1)
-    jwt (1.0.0)
     mini_portile (0.6.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.4)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -33,11 +30,13 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
+    rake (10.4.2)
     thread_safe (0.3.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  colorize
   github_api
-  httparty
+  rake

README.md

@@ -1,23 +1,101 @@
-Github Changelog Generator
+GitHub Changelog Generator
 ==================
 
+[![Gem Version](https://badge.fury.io/rb/github_changelog_generator.svg)](http://badge.fury.io/rb/github_changelog_generator)
+[![Build Status](https://travis-ci.org/skywinder/Github-Changelog-Generator.svg?branch=master)](https://travis-ci.org/skywinder/Github-Changelog-Generator)
+
+Changelog generation has never been so easy.
+
 This script automatically generate change-log from your tags and merged pull-requests.
 
-		Usage: github_changelog_generator.rb -u user_name -p project_name [-t 16-digit-GitHubToken] [options]
+## Installation:
-		    -u, --user [USER]                your username on GitHub
+You're almost done!
-		    -p, --project [PROJECT]          name of project on GitHub
+
-		    -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
+	[sudo] gem install github_changelog_generator
+
+## Usage
+**It's really simple**: 
+
+- If your **git remote** `origin` refer to your GitHub repo, then just go to your project folder  just run:
+
+		github_changelog_generator
+
+-  or from anywhere:
+
+		github_changelog_generator -u github-username -p github-project
+     
+As output you will get `CHANGELOG.md` file with *pretty Markdown-formatted* changelog.
+
+### Params:
+Type `github_changelog_generator --help` for detailed usage.
+
+    Usage: changelog_generator [options]
+        -u, --user [USER]                Username of the owner of target GitHub repo
+        -p, --project [PROJECT]          Name of project on GitHub
+        -t, --token [TOKEN]              To make more than 50 requests this script required your OAuth token for GitHub. You can generate here: https://github.com/settings/tokens/new
         -h, --help                       Displays Help
-		    -v, --[no-]verbose               Run verbosely
+            --[no-]verbose               Run verbosely. Default is true
-		    -l, --last-changes               generate log between last 2 tags
+            --[no-]issues                Include closed issues to changelog. Default is true
-		    -f, --date-format [FORMAT]       date format. default is %d/%m/%y 
+            --[no-]issues-without-labels Include closed issues without any labels to changelog. Default is true
+            --[no-]pull-requests         Include pull-requests to changelog. Default is true
+        -l, --last-changes               Generate log between last 2 tags only
+            --[no-]author                Add author of pull-request in the end. Default is true
+        -f, --date-format [FORMAT]       Date format. Default is %d/%m/%y
+        -o, --output [NAME]              Output file. Default is CHANGELOG.md
+            --labels  x,y,z              List of labels. Issues with that labels will be included to changelog. Default is 'bug,enhancement'
+        -v, --version                    Print version number
 
-### Example:
-`github_changelog_generator.rb -u your-username -p your-project [-t 16-digit-GitHub-token-for-more-than-50-requests]`
 
-In output you get `[your_project]_changelog.md` file with automatically generated changelogs.
+### GitHub token
 
+Since GitHub allow to make only 50 requests without authentication it's recommended to run this script with token
+
+**You can easily [generate it here](https://github.com/settings/applications)**.
+
+And:
+
+- Run with key `-t [your-16-digit-token]` 
+- Or set environment variable `CHANGELOG_GITHUB_TOKEN` and specify there your token. 
+ 		
+	i.e. add to your `~/.bash_profile` or `~/.zshrc` or any other place to load ENV variables string `export CHANGELOG_GITHUB_TOKEN="your-40-digit-github-token"'`
+
+So, if you got error like this:
+>! /Library/Ruby/Gems/2.0.0/gems/github_api-0.12.2/lib/github_api/response/raise_error.rb:14:in `on_complete'
+
+It's time to create this token or wait for 1 hour before GitHub reset the counter for your IP.
+
+## Examples:
+
+- 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
+
+
+## Projects using this library
+[Wikipage with list of projects](https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) 
+
+*If you are using `github_changelog_generator` for generation chamgelog in your project or know of project that uses it, please add it to [this] (https://github.com/skywinder/Github-Changelog-Generator/wiki/Projects-using-Github-Changelog-Generator) list.*
+
+## Am I missed some essential feature?
+
+**Nothing is impossible!** Open an [issue](https://github.com/skywinder/Github-Changelog-Generator/issues/new) and let's make generator better together!
+
+*Bug reports, feature requests, patches, well-wishes are always welcome!*
+
+## Contributing
+
+1. Create an issue to discuss about your idea
+2. [Fork it] (https://github.com/skywinder/Github-Changelog-Generator/fork)
+3. Create your feature branch (`git checkout -b my-new-feature`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request
 
 ## License
 
 Github Changelog Generator is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/skywinder/github-changelog-generator/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

Rakefile

@@ -0,0 +1,9 @@
+require "rake/testtask"
+
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.verbose = true
+  t.libs.push("demo", "test")
+  t.pattern = "test/**/*_test.rb"
+end

bin/github_changelog_generator

@@ -1,5 +1,4 @@
 #! /usr/bin/env ruby
 
 require 'github_changelog_generator'
-
+GitHubChangelogGenerator::ChangelogGenerator.new.compund_changelog
-ChangelogGenerator.new.compund_changelog

bump_gemfile.rb

@@ -0,0 +1,227 @@
+#!/usr/bin/env ruby
+require 'optparse'
+
+SPEC_TYPE = 'gemspec'
+
+:major
+:minor
+:patch
+
+@options = {:dry_run => false, :bump_number => :patch}
+
+OptionParser.new { |opts|
+  opts.banner = 'Usage: bump.rb [options]'
+
+  opts.on('-d', '--dry-run', 'Dry run') do |v|
+    @options[:dry_run] = v
+  end
+  opts.on('-a', '--major', 'Bump major version') do |v|
+    @options[:bump_number] = :major
+  end
+  opts.on('-m', '--minor', 'Bump minor version') do |v|
+    @options[:bump_number] = :minor
+  end
+  opts.on('-p', '--patch', 'Bump patch version') do |v|
+    @options[:bump_number] = :patch
+  end
+  opts.on('-r', '--revert', 'Revert last bump') do |v|
+    @options[:revert] = v
+  end
+}.parse!
+
+p @options
+
+def check_repo_is_clean_or_dry_run
+  value =%x[#{'git status --porcelain'}]
+
+  if value.empty?
+    puts 'Repo is clean -> continue'
+  else
+    if @options[:dry_run]
+      puts 'Repo not clean, "Dry run" enabled -> continue'
+    else
+      puts 'Repository not clean -> exit'
+      exit
+    end
+  end
+end
+
+
+def find_spec_file
+  list_of_specs = execute_line("find . -name '*.#{SPEC_TYPE}'")
+  arr = list_of_specs.split("\n")
+
+  spec_file = ''
+
+  case arr.count
+    when 0
+      puts "No #{SPEC_TYPE} files found. -> Exit."
+      exit
+    when 1
+      spec_file = arr[0]
+    else
+      puts 'Which spec should be used?'
+      arr.each_with_index { |file, index| puts "#{index+1}. #{file}" }
+      input_index = Integer(gets.chomp)
+      spec_file = arr[input_index-1]
+  end
+
+  if spec_file == nil
+    puts "Can't find specified spec file -> exit"
+    exit
+  end
+
+  spec_file.sub('./', '')
+
+end
+
+def find_current_gem_file
+  list_of_specs = execute_line("find . -name '*.gem'")
+  arr = list_of_specs.split("\n")
+
+  spec_file = ''
+
+  case arr.count
+    when 0
+      puts "No #{SPEC_TYPE} files found. -> Exit."
+      exit
+    when 1
+      spec_file = arr[0]
+    else
+      puts 'Which spec should be used?'
+      arr.each_with_index { |file, index| puts "#{index+1}. #{file}" }
+      input_index = Integer(gets.chomp)
+      spec_file = arr[input_index-1]
+  end
+
+  if spec_file == nil
+    puts "Can't find specified spec file -> exit"
+    exit
+  end
+
+  spec_file.sub('./', '')
+
+end
+
+def find_version_in_podspec(podspec)
+  readme = File.read(podspec)
+
+  #try to find version in format 1.22.333
+  re = /(\d+)\.(\d+)\.(\d+)/m
+
+  match_result = re.match(readme)
+
+  unless match_result
+    puts 'Not found any versions'
+    exit
+  end
+
+  puts "Found version #{match_result[0]}"
+  return match_result[0], match_result.captures
+end
+
+def bump_version(versions_array)
+  bumped_result = versions_array.dup
+  bumped_result.map! { |x| x.to_i }
+
+  case @options[:bump_number]
+    when :major
+      bumped_result[0] += 1
+      bumped_result[1] = 0
+      bumped_result[2] = 0
+    when :minor
+      bumped_result[1] += 1
+      bumped_result[2] = 0
+    when :patch
+      bumped_result[2] += 1
+    else
+      raise('unknown bump_number')
+  end
+
+
+  bumped_version = bumped_result.join('.')
+  puts "Bump version: #{versions_array.join('.')} -> #{bumped_version}"
+  bumped_version
+end
+
+def execute_line(line)
+  output = `#{line}`
+  check_exit_status(output)
+
+  output
+end
+
+def execute_line_if_not_dry_run(line)
+  if @options[:dry_run]
+    puts "Dry run: #{line}"
+    nil
+  else
+    puts line
+    value = %x[#{line}]
+    puts value
+    check_exit_status(value)
+    value
+  end
+end
+
+def check_exit_status(output)
+  if $?.exitstatus != 0
+    puts "Output:\n#{output}\nExit status = #{$?.exitstatus} ->Terminate script."
+    exit
+  end
+end
+
+def run_bumping_script
+
+  check_repo_is_clean_or_dry_run
+  spec_file = find_spec_file
+  result, versions_array = find_version_in_podspec(spec_file)
+  bumped_version = bump_version(versions_array)
+
+  unless @options[:dry_run]
+    puts 'Are you sure? Press Y to continue:'
+    str = gets.chomp
+    if str != 'Y'
+      puts '-> exit'
+      exit
+    end
+  end
+
+  execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" README.md")
+  execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" #{spec_file}")
+  execute_line_if_not_dry_run("git commit --all -m \"Update #{$SPEC_TYPE} to version #{bumped_version}\"")
+  execute_line_if_not_dry_run("git tag #{bumped_version}")
+  execute_line_if_not_dry_run('git push')
+  execute_line_if_not_dry_run('git push --tags')
+  execute_line_if_not_dry_run("gem build #{spec_file}")
+
+  gem = find_current_gem_file
+  execute_line_if_not_dry_run("gem push #{gem}")
+  # execute_line_if_not_dry_run("pod trunk push #{spec_file}")
+
+end
+
+def revert_last_bump
+  spec_file = find_spec_file
+  result, _ = find_version_in_podspec(spec_file)
+
+  puts "DELETE tag #{result} and HARD reset HEAD~1?\nPress Y to continue:"
+  str = gets.chomp
+  if str != 'Y'
+    puts '-> exit'
+    exit
+  end
+  execute_line_if_not_dry_run("git tag -d #{result}")
+  execute_line_if_not_dry_run('git reset --hard HEAD~1')
+  execute_line_if_not_dry_run("git push --delete origin #{result}")
+end
+
+if __FILE__ == $0
+
+  if @options[:revert]
+    revert_last_bump
+  else
+    run_bumping_script
+  end
+
+end

github_changelog_generator.gemspec

@@ -1,22 +1,32 @@
-Gem::Specification.new do |s|
+# coding: utf-8
-  s.name               = "github_changelog_generator"
-  s.version            = "0.0.1"
-  s.default_executable = "github_changelog_generator"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+lib = File.expand_path('../lib', __FILE__)
-  s.authors = ["Petr Korolev"]
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-  s.date = %q{2014-10-10}
+require 'github_changelog_generator/version'
-  s.description = %q{Script, that automatically generate change-log from your tags and pull-requests}
-  s.email = %q{sky4winder+github_changelog_generator@gmail.com}
-  s.files = ["lib/github_changelog_generator.rb", "lib/github_changelog_generator/parser.rb", "bin/github_changelog_generator"]
-  s.homepage = %q{https://github.com/skywinder/Github-Changelog-Generator}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Script, that automatically generate change-log from your tags and pull-requests.}
-  s.license       = "MIT"
 
-  s.add_runtime_dependency(%q<httparty>, ["~> 0.6"])
+Gem::Specification.new do |spec|
-  s.add_runtime_dependency(%q<github_api>, ["~> 0.12"])
+  spec.name               = "github_changelog_generator"
+  spec.version            = GitHubChangelogGenerator::VERSION
+  spec.default_executable = "github_changelog_generator"
+
+  spec.required_ruby_version     = '>= 1.9.3'
+  spec.authors = ["Petr Korolev"]
+  spec.email = %q{sky4winder+github_changelog_generator@gmail.com}
+  spec.date = `date +"%Y-%m-%d"`.strip!
+  spec.summary = %q{Script, that automatically generate change-log from your tags and pull-requests.}
+  spec.description = %q{Script, that automatically generate change-log from your tags and pull-requests}
+  spec.homepage = %q{https://github.com/skywinder/Github-Changelog-Generator}
+  spec.license       = "MIT"
+
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_runtime_dependency(%q<github_api>, ["~> 0.12"])
+  spec.add_runtime_dependency(%q<colorize>, ["~> 0.7"])
 
-  s.executables   = %w(github_changelog_generator)
 end

lib/github_changelog_generator.rb

@@ -2,24 +2,48 @@
 
 require 'github_api'
 require 'json'
-require 'httparty'
+require 'colorize'
+require 'benchmark'
+
 require_relative 'github_changelog_generator/parser'
+require_relative 'github_changelog_generator/generator'
+require_relative 'github_changelog_generator/version'
 
-
+module GitHubChangelogGenerator
   class ChangelogGenerator
 
-  attr_accessor :options, :all_tags
+    attr_accessor :options, :all_tags, :github
 
-  def initialize()
+    PER_PAGE_NUMBER = 30
+
+    def initialize
 
       @options = Parser.parse_options
-    if @options[:token]
+
-      @github = Github.new oauth_token: @options[:token]
+      if options[:verbose]
-    else
+        puts 'Input options:'
-      @github = Github.new
+        pp options
+        puts ''
       end
+
+      github_token
+
+      if @github_token.nil?
+        @github = Github.new per_page: PER_PAGE_NUMBER
+      else
+        @github = Github.new oauth_token: @github_token,
+                             per_page: PER_PAGE_NUMBER
+      end
+
+      @generator = Generator.new(@options)
+
       @all_tags = self.get_all_tags
       @pull_requests = self.get_all_closed_pull_requests
+      if @options[:issues]
+        @issues = self.get_all_issues
+      else
+        @issues = []
+      end
 
       @tag_times_hash = {}
     end
@@ -29,23 +53,65 @@ class ChangelogGenerator
     end
 
     def exec_command(cmd)
-    exec_cmd = "cd #{$project_path} && #{cmd}"
+      exec_cmd = "cd #{$project_path} and #{cmd}"
       %x[#{exec_cmd}]
     end
 
 
     def get_all_closed_pull_requests
 
-
-    issues = @github.pull_requests.list @options[:user], @options[:project], :state => 'closed'
-    json = issues.body
-
       if @options[:verbose]
-      puts 'Receive all pull requests'
+        print "Fetching pull requests...\r"
       end
 
-    json
+      response = @github.pull_requests.list @options[:user], @options[:project], :state => 'closed'
 
+      pull_requests = []
+      page_i = 0
+      response.each_page do |page|
+        page_i += PER_PAGE_NUMBER
+        print "Fetching pull requests... #{page_i}\r"
+        pull_requests.concat(page)
+      end
+
+      print "\r"
+
+      if @options[:verbose]
+        puts "Received closed pull requests: #{pull_requests.count}"
+      end
+
+      unless @options[:pull_request_labels].nil?
+
+        if @options[:verbose]
+          puts 'Filter all pull requests by labels.'
+        end
+
+        filtered_pull_requests = pull_requests.select { |pull_request|
+          #We need issue to fetch labels
+          issue = @github.issues.get @options[:user], @options[:project], pull_request.number
+          #compare is there any labels from @options[:labels] array
+          select_no_label = !issue.labels.map { |label| label.name }.any?
+
+          if @options[:verbose]
+            puts "Filter request \##{issue.number}."
+          end
+
+          if @options[:pull_request_labels].any?
+            select_by_label = (issue.labels.map { |label| label.name } & @options[:pull_request_labels]).any?
+          else
+            select_by_label = false
+          end
+
+          select_by_label | select_no_label
+        }
+
+        if @options[:verbose]
+          puts "Filtered pull requests with specified labels and w/o labels: #{filtered_pull_requests.count}"
+        end
+        return filtered_pull_requests
+      end
+
+      pull_requests
     end
 
     def compund_changelog
@@ -57,8 +123,7 @@ class ChangelogGenerator
 
       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]
         tags_strings = []
@@ -82,24 +147,41 @@ class ChangelogGenerator
         log += self.generate_log_for_all_tags
       end
 
+      log += "\n\n\\* *This changelog was generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*"
 
-    if @options[:verbose]
+      output_filename = "#{@options[:output]}"
-      puts log
-    end
-
-    output_filename = "#{@options[:project]}_changelog.md"
       File.open(output_filename, 'w') { |file| file.write(log) }
 
-    puts "Done! Generated log placed in #{output_filename}"
+      puts "Done! Generated log placed in #{`pwd`.strip!}/#{output_filename}"
 
     end
 
     def generate_log_for_all_tags
       log = ''
-    for index in 1 ... self.all_tags.size
+
-      log += self.generate_log_between_tags(self.all_tags[index-1], self.all_tags[index])
+      # Async fetching tags:
+      threads = []
+      @all_tags.each { |tag|
+        threads << Thread.new { self.get_time_of_tag(tag) }
+      }
+      threads.each { |thr| thr.join }
+
+      if @options[:verbose]
+        puts "Sorting tags.."
       end
 
+      @all_tags.sort_by! { |x| self.get_time_of_tag(x) }.reverse!
+
+      if @options[:verbose]
+        puts "Generating log.."
+      end
+
+      (1 ... self.all_tags.size).each { |index|
+        log += self.generate_log_between_tags(self.all_tags[index], self.all_tags[index-1])
+      }
+
+      log += generate_log_between_tags(nil, self.all_tags.last)
+
       log
     end
 
@@ -107,78 +189,155 @@ class ChangelogGenerator
       @github.pull_requests.merged? @options[:user], @options[:project], number
     end
 
-  def get_all_merged_pull_requests
-    json = self.get_all_closed_pull_requests
-    puts 'Check if the requests is merged... (it can take a while)'
-
-    json.delete_if { |req|
-      merged = self.is_megred(req[:number])
-      if @options[:verbose]
-        puts "##{req[:number]} #{merged ? 'merged' : 'not merged'}"
-      end
-      !merged
-    }
-  end
-
     def get_all_tags
 
-    url = "https://api.github.com/repos/#{@options[:user]}/#{@options[:project]}/tags"
-
       if @options[:verbose]
-      puts "Receive tags for repo #{url}"
+        print "Fetching tags...\r"
       end
 
-    response = HTTParty.get(url,
+      response = @github.repos.tags @options[:user], @options[:project]
-                            :headers => {'Authorization' => 'token 8587bb22f6bf125454768a4a19dbcc774ea68d48',
-                                        'User-Agent' => 'Changelog-Generator'})
-
-    json_parse = JSON.parse(response.body)
 
+      tags = []
+      page_i = 0
+      response.each_page do |page|
+        page_i += PER_PAGE_NUMBER
+        print "Fetching tags... #{page_i}\r"
+        tags.concat(page)
+      end
+      print "\r"
       if @options[:verbose]
-      puts "Found #{json_parse.count} tags"
+        puts "Found #{tags.count} tags"
       end
 
-    json_parse
+      tags
     end
 
-  def generate_log_between_tags(since_tag, till_tag)
+    def github_token
-    since_tag_time = self.get_time_of_tag(since_tag)
+      if @options[:token]
-    till_tag_time = self.get_time_of_tag(till_tag)
+        return @github_token ||= @options[:token]
-
-    # if we mix up tags order - lits fix it!
-    if since_tag_time > till_tag_time
-      since_tag, till_tag = till_tag, since_tag
-      since_tag_time, till_tag_time = till_tag_time, since_tag_time
       end
 
-    till_tag_name = till_tag['name']
+      env_var = ENV.fetch 'CHANGELOG_GITHUB_TOKEN', nil
 
-    pull_requests = Array.new(@pull_requests)
+      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
+      end
 
-    pull_requests.delete_if { |req|
+      @github_token ||= env_var
-      t = Time.parse(req[:closed_at]).utc
-      true_classor_false_class = t > since_tag_time
-      classor_false_class = t < till_tag_time
 
-      in_range = (true_classor_false_class) && (classor_false_class)
+    end
-      !in_range
+
+
+    def generate_log_between_tags(older_tag, newer_tag)
+
+      newer_tag_time = self.get_time_of_tag(newer_tag)
+      newer_tag_name = newer_tag['name']
+
+      if older_tag.nil?
+        filtered_pull_requests = delete_by_time(@pull_requests, :merged_at, newer_tag_time)
+        filtered_issues = delete_by_time(@issues, :closed_at, newer_tag_time)
+      else
+        older_tag_time = self.get_time_of_tag(older_tag)
+        filtered_pull_requests = delete_by_time(@pull_requests, :merged_at, newer_tag_time, older_tag_time)
+        filtered_issues = delete_by_time(@issues, :closed_at, newer_tag_time, older_tag_time)
+      end
+
+      self.create_log(filtered_pull_requests, filtered_issues, newer_tag_name, newer_tag_time)
+
+    end
+
+    def delete_by_time(array, hash_key, newer_tag_time, older_tag_time = nil)
+      array.select { |req|
+        if req[hash_key]
+          t = Time.parse(req[hash_key]).utc
+
+          if older_tag_time.nil?
+            tag_in_range_old = true
+          else
+            tag_in_range_old = t > older_tag_time
+          end
+
+          tag_in_range_new = t <= newer_tag_time
+
+          tag_in_range = (tag_in_range_old) && (tag_in_range_new)
+
+          tag_in_range
+        else
+          false
+        end
       }
-
-    self.create_log(pull_requests, till_tag_name, till_tag_time)
     end
 
-  def create_log(pull_requests, tag_name, tag_time)
+# @param [Array] pull_requests
+# @param [Array] issues
+# @param [String] tag_name
+# @param [String] tag_time
+# @return [String]
+    def create_log(pull_requests, issues, tag_name, tag_time)
 
-    trimmed_tag = tag_name.tr('v', '')
+      # Generate tag name and link
-    log = "## [#{trimmed_tag}] (https://github.com/#{@options[:user]}/#{@options[:project]}/tree/#{tag_name})\n"
+      log = "## [#{tag_name}] (https://github.com/#{@options[:user]}/#{@options[:project]}/tree/#{tag_name})\n"
 
+      #Generate date string:
       time_string = tag_time.strftime @options[:format]
       log += "#### #{time_string}\n"
 
-    pull_requests.each { |dict|
+      if @options[:pulls]
-      merge = "#{dict[:title]} [\\##{dict[:number]}](https://github.com/#{@options[:user]}/#{@options[:project]}/pull/#{dict[:number]})\n\n"
+        # Generate pull requests:
+        pull_requests.each { |pull_request|
+          merge = @generator.get_string_for_pull_request(pull_request)
+          log += "- #{merge}"
+
+        } if pull_requests
+      end
+
+      if @options[:issues]
+        # Generate issues:
+        if issues
+          issues.sort! { |x, y|
+            if x.labels.any? && y.labels.any?
+              x.labels[0].name <=> y.labels[0].name
+            else
+              if x.labels.any?
+                1
+              else
+                if y.labels.any?
+                  -1
+                else
+                  0
+                end
+              end
+            end
+          }.reverse!
+        end
+        issues.each { |dict|
+          is_bug = false
+          is_enhancement = false
+          dict.labels.each { |label|
+            if label.name == 'bug'
+              is_bug = true
+            end
+            if label.name == 'enhancement'
+              is_enhancement = true
+            end
+          }
+
+          intro = 'Closed issue'
+          if is_bug
+            intro = 'Fixed bug'
+          end
+
+          if is_enhancement
+            intro = 'Implemented enhancement'
+          end
+
+          enc_string = @generator.encapsulate_string dict[:title]
+
+          merge = "*#{intro}:* #{enc_string} [\\##{dict[:number]}](#{dict.html_url})\n\n"
           log += "- #{merge}"
         }
+      end
       log
     end
 
@@ -188,18 +347,69 @@ class ChangelogGenerator
         return @tag_times_hash[prev_tag['name']]
       end
 
-    if @options[:verbose]
-      puts "Get time for tag #{prev_tag['name']}"
-    end
-
       github_git_data_commits_get = @github.git_data.commits.get @options[:user], @options[:project], prev_tag['commit']['sha']
       time_string = github_git_data_commits_get['committer']['date']
       Time.parse(time_string)
       @tag_times_hash[prev_tag['name']] = Time.parse(time_string)
     end
 
+    def get_all_issues
+
+      if @options[:verbose]
+        print "Fetching closed issues...\r"
+      end
+
+      response = @github.issues.list user: @options[:user], repo: @options[:project], state: 'closed', filter: 'all', labels: nil
+
+      issues = []
+      page_i = 0
+      response.each_page do |page|
+        page_i += PER_PAGE_NUMBER
+        print "Fetching closed issues... #{page_i}\r"
+        issues.concat(page)
+      end
+
+      print "\r"
+
+      # remove pull request from issues:
+      issues.select! { |x|
+        x.pull_request == nil
+      }
+
+      if @options[:verbose]
+        puts "Received closed issues: #{issues.count}"
+      end
+
+
+      if @options[:verbose]
+        puts "Filtering issues with labels #{@options[:labels]}#{@options[:add_issues_wo_labels] ? ' and w/o labels' : ''}"
+      end
+
+      filtered_issues = issues.select { |issue|
+        #compare is there any labels from @options[:labels] array
+        (issue.labels.map { |label| label.name } & @options[:labels]).any?
+      }
+
+      if @options[:add_issues_wo_labels]
+        issues_wo_labels = issues.select {
+          # add issues without any labels
+            |issue| !issue.labels.map { |label| label.name }.any?
+        }
+        filtered_issues.concat(issues_wo_labels)
+      end
+
+      if @options[:verbose]
+        puts "Filtered issues: #{filtered_issues.count}"
+      end
+
+      filtered_issues
+
+    end
+
   end
 
   if __FILE__ == $0
-  ChangelogGenerator.new.compund_changelog
+    GitHubChangelogGenerator::ChangelogGenerator.new.compund_changelog
+  end
+
 end

lib/github_changelog_generator/generator.rb

@@ -0,0 +1,38 @@
+module GitHubChangelogGenerator
+  class Generator
+
+    def initialize(options = nil)
+      @options = options
+    end
+
+    def get_string_for_pull_request(pull_request)
+      encapsulated_title = self.encapsulate_string pull_request[:title]
+
+      merge = "#{@options[:merge_prefix]}#{encapsulated_title} [\\##{pull_request[:number]}](#{pull_request.html_url})"
+      if @options[:author]
+        if !pull_request.user.nil?
+          merge += " ([#{pull_request.user.login}](#{pull_request.user.html_url}))\n\n"
+        else
+          merge += " ({Null user})\n\n"
+        end
+      else
+        merge += "\n\n"
+      end
+      merge
+    end
+
+    def encapsulate_string(string)
+
+      string.gsub! '\\', '\\\\'
+
+      encpas_chars = %w(> * _ \( \) [ ])
+      encpas_chars.each{ |char|
+        string.gsub! char, "\\#{char}"
+      }
+
+      string
+    end
+
+  end
+
+end

lib/github_changelog_generator/parser.rb

@@ -1,43 +1,85 @@
 #!/usr/bin/env ruby
 require 'optparse'
+require 'PP'
+require_relative 'version'
 
+module GitHubChangelogGenerator
   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', :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 -u user_name -p project_name [-t 16-digit-GitHubToken] [options]'
+        opts.banner = 'Usage: changelog_generator [options]'
-      opts.on('-u', '--user [USER]', 'your username on GitHub') do |last|
+        opts.on('-u', '--user [USER]', 'Username of the owner of target GitHub repo') 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') 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 per hour your GitHub token required. You can generate it here: https://github.com/settings/tokens/new') do |last|
           options[:token] = last
         end
+        opts.on('-f', '--date-format [FORMAT]', 'Date format. Default is %d/%m/%y') do |last|
+          options[:format] = last
+        end
+        opts.on('-o', '--output [NAME]', 'Output file. Default is CHANGELOG.md') do |last|
+          options[:output] = last
+        end
+        opts.on('--[no-]verbose', 'Run verbosely. Default is true') do |v|
+          options[:verbose] = v
+        end
+        opts.on('--[no-]issues', 'Include closed issues to changelog. Default is true') do |v|
+          options[:issues] = v
+        end
+        opts.on('--[no-]issues-without-labels', 'Include closed issues without any labels to changelog. Default is true') do |v|
+          options[:add_issues_wo_labels] = v
+        end
+        opts.on('--[no-]pull-requests', 'Include pull-requests to changelog. Default is true') do |v|
+          options[:pulls] = v
+        end
+        opts.on('--[no-]author', 'Add author of pull-request in the end. Default is true') do |author|
+          options[:last] = author
+        end
+        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('--labels-pr x,y,z', Array, 'Only pull requests with specified labels will be included to changelog. Default is nil') do |list|
+          options[:pull_request_labels] = list
+        end
+        opts.on('-v', '--version', 'Print version number') do |v|
+          puts "Version: #{GitHubChangelogGenerator::VERSION}"
+          exit
+        end
         opts.on('-h', '--help', 'Displays Help') do
           puts opts
           exit
         end
-      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|
-        options[:last] = last
-      end
-      opts.on('-f', '--date-format [FORMAT]', 'date format. default is %d/%m/%y') do |last|
-        options[:format] = last
-      end
       }
 
       parser.parse!
 
-    #udefined case with 1 parameter:
       if ARGV[0] && !ARGV[1]
-      puts parser.banner
+        # this match should parse https://github.com/skywinder/Github-Changelog-Generator and skywinder/Github-Changelog-Generator to user and name
+        match = /(?:.+github\.com\/)?(.+)\/(.+)/.match(ARGV[0])
+
+        if match[2].nil?
           exit
+        else
+          options[:user] = match[1]
+          options[:project]= match[2]
         end
+      end
+
+      if !options[:user] && !options[:project]
+        remote = `git remote -vv`.split("\n")
+        match = /.*(?:[:\/])((?:-|\w|\.)*)\/((?:-|\w|\.)*)?(?:\.git).*/.match(remote[0])
+
+        if match && match[1] && match[2]
+          puts "Detected user:#{match[1]}, project:#{match[2]}"
+          options[:user], options[:project] = match[1], match[2]
+        end
+      end
+
 
       if !options[:user] || !options[:project]
         puts parser.banner
@@ -47,9 +89,9 @@ class Parser
       if ARGV[1]
         options[:tag1] = ARGV[0]
         options[:tag2] = ARGV[1]
-
       end
 
       options
     end
   end
+end

lib/github_changelog_generator/version.rb

@@ -0,0 +1,3 @@
+module GitHubChangelogGenerator
+  VERSION = '1.2.4'
+end