fastlane-plugin-logme 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ce9e540f791a36fa27c1eac7d4c3204c26ed55b
-  data.tar.gz: f8d5677e3c1e08c1e8888f8cf4521ceca15499e2
+  metadata.gz: 1bccafd656f0e8cbec05d5a9980c02aa975ce8e6
+  data.tar.gz: 2c051a74a09ddfc40b9173c977dfe435e582a1b2
 SHA512:
-  metadata.gz: fec613fc1864b5d21ad2c31cd957bc8a6b56a927311a870d57a10e0986190af03e529a6d799f054b1e33fb5f606f7ad64a2dfb88be3ebb53ff8b0dad245314d9
-  data.tar.gz: b4003a669b780b6c53bd678c30d2c8f4d9fb556a83611457c00fdbc02e8445eee68f53abf3cbaa6e0e06d18b8e5615a808213df75a1ee6220896b4adbadcec47
+  metadata.gz: 705c51fef606c301df6456a83c82ec9a48f9d074dc79162d0d190896ebf169eb5e2ada45b617dec9802adbd7cd737f00cc08bb2c7482df86e23b13c2a7b6a85c
+  data.tar.gz: 3e9af8625b9aa3f05ead353c89d3dde77e4b1bdab3f3d0a3655b64f7532d59d03df9b9b9159c8476c98d3811da50d045afbb397a92543e919969da42337f6ed8

data/README.md

@@ -19,11 +19,12 @@ Has we use a Continues Delivery, we need a way to create release notes automatic
 ## How to use it?
 Just invoke *logme* in your Fastfile action. Logme will return the commit messages
 
-| Option | Description | Optional |
-|---|---|---|
-| `to_revision` | End revision commit | false |
-| `from_revision` | From revision commit | false |
-| `message_regexp_filters` | Regexp filters like. ie '^MDM-\|^CTS:' | true |
+| Option | Description | Optional | Default | 
+|---|---|---|---|
+| `to_revision` | End revision commit | false | |
+| `from_revision` | From revision commit | false | |
+| `message_regexp_filters` | Regexp filters like. ie '^MDM-\|^CTS:' | true | `.` |
+| `remove_commits_already_merged` | Remove commit messages already merged | true | `false` |
 
 ## Example
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.

data/lib/fastlane/plugin/logme/actions/logme.rb

@@ -4,9 +4,20 @@ module Fastlane
 
       def self.run(options)
         regexp_filter = Regexp.new(options[:message_regexp_filters])
-        Actions.sh("git log --pretty=format:\"%s\" --no-merges --ancestry-path #{options[:from_revision]}...#{options[:to_revision]}")
-            .split(/\n/)
-            .select{|message| message[regexp_filter] != nil}
+        changes = Actions.sh("git log --pretty=\"%s\" --no-merges #{options[:from_revision]}...#{options[:to_revision]}")
+                      .split(/\n/)
+
+        if options[:remove_commits_already_merged]
+          merges = Actions.sh("git log --pretty=\"%b\" --merges #{options[:from_revision]}...#{options[:to_revision]}")
+                       .split("* commit")
+
+          merges.delete_at(0) # empty value
+          merges.delete_at(0) # last merge
+          merges = merges.join("\n")
+          changes.delete_if{|commit| merges.include?(commit) }
+        end
+
+        changes.select{|message| message[regexp_filter] != nil}
             .join("\n\r")
       end
 
@@ -29,6 +40,11 @@ module Fastlane
             FastlaneCore::ConfigItem.new(key: :message_regexp_filters,
                                          description: "Regexp filters like. ie '^MDM-|^CTS:'",
                                          default_value: '.',
+                                         optional: true),
+            FastlaneCore::ConfigItem.new(key: :remove_commits_already_merged,
+                                         description: 'Remove commit messages already merged',
+                                         default_value: false,
+                                         is_string: false,
                                          optional: true)
         ]
       end

data/lib/fastlane/plugin/logme/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Logme
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-logme
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Luís Esteves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry