vtasks 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca1328d8905311f0d671079392e60bd66b2bdf43d7c64b4a5bbdff0b994a446
-  data.tar.gz: 96265a6f10e9118fef85ee2b0ad5da41b9f1780fb12a15bc639ce6fd71d6884a
+  metadata.gz: 0c4fd78d9502b352d79919ba68aeb29ce8cb688d27b7cb6b9e5fa6b8201f51dd
+  data.tar.gz: 4d2041309f381fe4a4bbc364904caaf3cae342f205e5f8cbd4f8c8fea6108d4a
 SHA512:
-  metadata.gz: aac5d64a6f681c6f12e1bdaaebf759123f5743a772956febce22994465b52545d08d397137a77636056efa25d44f8952753d994df448e8ba4b1670a4412fe9a3
-  data.tar.gz: 57f0cd03cf915407b0c12613c5b53deb9cffa6778d924ca3d6d56754d3335374fabbce13ec6fb1e4a4fa41c897ef34e451153557e8948786fa79f3e46110b254
+  metadata.gz: 8283ce185aba1f99b9a991362a8b9de56fc49c3ba65db149a863788b23f5b99a331b1b40fdab393ed44d25aef59c2023e3fde41f59859d2b00493369adb3345e
+  data.tar.gz: ac9e68ac67525c0b3fb9733d59e8697215f355fad032a2b6555b505334c59010eb5b402d9e62036bdc13954864bdbaeed850aa7ca46baea5ed7898124a246f1e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v0.0.13](https://github.com/vladgh/vtasks/tree/v0.0.13) (2018-10-12)
+[Full Changelog](https://github.com/vladgh/vtasks/compare/v0.0.12...v0.0.13)
+
+**Implemented enhancements:**
+
+- Add option to require pull request [\#24](https://github.com/vladgh/vtasks/issues/24)
+
+**Fixed bugs:**
+
+- Fix branches [\#25](https://github.com/vladgh/vtasks/issues/25)
+
 ## [v0.0.12](https://github.com/vladgh/vtasks/tree/v0.0.12) (2018-10-11)
 [Full Changelog](https://github.com/vladgh/vtasks/compare/v0.0.11...v0.0.12)
 

data/lib/vtasks/release.rb

@@ -12,12 +12,14 @@ module Vtasks
     include Vtasks::Utils::Semver
 
     attr_reader :write_changelog,
+                :require_pull_request,
                 :wait_for_ci_success,
                 :bug_labels,
                 :enhancement_labels
 
     def initialize(options = {})
       @write_changelog = options.fetch(:write_changelog, false)
+      @require_pull_request = options.fetch(:require_pull_request, false)
       @wait_for_ci_success = options.fetch(:wait_for_ci_success, false)
       @bug_labels = options.fetch(:bug_labels, 'bug')
       @enhancement_labels = options.fetch(:enhancement_labels, 'enhancement')
@@ -52,9 +54,14 @@ module Vtasks
           task level.to_sym do
             new_version = bump(level)
             release = "#{new_version[:major]}.#{new_version[:minor]}.#{new_version[:patch]}"
-            release_branch = "release_v#{release.gsub(/[^0-9A-Za-z]/, '_')}"
             initial_branch = git_branch
 
+            if require_pull_request == true
+              release_branch = "release_v#{release.gsub(/[^0-9A-Za-z]/, '_')}"
+            else
+              release_branch = initial_branch
+            end
+
             info 'Check if the repository is clean'
             git_clean_repo
 
@@ -70,8 +77,10 @@ module Vtasks
               if system 'git diff --quiet HEAD'
                 info 'CHANGELOG has not changed. Skipping...'
               else
-                info 'Create a new release branch'
-                sh "git checkout -b #{release_branch}"
+                if require_pull_request == true
+                  info 'Create a new release branch'
+                  sh "git checkout -b #{release_branch}"
+                end
 
                 info 'Commit the new changes'
                 sh "git commit --gpg-sign --message 'Update change log for v#{release}' CHANGELOG.md"
@@ -84,9 +93,11 @@ module Vtasks
                   sleep 5 until git_ci_status(release_branch) == 'success'
                 end
 
-                info 'Merge release branch'
-                sh "git checkout #{initial_branch}"
-                sh "git merge --gpg-sign --no-ff --message 'Release v#{release}' #{release_branch}"
+                if require_pull_request == true
+                  info 'Merge release branch'
+                  sh "git checkout #{initial_branch}"
+                  sh "git merge --gpg-sign --no-ff --message 'Release v#{release}' #{release_branch}"
+                end
               end
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vtasks
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Vlad Ghinea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake