schmersion 1.1.0 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ebf5ec763672ffaed1a267587ce8901017d5844335535841be3a8ba678b9fcb5
4
- data.tar.gz: db476ffab17ae0a13ea736ca7e86477e43a53fac15d3fa0b240e9e6d192da738
3
+ metadata.gz: d2c75fc43f980b06bd02018d25ef92b0fefddecdf5529b3becb824f87a9f550d
4
+ data.tar.gz: b4044f96a5a1cb92321665e71a1c97337491e83f4137704618ab6248d41b43a0
5
5
  SHA512:
6
- metadata.gz: 3cb9ab527fb3eb7b32cab65570a2ccfe09371e99cc918c648e8b6986aff9747a30be9b75c72d09300f4ea8f8a496f8d15d8acc86e80805fe81a1dce4ce1ba621
7
- data.tar.gz: 70025c3989baa3aa52a2d6563905eaea3afe6af9c2576ecb1af1207f94740e26a2bcdb6489ba8ba03c01787587e014b323296c0b0d3a322d7100f84072022c16
6
+ metadata.gz: b0d2a189ca5760645f278e85a9e8b80e54bd67ff9612ff4571a688f7e5c0566fd37f4dae92d1fafe1301e7b5100a298a91d0d8bf481d9fa3d10082861390b77a
7
+ data.tar.gz: 398053fea895fec4b0c90cb41069b482fbee8d7443c7225178ba2ff8c71010449170d01f8bdc6eb6fb695500b0ab310be65943556a21b76b6fdc1eef49c7b5dd
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.0
1
+ 1.1.2
@@ -41,6 +41,10 @@ module Schmersion
41
41
  @breaking_changes.size.positive?
42
42
  end
43
43
 
44
+ def merge?
45
+ @raw_message.match?(/\AMerge\s+/)
46
+ end
47
+
44
48
  private
45
49
 
46
50
  def parse_header
@@ -17,6 +17,8 @@ module Schmersion
17
17
  end
18
18
 
19
19
  def validate_all
20
+ return if @message.merge?
21
+
20
22
  validate_valid_format
21
23
  return unless @message.valid?
22
24
 
@@ -101,7 +101,6 @@ module Schmersion
101
101
 
102
102
  def version
103
103
  @version ||= begin
104
- puts @repo.config.version_options
105
104
  @repo.pending_version(
106
105
  override_version: @options[:version],
107
106
  version_options: {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: schmersion
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Cooke
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-28 00:00:00.000000000 Z
11
+ date: 2020-09-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: colorize