semmy 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbc2657b06bf0df7c163d8ea8315fc198c80f3884a094f51776e051016fe888
-  data.tar.gz: 85206e2e16a0b8cd4b8af9165434fe41febc54b44a116357fb6941c23f606437
+  metadata.gz: 3593823ef6863af335da8379285319b3bfcef4ca60b8130ccb1ff98633694c3f
+  data.tar.gz: bf08cbcca120b4e42792fe66ba370f751a92712c033b415f28f45814de76d1b1
 SHA512:
-  metadata.gz: 67d13f206951da08c55850f3c72a564cdbf73d13f71c683b01f3758a515e5726ba76772f513ac1f35c75cdd25e1e04bfd16288e3fa793ab29738638d2a2b9bf0
-  data.tar.gz: 236b574f1d7235aefd13105bd3e69a88900f2828611170964b045cb52af56b76a034a4d1dc942bc215f4be3019ddae1b267533a08e458179fdf863a66a6e6314
+  metadata.gz: 2f1a2f9f3476e805531cdf4b15db7d9cb7b8fcc589f88db711ae58a7e86f0cb8626047ee563de135b1fb35d733705e3f0eb37de65ed4f130a9545642497d2981
+  data.tar.gz: 1b936d088d33fdeb0d6c0c09caee081d6072784ee7fc16d4622555eba5ce1630d4d731884cef94bd53f16c9c80127581ca6cb75487a7bb99137e24b267128a6b

data/CHANGELOG.md

@@ -1,45 +1,17 @@
 # CHANGELOG
 
-### Version 1.0.2
+### Version 1.1.0
 
-2019-01-21
+2019-01-23
 
-[Compare changes](https://github.com/tf/semmy/compare/v1.0.1...v1.0.2)
+[Compare changes](https://github.com/tf/semmy/compare/1-0-stable...v1.1.0)
 
-- Ensure test install of gem during `release:prepare` does not hang
-  waiting for interactive input on uninstall.
-
-### Version 1.0.1
-
-2018-12-10
-
-[Compare changes](https://github.com/tf/semmy/compare/v1.0.0...v1.0.1)
-
-- Require date stdlib to prevent error during prepare.
-
-### Version 1.0.0
-
-2017-07-13
+- Run same tasks as on `master` when running on major version stable
+  branch (e.g. `2-x-stable`).
 
-[Compare changes](https://github.com/tf/semmy/compare/0-x-stable...v1.0.0)
-
-##### Breaking Changes
-
-- A typo in the name of the `changelog_unreleased_section_heading` and
-  `changelog_unreleased_section_blank_slate` options was fixed.
-- The default value of `changelog_unreleased_section_heading` changed
-  to "Unreleased Changes". You need to update the header in your
-  changelog or manually set the previous value via the configuration option.
-
-##### New Features
-
-- Add `bump:patch` task which begins a patch level release.
-- Add `bump:mahor` task which updates the major version.
-
-##### Bug Fixes
-
-- Fix indentation of generated unreleased changes section.
+- Bug fix: Ensure test install of gem during `release:prepare` does not hang
+  waiting for interactive input on uninstall.
 
 See
-[0-x-stable branch](https://github.com/tf/semmy/blob/0-x-stable/CHANGELOG.md)
+[1-0-stable branch](https://github.com/tf/semmy/blob/1-0-stable/CHANGELOG.md)
 for previous changes.

data/lib/semmy/scm.rb

@@ -6,12 +6,20 @@ module Semmy
       git.current_branch == 'master'
     end
 
-    def on_stable?(stable_branch_name)
+    def on_minor_version_stable?(stable_branch_name)
       !!git.current_branch.match(stable_branch_matcher(stable_branch_name))
     end
 
+    def on_major_version_stable?(stable_branch_name)
+      !!git.current_branch.match(major_version_stable_branch_matcher(stable_branch_name))
+    end
+
     private
 
+    def major_version_stable_branch_matcher(stable_branch_name)
+      stable_branch_matcher(stable_branch_name.gsub('%{minor}', 'x'))
+    end
+
     def stable_branch_matcher(stable_branch_name)
       Regexp.new(stable_branch_name.gsub(/%\{\w+\}/, '[0-9]+'))
     end

data/lib/semmy/tasks.rb

@@ -42,9 +42,9 @@ module Semmy
 
       desc 'Prepare release'
       task 'release:prepare' => 'semmy:lint' do
-        if Scm.on_master?
+        if Scm.on_master? || Scm.on_major_version_stable?(config.stable_branch_name)
           Rake.application['release:prepare:master'].invoke
-        elsif Scm.on_stable?(config.stable_branch_name)
+        elsif Scm.on_minor_version_stable?(config.stable_branch_name)
           Rake.application['release:prepare:stable'].invoke
         end
       end
@@ -58,7 +58,7 @@ module Semmy
 
       desc 'Prepare repository for development of next verion'
       task 'release:after' do
-        if Scm.on_master?
+        if Scm.on_master? || Scm.on_major_version_stable?(config.stable_branch_name)
           Rake.application['release:after:master'].invoke
         end
       end

data/lib/semmy/version.rb

@@ -1,3 +1,3 @@
 module Semmy
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semmy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Tim Fischbach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git