conventional-changelog 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce0cf32de55422c10a531945e26796461ea641e2
-  data.tar.gz: 7d31b4086fabc18b11380d1cdae9700c1036af31
+  metadata.gz: 2071ea87d3cc1351bb5af23371ce7ccf983095d0
+  data.tar.gz: 6c997b3a58da55c0ef8772a7432a7e476eb33a2a
 SHA512:
-  metadata.gz: 530c060bb2db10a50be6df9df2dbb2abec50886b344687b17910c4e0197ce29d1a9ecca37b6c87e57ce22a67946bd03b617f3bcae412f7b73728da62359a9322
-  data.tar.gz: d0600c7e482b0b77bf1f22cc2dc9209a292ba88f7a58753af3875b64f52ec5e2718a2e50368f6873e66a1e19385c6b5ac67283ca845f08a8b863b766b1b87a12
+  metadata.gz: 8fc529d5b97c661e9bd46c87d656fe37924773990ae1237d0609537d00de1e884df01416932c46f4f18ab5e310c4c054df9fabd8fe685af2f607e4c8a3db4815
+  data.tar.gz: 666eed3f55e4d2f1933084913f198c0403a3727ba209909075d8a52231a2b107839b0079004321a65f34319203e67ba0560b2c4219340cdeb5cf20380cea9fce

data/README.md

@@ -74,7 +74,7 @@ into this:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/conventional-changelog/fork )
+1. Fork it ( https://github.com/dcrec1/conventional-changelog-ruby/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/conventional_changelog/by_date_writer.rb

@@ -7,7 +7,7 @@ module ConventionalChangelog
     end
 
     def write_new_lines(options)
-      commits.group_by { |commit| commit[:date] }.sort.reverse.each do |date, commits|
+      commits.group_by { |commit| commit[:date] }.sort.reverse_each do |date, commits|
         write_section commits, date
       end
     end

data/lib/conventional_changelog/cli.rb

@@ -4,7 +4,6 @@ module ConventionalChangelog
       Generator.new.generate! parse(params)
     end
 
-    private
     def self.parse(params)
       Hash[*params.map { |param| param.split("=") }.map { |key, value| [key.to_sym, value] }.flatten]
     end

data/lib/conventional_changelog/git.rb

@@ -5,12 +5,11 @@ module ConventionalChangelog
     def self.commits(options)
       log(options).split("\n").map { |commit| commit.split DELIMITER }.select { |commit| options[:since_date].nil? or commit[1] > options[:since_date] }.map do |commit|
         comment = commit[2].match(/(\w*)(\(([\w\$\.\-\* ]*)\))?\: (.*)/)
+        next unless comment
         { id: commit[0], date: commit[1], type: comment[1], component: comment[3], change: comment[4] }
-      end
+      end.compact
     end
 
-    private
-
     def self.log(options)
       `git log --pretty=format:"%h#{DELIMITER}%ad#{DELIMITER}%s%x09" --date=short --grep="^(feat|fix)(\\(.*\\))?:" -E #{version_filter(options)}`
     end

data/lib/conventional_changelog/version.rb

@@ -1,3 +1,3 @@
 module ConventionalChangelog
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/conventional_changelog/writer.rb

@@ -28,9 +28,9 @@ module ConventionalChangelog
     def append_changes(commits, type, title)
       unless (type_commits = commits.select { |commit| commit[:type] == type }).empty?
         puts "#### #{title}", ""
-        type_commits.group_by { |commit| commit[:component] }.each do |component, commits|
+        type_commits.group_by { |commit| commit[:component] }.each do |component, component_commits|
           puts "* **#{component}**" if component
-          commits.each { |commit| write_commit commit, component }
+          component_commits.each { |commit| write_commit commit, component }
           puts ""
         end
         puts ""

data/spec/generator_spec.rb

@@ -25,6 +25,38 @@ describe ConventionalChangelog::Generator do
       end
     end
 
+    context "with merge commit" do
+      before :each do
+        allow(ConventionalChangelog::Git).to receive(:log).and_return log
+      end
+
+      context "skip merged commit" do
+        let(:log) do <<-LOG
+4303fd4/////2015-03-30/////feat(admin): increase reports ranges
+430fa51/////2015-03-31/////Merge branch 'develop' into 'master'
+          LOG
+        end
+
+        it 'does not contain merge commit' do
+          subject.generate!
+          body = <<-BODY
+<a name="2015-03-30"></a>
+### 2015-03-30
+
+
+#### Features
+
+* **admin**
+  * increase reports ranges ([4303fd4](/../../commit/4303fd4))
+
+
+
+          BODY
+          expect(changelog).to eql body
+        end
+      end
+    end
+
     context "with multiple commits" do
       before :each do
         allow(ConventionalChangelog::Git).to receive(:log).and_return log

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conventional-changelog
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Diego Carrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby binary to generate a conventional changelog — Edit