semmy 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3593823ef6863af335da8379285319b3bfcef4ca60b8130ccb1ff98633694c3f
-  data.tar.gz: bf08cbcca120b4e42792fe66ba370f751a92712c033b415f28f45814de76d1b1
+  metadata.gz: 4a9c4378a310880351973ba7495052ba8732629137915052be599823e74436c5
+  data.tar.gz: f3225ce6b30493cd39ca8b53a1751367874bb4cc195944eaeefd9c8b3881f31d
 SHA512:
-  metadata.gz: 2f1a2f9f3476e805531cdf4b15db7d9cb7b8fcc589f88db711ae58a7e86f0cb8626047ee563de135b1fb35d733705e3f0eb37de65ed4f130a9545642497d2981
-  data.tar.gz: 1b936d088d33fdeb0d6c0c09caee081d6072784ee7fc16d4622555eba5ce1630d4d731884cef94bd53f16c9c80127581ca6cb75487a7bb99137e24b267128a6b
+  metadata.gz: bdc2c3cb16604b4204a69de93c0b6d362487d743943e7d8da4bb40073fc4efcdef4d00b1fabf75a5311966edcd884607fcaf310545842a38f76a3517592fcfd4
+  data.tar.gz: 3ca48dbd6d46c1ef27c493f0d45404344ee13bbb6a2258029ecf6dea8eed8bc7d462f7a7051380ccf59f3bff041038c7b4b6c75ae32819ad7b6b08cb649cd1bb

data/CHANGELOG.md

@@ -1,17 +1,13 @@
 # CHANGELOG
 
-### Version 1.1.0
+### Version 1.2.0
 
-2019-01-23
+2019-01-24
 
-[Compare changes](https://github.com/tf/semmy/compare/1-0-stable...v1.1.0)
+[Compare changes](https://github.com/tf/semmy/compare/1-1-stable...v1.2.0)
 
-- Run same tasks as on `master` when running on major version stable
-  branch (e.g. `2-x-stable`).
-
-- Bug fix: Ensure test install of gem during `release:prepare` does not hang
-  waiting for interactive input on uninstall.
+- Add config option to automatically push branches after release.
 
 See
-[1-0-stable branch](https://github.com/tf/semmy/blob/1-0-stable/CHANGELOG.md)
+[1-1-stable branch](https://github.com/tf/semmy/blob/1-1-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -67,6 +67,15 @@ Add the tasks to your Rakefile:
 
     Semmy::Tasks.install
 
+You can pass config options:
+
+    # Rakefile
+    require 'semmy'
+
+    Semmy::Tasks.install do |config|
+      # see Semmy::Configuration for options
+    end
+
 ## Usage
 
 Semmy defines a new task to prepare a release:
@@ -100,6 +109,22 @@ The resulting commit graph looks like:
     * (v1.2.0, 1-2-stable) Prepare 1.2.0 release
     * Some new feature
 
+By default, the new stable branch and the bump commit are not pushed
+automatically. This can be activated by setting the
+`push_branches_after_release` config option to `true`.
+
+This will be the new default once Semmy 2.0 is released. You can opt
+into the future default behavior globally without changing config
+options on the project level by setting the
+`SEMMY_PUSH_BRANCHES_AFTER_RELEASE` environment variable to `on`.
+
+Branches will be pushed to the remote passed as an argument to the
+`release` task:
+
+    $ rake release[upstream]
+
+By default, branches are pushed to `origin`.
+
 ### Releasing a Patch Level Version
 
 Assume an important bug fix has been added to `master`:

data/lib/semmy/configuration.rb

@@ -3,6 +3,7 @@ module Semmy
     attr_accessor :development_version_suffix
 
     attr_accessor :stable_branch_name
+    attr_accessor :push_branches_after_release
 
     attr_accessor :prepare_commit_message
     attr_accessor :bump_commit_message
@@ -25,6 +26,7 @@ module Semmy
       @development_version_suffix = 'dev'
 
       @stable_branch_name = '%{major}-%{minor}-stable'
+      @push_branches_after_release = ENV['SEMMY_PUSH_BRANCHES_AFTER_RELEASE'] == 'on'
 
       @prepare_commit_message = 'Prepare %{version} release'
       @bump_commit_message = 'Bump version to %{version}'

data/lib/semmy/tasks.rb

@@ -49,22 +49,24 @@ module Semmy
         end
       end
 
-      task 'release:after:master' => [
+      task 'release:after:master', [:remote] => [
         'semmy:branches:create_stable',
         'semmy:versioning:bump_minor',
         'semmy:changelog:update_for_minor',
-        'semmy:commit:bump'
+        'semmy:commit:bump',
+        'semmy:branches:push_master',
+        'semmy:branches:push_previous_stable'
       ]
 
       desc 'Prepare repository for development of next verion'
-      task 'release:after' do
+      task 'release:after', [:remote] do |_, args|
         if Scm.on_master? || Scm.on_major_version_stable?(config.stable_branch_name)
-          Rake.application['release:after:master'].invoke
+          Rake.application['release:after:master'].invoke(args[:remote])
         end
       end
 
-      task 'release' do
-        Rake.application['release:after'].invoke
+      task 'release', [:remote] do |_, args|
+        Rake.application['release:after'].invoke(args[:remote])
       end
 
       task 'bump:patch' => [

data/lib/semmy/tasks/branches.rb

@@ -6,19 +6,47 @@ module Semmy
       def define
         namespace 'branches' do
           task 'create_stable' do
-            name = config.stable_branch_name %
-              VersionString.components(Project.version)
+            Shell.info("Creating stable branch #{stable_branch_name}.")
 
-            Shell.info("Creating stable branch #{name}.")
+            git.branch(stable_branch_name).create
+          end
+
+          task 'push_master', [:remote] do |_, args|
+            push_branch(args[:remote], 'master')
+          end
 
-            git.branch(name).create
+          task 'push_previous_stable', [:remote] do |_, args|
+            push_branch(args[:remote], previous_stable_branch_name)
           end
         end
+      end
+
+      private
+
+      def stable_branch_name
+        VersionString.stable_branch_name(Project.version,
+                                         config.stable_branch_name)
+      end
+
+      def previous_stable_branch_name
+        VersionString.previous_stable_branch_name(Project.version,
+                                                  config.stable_branch_name)
+      end
 
-        def git
-          Git.open('.')
+      def push_branch(remote, name)
+        remote ||= 'origin'
+
+        if config.push_branches_after_release
+          Shell.info("Pushing #{name} to #{remote}.")
+          git.push(remote, name)
+        else
+          Shell.info("NOTE: Remember to push #{name} to #{remote}.")
         end
       end
+
+      def git
+        Git.open('.')
+      end
     end
   end
 end

data/lib/semmy/version.rb

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

data/lib/semmy/version_string.rb

@@ -62,6 +62,10 @@ module Semmy
       components.join('.')
     end
 
+    def stable_branch_name(version, stable_branch_name_pattern)
+      stable_branch_name_pattern % VersionString.components(version)
+    end
+
     def previous_stable_branch_name(version, stable_branch_name_pattern)
       stable_branch_name_pattern % previous_minor_version_components(version)
     end

metadata

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