Merge branch 'release/1.10.5'

.gitignore

@@ -1,7 +1 @@
-bin/
-!bin/git-generate-changelog
-!bin/github_changelog_generator
-pkg/
 coverage/
-.bundle
-spec/*.lock

.travis.yml

@@ -1,27 +1,16 @@
-cache:
+sudo: false
-  - bundler
 language: ruby
-before_install:
+before_install: 
-  - gem update --system
+- gem update --system
-  - gem install bundler
+- gem install bundler
 rvm:
-  - 2.1
+- 2.1.0
-script: bundle exec rake checks
+script:
-matrix:
+- bundle exec rake checks
-  include:
-    # Test install on clean system
-    - install: true
-      script:
-        - gem build github_changelog_generator
-        - gem install *.gem
-    - install: true
-      script:
-        - gem build github_changelog_generator
-        - bundle install --gemfile spec/install-gem-in-bundler.gemfile
 notifications:
   email:
     recipients:
-      - sky4winder+githubchangeloggenerator@gmail.com
+    - sky4winder+githubchangeloggenerator@gmail.com
     on_success: never
     on_failure: change
 addons:

CHANGELOG.md

@@ -1,107 +1,5 @@
 # Change Log
 
-## [1.11.8](https://github.com/skywinder/github-changelog-generator/tree/1.11.8) (2016-03-22)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.7...1.11.8)
-
-**Implemented enhancements:**
-
-- ParserFile: Allow comments in settings file [\#358](https://github.com/skywinder/github-changelog-generator/pull/358) ([olleolleolle](https://github.com/olleolleolle))
-
-**Fixed bugs:**
-
-- Error when specifying exclude\_labels [\#327](https://github.com/skywinder/github-changelog-generator/issues/327)
-- Parse options file options into arrays, integers, flags, and other [\#354](https://github.com/skywinder/github-changelog-generator/pull/354) ([olleolleolle](https://github.com/olleolleolle))
-
-**Closed issues:**
-
-- Installation fails on Ubuntu [\#352](https://github.com/skywinder/github-changelog-generator/issues/352)
-- Test installing on Windows: use AppVeyor [\#348](https://github.com/skywinder/github-changelog-generator/issues/348)
-- Can't run under RubyGems 2.5.1 and Ruby 2.3.0 [\#325](https://github.com/skywinder/github-changelog-generator/issues/325)
-- Ruby 2.3.0 - Deprecation warning: Github::ResponseWrapper\#respond\_to?\(:to\_ary\) is old fashion which takes only one parameter [\#323](https://github.com/skywinder/github-changelog-generator/issues/323)
-- between-tags and exclude-tags do not work in .github\_changelog\_generator [\#317](https://github.com/skywinder/github-changelog-generator/issues/317)
-- Add a "documentation" label [\#284](https://github.com/skywinder/github-changelog-generator/issues/284)
-
-**Merged pull requests:**
-
-- Replace shelling-out-to-Git w/ Dir call [\#360](https://github.com/skywinder/github-changelog-generator/pull/360) ([olleolleolle](https://github.com/olleolleolle))
-- ParserFile: fail parsing with config file line number; use a File instead of a filename [\#357](https://github.com/skywinder/github-changelog-generator/pull/357) ([olleolleolle](https://github.com/olleolleolle))
-- On gem install, do not try to copy manpage files in the "extensions" step [\#356](https://github.com/skywinder/github-changelog-generator/pull/356) ([olleolleolle](https://github.com/olleolleolle))
-- Refactor: call it option\_name, instead of key\_sym [\#355](https://github.com/skywinder/github-changelog-generator/pull/355) ([olleolleolle](https://github.com/olleolleolle))
-- Add a `bundle install` test [\#353](https://github.com/skywinder/github-changelog-generator/pull/353) ([jkeiser](https://github.com/jkeiser))
-- Add an AppVeyor config [\#350](https://github.com/skywinder/github-changelog-generator/pull/350) ([Arcanemagus](https://github.com/Arcanemagus))
-- README: Document GitHub token URI scope [\#345](https://github.com/skywinder/github-changelog-generator/pull/345) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.7](https://github.com/skywinder/github-changelog-generator/tree/1.11.7) (2016-03-04)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.6...1.11.7)
-
-**Merged pull requests:**
-
-- Add Olle Jonsson as co-author [\#347](https://github.com/skywinder/github-changelog-generator/pull/347) ([skywinder](https://github.com/skywinder))
-- Gemspec, default date [\#346](https://github.com/skywinder/github-changelog-generator/pull/346) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.6](https://github.com/skywinder/github-changelog-generator/tree/1.11.6) (2016-03-01)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.5...1.11.6)
-
-**Fixed bugs:**
-
-- Can't build on Windows [\#340](https://github.com/skywinder/github-changelog-generator/issues/340)
-
-**Closed issues:**
-
-- install error "Not a git repository" [\#339](https://github.com/skywinder/github-changelog-generator/issues/339)
-
-**Merged pull requests:**
-
-- Gemspec: Calculate date using Date stdlib [\#343](https://github.com/skywinder/github-changelog-generator/pull/343) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.5](https://github.com/skywinder/github-changelog-generator/tree/1.11.5) (2016-03-01)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.4...1.11.5)
-
-**Merged pull requests:**
-
-- Test clean install in Travis [\#344](https://github.com/skywinder/github-changelog-generator/pull/344) ([jkeiser](https://github.com/jkeiser))
-- Update Rakefile to avoid install-breaking bug [\#341](https://github.com/skywinder/github-changelog-generator/pull/341) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.4](https://github.com/skywinder/github-changelog-generator/tree/1.11.4) (2016-02-26)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.3...1.11.4)
-
-**Merged pull requests:**
-
-- Man page copying: only copy .1 [\#338](https://github.com/skywinder/github-changelog-generator/pull/338) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.3](https://github.com/skywinder/github-changelog-generator/tree/1.11.3) (2016-02-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.2...1.11.3)
-
-**Closed issues:**
-
-- Cannot install gem [\#335](https://github.com/skywinder/github-changelog-generator/issues/335)
-
-## [1.11.2](https://github.com/skywinder/github-changelog-generator/tree/1.11.2) (2016-02-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.1...1.11.2)
-
-**Fixed bugs:**
-
-- Getting an error on install [\#329](https://github.com/skywinder/github-changelog-generator/issues/329)
-
-**Merged pull requests:**
-
-- Fix installation by not running the specs - which have dependencies [\#337](https://github.com/skywinder/github-changelog-generator/pull/337) ([skywinder](https://github.com/skywinder))
-
-## [1.11.1](https://github.com/skywinder/github-changelog-generator/tree/1.11.1) (2016-02-25)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.11.0...1.11.1)
-
-**Merged pull requests:**
-
-- Add rubocop and rspec as runtime dependencies [\#336](https://github.com/skywinder/github-changelog-generator/pull/336) ([jkeiser](https://github.com/jkeiser))
-- \[Refactor\] ParserFile class use Pathname [\#334](https://github.com/skywinder/github-changelog-generator/pull/334) ([olleolleolle](https://github.com/olleolleolle))
-- \[Refactor\] Generator\#exclude\_issues\_by\_labels simpler, tested [\#332](https://github.com/skywinder/github-changelog-generator/pull/332) ([olleolleolle](https://github.com/olleolleolle))
-
-## [1.11.0](https://github.com/skywinder/github-changelog-generator/tree/1.11.0) (2016-02-24)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.5...1.11.0)
-
-## [1.10.5](https://github.com/skywinder/github-changelog-generator/tree/1.10.5) (2016-02-24)
-[Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.4...1.10.5)
-
 ## [1.10.4](https://github.com/skywinder/github-changelog-generator/tree/1.10.4) (2016-02-24)
 [Full Changelog](https://github.com/skywinder/github-changelog-generator/compare/1.10.3...1.10.4)
 

Gemfile

@@ -3,10 +3,8 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem "rake"
+  gem "rspec", "~>3.2"
-  gem "bundler"
+  gem "rubocop", "~>0.31"
-  gem "rubocop"
-  gem "overcommit"
   gem "coveralls", "~>0.8", require: false
   gem "simplecov", "~>0.10", require: false
   gem "codeclimate-test-reporter", "~>0.4"

Gemfile.lock

@@ -1,14 +1,12 @@
 PATH
   remote: .
   specs:
-    github_changelog_generator (1.11.8)
+    github_changelog_generator (1.10.4)
-      bundler (>= 1.7)
+      bundler (~> 1.7)
       colorize (~> 0.7)
       github_api (~> 0.12)
-      overcommit (>= 0.31)
+      overcommit (~> 0.31)
-      rake (>= 10.0)
+      rake (~> 10.0)
-      rspec (>= 3.2)
-      rubocop (>= 0.31)
 
 GEM
   remote: https://rubygems.org/
@@ -17,10 +15,10 @@ GEM
     ast (2.2.0)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.5.0)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     colorize (0.7.7)
-    coveralls (0.8.13)
+    coveralls (0.8.11)
       json (~> 1.8)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
@@ -61,12 +59,12 @@ GEM
     powerpack (0.1.1)
     rack (1.6.4)
     rainbow (2.1.0)
-    rake (11.0.1)
+    rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
+    rspec-core (3.4.3)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -75,12 +73,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.38.0)
+    rubocop (0.37.2)
-      parser (>= 2.3.0.6, < 3.0)
+      parser (>= 2.3.0.4, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 0.3)
     ruby-progressbar (1.7.5)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -92,19 +90,17 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tins (1.6.0)
-    unicode-display_width (1.0.1)
+    unicode-display_width (0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   codeclimate-test-reporter (~> 0.4)
   coveralls (~> 0.8)
   github_changelog_generator!
-  overcommit
+  rspec (~> 3.2)
-  rake
+  rubocop (~> 0.31)
-  rubocop
   simplecov (~> 0.10)
 
 BUNDLED WITH

README.md

@@ -101,7 +101,7 @@ Therefore, it's recommended to run this script with authentication by using a **
 
 Here's how:
 
-- [Generate a token here](https://github.com/settings/tokens/new?description=GitHub%20Changelog%20Generator%20token) - you only need "repo" scope for private repositories
+- [Generate a token here](https://github.com/settings/tokens/new?description=GitHub%20Changelog%20Generator%20token)
 - Either:
     - Run the script with `--token <your-40-digit-token>`; **OR**
     - Set the `CHANGELOG_GITHUB_TOKEN` environment variable to your 40 digit token

Rakefile

@@ -9,31 +9,15 @@ require "overcommit"
 RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:rspec)
 
-task :copy_man_page_to_manpath do |_t|
+task :create_man do |_t|
-  known_manpath_paths = %w(/etc/manpath.config /etc/manpaths)
+  os_prefix = "/usr/local"
-  manpath = known_manpath_paths.find do |f|
+  man_prefix = Pathname("#{os_prefix}/share/man/man1")
-    path = Pathname(f)
+  man_pages = "man/git-*"
-    path.file? && path.readable?
-  end
-
-  next unless manpath
-
-  writable_man_path = Pathname(manpath).each_line.find do |line|
-    path = Pathname(line.chomp)
-    path.directory? && path.writable?
-  end
-
-  next unless writable_man_path
-
-  man_prefix = Pathname("#{writable_man_path.chomp}/man1")
-  man_pages = "man/git-*.1"
 
   Pathname.glob(man_pages) do |path|
-    if path.exist? && man_prefix.exist? && man_prefix.writable?
+    FileUtils.cp(path, man_prefix + path.basename)
-      FileUtils.cp(path, man_prefix + path.basename)
-    end
   end
 end
 
 task checks: [:rubocop, :rspec]
-task default: [:copy_man_page_to_manpath]
+task default: [:checks, :create_man]

appveyor.yml

@@ -1,50 +0,0 @@
-version: "{build}"
-
-platform: x64
-
-branches:
-    only:
-      - master
-
-clone_depth: 10
-
-skip_tags: true
-
-# See here for Ruby versions pre-installed:
-#  http://www.appveyor.com/docs/installed-software#ruby
-environment:
-  matrix:
-    - ruby_version: "21" # Older version, but matches Travis-CI
-    - ruby_version: "21-x64"
-
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-
-  # Print version and location for pre-installed ruby
-  - ruby --version
-  - where ruby
-
-  # Install latest version of RubyGems
-  - gem update --system --no-document --no-post-install-message
-  - gem --version
-  - where gem
-
-  # Print version and location for pre-installed bundler
-  - bundler --version
-  - where bundler
-
-build_script:
-  # Install ruby dependencies
-  - bundle install --retry 3
-  - bundle exec rake checks
-
-test_script:
-  - gem build github_changelog_generator
-  - gem install *.gem
-
-notifications:
-  - provider: Email
-    to:
-      - sky4winder+githubchangeloggenerator@gmail.com
-    on_build_success: false
-    on_build_status_changed: true

github_changelog_generator.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "github_changelog_generator/version"
@@ -9,25 +10,23 @@ Gem::Specification.new do |spec|
   spec.default_executable = "github_changelog_generator"
 
   spec.required_ruby_version = ">= 1.9.3"
-  spec.authors = ["Petr Korolev", "Olle Jonsson"]
+  spec.authors = ["Petr Korolev"]
   spec.email = "sky4winder+github_changelog_generator@gmail.com"
-
+  spec.date = `date +"%Y-%m-%d"`.strip!
   spec.summary = "Script, that automatically generate changelog from your tags, issues, labels and pull requests."
   spec.description = "Changelog generation has never been so easy. Fully automate changelog generation - this gem generate change log file based on tags, issues and merged pull requests from Github issue tracker."
   spec.homepage = "https://github.com/skywinder/Github-Changelog-Generator"
   spec.license = "MIT"
+  #  spec.extensions = ["Rakefile"]
 
-  spec.files = Dir["{bin,lib,man,spec}/**/*", "Rakefile", "README.md"]
+  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_runtime_dependency "rake", ">= 10.0"
+  spec.add_runtime_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "bundler", ">= 1.7"
+  spec.add_runtime_dependency "bundler", "~> 1.7"
   spec.add_runtime_dependency("github_api", ["~> 0.12"])
   spec.add_runtime_dependency("colorize", ["~> 0.7"])
-  spec.add_runtime_dependency("overcommit", ">= 0.31")
+  spec.add_runtime_dependency("overcommit", "~>0.31")
-  spec.add_runtime_dependency("rubocop", ">= 0.31")
-  spec.add_runtime_dependency("rspec", ">= 3.2")
 end

lib/github_changelog_generator/generator/generator_processor.rb

@@ -4,12 +4,13 @@ module GitHubChangelogGenerator
     # @param [Array] issues
     # @return [Array] filtered array
     def exclude_issues_by_labels(issues)
-      return issues if !@options[:exclude_labels] || @options[:exclude_labels].empty?
+      unless @options[:exclude_labels].nil?
-
+        issues = issues.select do |issue|
-      issues.reject do |issue|
+          var = issue.labels.map(&:name) & @options[:exclude_labels]
-        labels = issue.labels.map(&:name)
+          !var.any?
-        (labels & @options[:exclude_labels]).any?
+        end
       end
+      issues
     end
 
     # @return [Array] filtered issues accourding milestone

lib/github_changelog_generator/generator/generator_tags.rb

@@ -129,34 +129,26 @@ module GitHubChangelogGenerator
     end
 
     # @param [Array] all_tags all tags
-    # @return [Array] filtered tags according :exclude_tags or :exclude_tags_regex option
+    # @return [Array] filtered tags according :exclude_tags option
     def filter_excluded_tags(all_tags)
-      if @options[:exclude_tags]
+      return all_tags unless @options[:exclude_tags]
-        apply_exclude_tags(all_tags)
+
-      elsif @options[:exclude_tags_regex]
+      apply_exclude_tags(all_tags)
-        apply_exclude_tags_regex(all_tags)
-      else
-        all_tags
-      end
     end
 
     private
 
     def apply_exclude_tags(all_tags)
       if @options[:exclude_tags].is_a?(Regexp)
-        filter_tags_with_regex(all_tags, @options[:exclude_tags])
+        filter_tags_with_regex(all_tags)
       else
         filter_exact_tags(all_tags)
       end
     end
 
-    def apply_exclude_tags_regex(all_tags)
+    def filter_tags_with_regex(all_tags)
-      filter_tags_with_regex(all_tags, Regexp.new(@options[:exclude_tags_regex]))
-    end
-
-    def filter_tags_with_regex(all_tags, regex)
       warn_if_nonmatching_regex(all_tags)
-      all_tags.reject { |tag| regex =~ tag.name }
+      all_tags.reject { |tag| @options[:exclude_tags] =~ tag.name }
     end
 
     def filter_exact_tags(all_tags)

lib/github_changelog_generator/parser.rb

@@ -122,9 +122,6 @@ module GitHubChangelogGenerator
         opts.on("--exclude-tags  x,y,z", Array, "Change log will exclude specified tags") do |list|
           options[:exclude_tags] = list
         end
-        opts.on("--exclude-tags-regex [REGEX]", "Apply a regular expression on tag names so that they can be excluded, for example: --exclude-tags-regex \".*\+\d{1,}\" ") do |last|
-          options[:exclude_tags_regex] = last
-        end
         opts.on("--since-tag  x", "Change log will start after specified tag") do |v|
           options[:since_tag] = v
         end

lib/github_changelog_generator/parser_file.rb

@@ -1,61 +1,33 @@
-require "pathname"
-
 module GitHubChangelogGenerator
   ParserError = Class.new(StandardError)
 
-  # ParserFile is a configuration file reader which sets options in the
-  # given Hash.
-  #
-  # In your project's root, you can put a file named
-  # <tt>.github_changelog_generator</tt> to override defaults.
-  #
-  # Example:
-  #   header_label=# My Super Changelog
-  #   ; Comments are allowed
-  #   future-release=5.0.0
-  #   # Ruby-style comments, too
-  #   since-tag=1.0.0
-  #
-  # The configuration format is <tt>some-key=value</tt> or <tt>some_key=value</tt>.
-  #
   class ParserFile
-    # @param options [Hash] options to be configured from file contents
+    def initialize(options)
-    # @param file [nil,IO] configuration file handle, defaults to opening `.github_changelog_generator`
-    def initialize(options, file = open_settings_file)
       @options = options
-      @file = file
     end
 
-    # Sets options using configuration file content
     def parse!
-      return unless @file
+      return unless File.exist?(file)
-      @file.each_with_index { |line, i| parse_line!(line, i + 1) }
+
-      @file.close
+      File.readlines(file).each { |line| parse_line!(line) }
     end
 
     private
 
-    FILENAME = ".github_changelog_generator"
+    def file
-
+      @file ||= File.expand_path(@options[:params_file] || ".github_changelog_generator")
-    def open_settings_file
-      path = Pathname(File.expand_path(FILENAME))
-      File.open(path) if path.exist?
     end
 
-    def parse_line!(line, line_number)
+    def parse_line!(line)
-      return if non_configuration_line?(line)
+      key_sym, value = extract_pair(line)
-      option_name, value = extract_pair(line)
+      value = true if value =~ /^(true|t|yes|y|1)$/i
-      @options[option_key_for(option_name)] = convert_value(value, option_name)
+      value = false if value =~ /^(false|f|no|n|0)$/i
+      @options[key_sym] = value
     rescue
-      raise ParserError, "Failed on line ##{line_number}: \"#{line.gsub(/[\n\r]+/, '')}\""
+      raise ParserError, "Config file #{file} is incorrect in line \"#{line.gsub(/[\n\r]+/, '')}\""
     end
 
-    # Returns true if the line starts with a pound sign or a semi-colon.
+    # Returns a the setting as a symbol and its string value sans newlines.
-    def non_configuration_line?(line)
-      line =~ /^[\#;]/ || line =~ /^[\s]+$/
-    end
-
-    # Returns a the option name as a symbol and its string value sans newlines.
     #
     # @param line [String] unparsed line from config file
     # @return [Array<Symbol, String>]
@@ -63,41 +35,5 @@ module GitHubChangelogGenerator
       key, value = line.split("=", 2)
       [key.sub("-", "_").to_sym, value.gsub(/[\n\r]+/, "")]
     end
-
-    KNOWN_ARRAY_KEYS = [:exclude_labels, :include_labels, :bug_labels,
-                        :enhancement_labels, :between_tags, :exclude_tags]
-    KNOWN_INTEGER_KEYS = [:max_issues]
-
-    def convert_value(value, option_name)
-      if KNOWN_ARRAY_KEYS.include?(option_name)
-        value.split(",")
-      elsif KNOWN_INTEGER_KEYS.include?(option_name)
-        value.to_i
-      elsif value =~ /^(true|t|yes|y|1)$/i
-        true
-      elsif value =~ /^(false|f|no|n|0)$/i
-        false
-      else
-        value
-      end
-    end
-
-    IRREGULAR_OPTIONS = {
-      bugs_label: :bug_prefix,
-      enhancement_label: :enhancement_prefix,
-      issues_label: :issue_prefix,
-      header_label: :header,
-      front_matter: :frontmatter,
-      pr_label: :merge_prefix,
-      issues_wo_labels: :add_issues_wo_labels,
-      pr_wo_labels: :add_pr_wo_labels,
-      pull_requests: :pulls,
-      filter_by_milestone: :filter_issues_by_milestone,
-      github_api: :github_endpoint
-    }
-
-    def option_key_for(option_name)
-      IRREGULAR_OPTIONS.fetch(option_name) { option_name }
-    end
   end
 end

lib/github_changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module GitHubChangelogGenerator
-  VERSION = "1.12.0"
+  VERSION = "1.10.5"
 end

spec/files/github_changelog_params_327

@@ -0,0 +1 @@
+exclude-labels=73a91042-da6f-11e5-9335-1040f38d7f90,7adf83b4-da6f-11e5-ae18-1040f38d7f90

spec/files/github_changelog_params_incorrect

@@ -0,0 +1,2 @@
+unreleased_label: staging
+unreleased: false

spec/files/github_changelog_params_override

@@ -0,0 +1,3 @@
+unreleased_label=staging
+unreleased=false
+header==== Changelog ===

spec/install-gem-in-bundler.gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "github_changelog_generator", path: Dir.glob("../pkg/github_changelog_generator-*.gem")[0]

spec/unit/generator/generator_processor_spec.rb

@@ -1,28 +0,0 @@
-module GitHubChangelogGenerator
-  describe Generator do
-    context "#exclude_issues_by_labels" do
-      let(:label) { double("the-bad-label", name: "BAD") }
-      let(:issue) { double("the-issue-to-be-excluded", labels: [label]) }
-      let(:good_label) { double("a-good-label", name: "GOOD") }
-      let(:good_issue) { double("an-issue-to-be-kept", labels: [good_label]) }
-      let(:issues) { [issue, good_issue] }
-      subject(:generator) { described_class.new(exclude_labels: %w(BAD BOO)) }
-
-      it "removes issues with labels in the exclude_label list" do
-        result = generator.exclude_issues_by_labels(issues)
-
-        expect(result).to include(good_issue)
-        expect(result).not_to include(issue)
-      end
-
-      context "with no option given" do
-        subject(:generator) { described_class.new }
-        it "passes everything through when no option given" do
-          result = generator.exclude_issues_by_labels(issues)
-
-          expect(result).to eq(issues)
-        end
-      end
-    end
-  end
-end

spec/unit/generator/generator_tags_spec.rb

@@ -76,47 +76,31 @@ describe GitHubChangelogGenerator::Generator do
   describe "#filter_excluded_tags" do
     subject { generator.filter_excluded_tags(tags_mash_from_strings(%w(1 2 3))) }
 
-    context "with matching string" do
+    context "with valid excluded tags" do
       let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(3)) }
       it { is_expected.to be_a Array }
       it { is_expected.to match_array(tags_mash_from_strings(%w(1 2))) }
     end
 
-    context "with non-matching string" do
+    context "with invalid excluded tags" do
       let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(invalid tags)) }
       it { is_expected.to be_a Array }
       it { is_expected.to match_array(tags_mash_from_strings(%w(1 2 3))) }
     end
 
-    context "with matching regex" do
+    context "with regex exclude_tags" do
       let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: /[23]/) }
       it { is_expected.to be_a Array }
       it { is_expected.to match_array(tags_mash_from_strings(%w(1))) }
     end
 
-    context "with non-matching regex" do
+    context "with non-matching regex in exclude_tags" do
       let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: /[abc]/) }
       it { is_expected.to be_a Array }
       it { is_expected.to match_array(tags_mash_from_strings(%w(1 2 3))) }
     end
   end
 
-  describe "#filter_excluded_tags_regex" do
-    subject { generator.filter_excluded_tags(tags_mash_from_strings(%w(1 2 3))) }
-
-    context "with matching regex" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags_regex: '[23]') }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1))) }
-    end
-
-    context "with non-matching regex" do
-      let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags_regex: '[45]') }
-      it { is_expected.to be_a Array }
-      it { is_expected.to match_array(tags_mash_from_strings(%w(1 2 3))) }
-    end
-  end
-
   describe "#filter_since_tag" do
     context "with filled array" do
       subject { generator.filter_since_tag(tags_mash_from_strings(%w(1 2 3))) }

spec/unit/parse_file_spec.rb

@@ -1,47 +1,36 @@
 describe GitHubChangelogGenerator::ParserFile do
   describe ".github_changelog_generator" do
-    let(:options) { {} }
+    context "when no has file" do
-
+      let(:options) { {} }
-    context "when the well-known default file does not exist" do
+      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options) }
+      subject { parse.parse! }
-      subject { parser.parse! }
       it { is_expected.to be_nil }
     end
 
     context "when file is empty" do
-      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options, StringIO.new("")) }
+      let(:options) { { params_file: "spec/files/github_changelog_params_empty" } }
+      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
 
       it "does not change the options" do
-        expect { parser.parse! }.to_not change { options }
+        expect { parse.parse! }.to_not change { options }
       end
     end
 
     context "when file is incorrect" do
+      let(:options) { { params_file: "spec/files/github_changelog_params_incorrect" } }
       let(:options_before_change) { options.dup }
-      let(:file) { StringIO.new("unreleased_label=staging\nunreleased: false") }
+      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-      let(:parser) do
+      it { expect { parse.parse! }.to raise_error(GitHubChangelogGenerator::ParserError) }
-        GitHubChangelogGenerator::ParserFile.new(options, file)
-      end
-      it { expect { parser.parse! }.to raise_error(/line #2/) }
-    end
-
-    context "allows empty lines and comments with semi-colon or pound sign" do
-      let(:file) { StringIO.new("\n   \n# Comment on first line\nunreleased_label=staging\n; Comment on third line\nunreleased=false") }
-      let(:parser) do
-        GitHubChangelogGenerator::ParserFile.new(options, file)
-      end
-      it { expect { parser.parse! }.not_to raise_error }
     end
 
     context "when override default values" do
       let(:default_options) { GitHubChangelogGenerator::Parser.default_options }
-      let(:options) { {}.merge(default_options) }
+      let(:options) { { params_file: "spec/files/github_changelog_params_override" }.merge(default_options) }
       let(:options_before_change) { options.dup }
-      let(:file) { StringIO.new("unreleased_label=staging\nunreleased=false\nheader==== Changelog ===") }
+      let(:parse) { GitHubChangelogGenerator::ParserFile.new(options) }
-      let(:parser) { GitHubChangelogGenerator::ParserFile.new(options, file) }
 
       it "changes the options" do
-        expect { parser.parse! }.to change { options }
+        expect { parse.parse! }.to change { options }
           .from(options_before_change)
           .to(options_before_change.merge(unreleased_label: "staging",
                                           unreleased: false,
@@ -49,24 +38,17 @@ describe GitHubChangelogGenerator::ParserFile do
       end
 
       context "turns exclude-labels into an Array", bug: '#327' do
-        let(:file) do
+        let(:options) do
-          StringIO.new(<<EOF
+          {
-exclude-labels=73a91042-da6f-11e5-9335-1040f38d7f90,7adf83b4-da6f-11e5-ae18-1040f38d7f90
+            params_file: "spec/files/github_changelog_params_327"
-header_label=# My changelog
+          }
-EOF
-                      )
         end
         it "reads exclude_labels into an Array" do
-          expect { parser.parse! }.to change { options[:exclude_labels] }
+          pending("Related with Bug #327.")
-            .from(default_options[:exclude_labels])
+          expect { parse.parse! }.to change { options[:exclude_labels] }
+            .from(nil)
             .to(["73a91042-da6f-11e5-9335-1040f38d7f90", "7adf83b4-da6f-11e5-ae18-1040f38d7f90"])
         end
-
-        it "translates given header_label into the :header option" do
-          expect { parser.parse! }.to change { options[:header] }
-            .from(default_options[:header])
-            .to("# My changelog")
-        end
       end
     end
   end