docman 0.0.92 → 0.0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 777f7078a84844efa58f0ff3acb3901b3edc5d7f
-  data.tar.gz: e1641e86ec4af29ae6ec3054c5e9272c2b9c11b2
+  metadata.gz: 31ef7f70bc197d88a105f021b6a46dd5d23a8b53
+  data.tar.gz: 6e4bd481345897e5f3202cbdb211768026b79fb9
 SHA512:
-  metadata.gz: 657472c22a37269eb1d977f2d1a6b017e36d3c544f093e94bba2ee5f9ee35f57cb2d5b80540621ae8ebfd8a365c44e91f683a33c2d870a852bc30f5aa42bcb1c
-  data.tar.gz: 9612a4fb22de868ea4d547bce3108d5c68961aa8bff89a29a08ba1d2a25e3e0b870268946e89ab6c6f717dc4010cb75a9406fb46433961de2a7877b6c773fa15
+  metadata.gz: 55698165ee3cea7616f7a3dc95a3173512a4e0a5431efb7c0a56fb492581146f249e842595f4add7f9d5670cc4e12dc2ae969cea3f33a9a7dfe8e7cb1d249be9
+  data.tar.gz: feba77323338001c1fefccf296df0cead3d4bdff705035ee778e2d77eca8a4b423fccffa8adf553cc1fb4919326faa8b906e9b1326be2199755ad90779d0ef3c

data/bin/bump-version.sh

@@ -1,41 +1,116 @@
 #!/bin/bash
- 
+
 # works with a file called VERSION in the current directory,
 # the contents of which should be a semantic version number
 # such as "1.2.3"
- 
+
 # this script will display the current version, automatically
 # suggest a "minor" version update, and ask for input to use
 # the suggestion, or a newly entered value.
- 
+
 # once the new version number is determined, the script will
 # pull a list of changes from git history, prepend this to
 # a file called CHANGES (under the title of the new version
 # number) and create a GIT tag.
 
-git checkout master
-git pull origin master
+POSITIONAL=()
+BRANCH="master"
+NEXT=0
+SKIP=0
+
+if [[ $# == 0 ]]; then
+    POSITIONAL+=("-h")
+    set -- "${POSITIONAL[@]}" # restore positional parameters
+fi
+
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        -b|--branch*)
+            if [[ $key == "-b" ]] || [[ $key == "--branch" ]]; then
+                BRANCH="$2"
+                shift # past argument
+                shift # past value
+            else
+                BRANCH="${1#*=}"
+                shift # past argument=value
+            fi
+        ;;
+        -n|--next)
+            NEXT=1
+            shift # past argument
+        ;;
+        -s|--skip)
+            SKIP=1
+            shift # past argument
+        ;;
+        -h|--help)
+            echo "Usage: -[hbns] [state] [next] [skip]"
+            echo -e "\t-h, --help\n\t\tShow this help message."
+            echo -e "\t-b [branch], --branch [branch], --branch=[branch]\n\t\tTag specific branch."
+            echo -e "\t-n, --next\n\t\tSet next release without prompt."
+            echo -e "\t-s, --skip\n\t\tSkip CI trigger with commit message."
+            exit 0
+        ;;
+        *)    # unknown option
+            POSITIONAL+=("$1") # save it in an array for later
+            shift # past argument
+        ;;
+    esac
+done
+
+set -- "${POSITIONAL[@]}" # restore positional parameters
+
+if [[ $NEXT == 0 ]] && [ -n "$2" ] && [ "$2" == "next" ]; then
+    NEXT=1
+fi
+
+if [[ $SKIP == 0 ]] && [ -n "$3" ] && [ "$3" == "skip" ]; then
+    SKIP=1
+fi
+
 git fetch
+git checkout $BRANCH
+git pull origin $BRANCH 2>/dev/null || echo "Branch not found on origin."
 
 if [ -f VERSION ]; then
     BASE_STRING=`cat VERSION`
-    BASE_LIST=(`echo $BASE_STRING | tr '.' ' '`)
-    V_MAJOR=${BASE_LIST[0]}
-    V_MINOR=${BASE_LIST[1]}
-    V_PATCH=${BASE_LIST[2]}
-    echo "Current version : $BASE_STRING"
-    #V_MINOR=$((V_MINOR + 1))
-    V_PATCH=$((V_PATCH + 1))
-    #V_PATCH=0
-    SUGGESTED_VERSION="$V_MAJOR.$V_MINOR.$V_PATCH"
-
-    if [ -n "$2" ] && [ "$2" == "next" ]; then
-        INPUT_STRING=$SUGGESTED_VERSION
+    if [[ $BASE_STRING =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)([\.\-][0-9a-zA_Z_\-]+)?$ ]]; then
+        V_MAJOR=${BASH_REMATCH[1]}
+        V_MINOR=${BASH_REMATCH[2]}
+        V_PATCH=${BASH_REMATCH[3]}
+        V_SUFFIX=${BASH_REMATCH[4]}
+        echo "Current version : $BASE_STRING"
+        V_PATCH=$((V_PATCH + 1))
+        SUGGESTED_VERSION="${V_PREFIX}${V_MAJOR}.${V_MINOR}.${V_PATCH}${V_SUFFIX}"
     else
-      read -p "Enter a version number [$SUGGESTED_VERSION]: " INPUT_STRING
-      if [ "$INPUT_STRING" = "" ]; then
+        if [[ $BASE_STRING =~ ^([0-9a-zA_Z_\-]+[\-])([0-9]+)\.([0-9]+)\.([0-9]+)([\.\-][0-9a-zA_Z_\-]+)?$ ]]; then
+            V_PREFIX=${BASH_REMATCH[1]}
+            V_MAJOR=${BASH_REMATCH[2]}
+            V_MINOR=${BASH_REMATCH[3]}
+            V_PATCH=${BASH_REMATCH[4]}
+            V_SUFFIX=${BASH_REMATCH[5]}
+            echo "Current version : $BASE_STRING"
+            V_PATCH=$((V_PATCH + 1))
+            SUGGESTED_VERSION="${V_PREFIX}${V_MAJOR}.${V_MINOR}.${V_PATCH}${V_SUFFIX}"
+        fi
+    fi
+
+    if [ -n "$SUGGESTED_VERSION" ]; then
+        if [[ $NEXT == 1 ]]; then
           INPUT_STRING=$SUGGESTED_VERSION
-      fi
+        else
+            read -p "Enter a version number [$SUGGESTED_VERSION]: " INPUT_STRING
+            if [ "$INPUT_STRING" = "" ]; then
+                INPUT_STRING=$SUGGESTED_VERSION
+            fi
+        fi
+    else
+        read -p "Enter a version number: " INPUT_STRING
+        if [ "$INPUT_STRING" = "" ]; then
+            echo "Version number should not be empty to continue."
+            exit 1
+        fi
     fi
 
     echo "Will set new version to be $INPUT_STRING"
@@ -51,7 +126,7 @@ if [ -f VERSION ]; then
     git commit -m "[skip] [ci-skip] [ci skip] Version bump to $INPUT_STRING"
     git tag -a -m "[skip] [ci-skip] [ci skip] Tagging version $INPUT_STRING" "$INPUT_STRING"
     git push origin ${INPUT_STRING}
-    git push origin master
+    git push origin $BRANCH
 else
     echo "Could not find a VERSION file"
     read -p "Do you want to create a version file and start from scratch? [y]" RESPONSE
@@ -70,33 +145,34 @@ else
         git commit -m "[skip] [ci-skip] [ci skip] Added VERSION and CHANGES files, Version bump to 0.1.0"
         git tag -a -m "[skip] [ci-skip] [ci skip] Tagging version 0.1.0" "0.1.0"
         git push origin --tags
-        git push origin master
+        git push origin $BRANCH
     fi
     TAG="0.1.0"
 fi
 
 if [ -n "$1" ]; then
   git fetch
-  BRANCH="state_$1"
+  STATE_BRANCH="state_$1"
   #git show-ref --verify --quiet "refs/heads/${BRANCH}"
   git ls-remote --exit-code . origin/state_stable &> /dev/null
   if [ $? == 0 ]; then
-    git checkout ${BRANCH}
-    git pull origin ${BRANCH}
+    git checkout ${STATE_BRANCH}
+    git pull origin ${STATE_BRANCH}
   else
-    git checkout --orphan ${BRANCH}
+    git checkout --orphan ${STATE_BRANCH}
     git rm --cached -r .
     git clean -f -d
   fi
   echo "type: tag" > info.yaml
   echo "version: $TAG" >> info.yaml
   git add info.yaml
-  if [ -n "$3" ] && [ "$3" == "skip" ]; then
-    git commit -m "[skip] [ci-skip] [ci skip] Changed tag to: $TAG" & git push -u origin ${BRANCH}
+  if [[ $SKIP == 1 ]]; then
+    git commit -m "[skip] [ci-skip] [ci skip] Changed tag to: $TAG"
+    git push -u origin ${STATE_BRANCH}
   else
     git commit -m "Changed tag to: $TAG"
-    git push -u origin ${BRANCH}
+    git push -u origin ${STATE_BRANCH}
   fi
-  git checkout master
+  git checkout $BRANCH
   echo ${TAG}
 fi

data/lib/docman/cli.rb

@@ -72,12 +72,16 @@ module Docman
 
     desc 'bump', 'Bump version'
     method_option :next, :aliases => '-n', :desc => 'Automatically use next version number'
+    method_option :branch, :aliases => '-b', :desc => 'Bump release on specific branch'
+    method_option :skip, :aliases => '-s', :desc => 'Skip CI with commit message'
     #option :state
     #option :skip
-    def bump(state = nil, skip = nil)
-      version_number = options[:next] ? 'next' : 'ask'
-
-      Exec.do "#{Application::bin}/bump-version.sh #{state} #{version_number} #{skip}"
+    def bump(state = nil)
+      bump_params = []
+      bump_params.push("--branch=#{options[:branch]}") if options[:branch]
+      bump_params.push('--next') if options[:next]
+      bump_params.push('--skip') if options[:skip]
+      Exec.do "#{Application::bin}/bump-version.sh #{bump_params.join(' ')} #{state}"
       say('Complete!', :green)
     end
 

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.92"
+  VERSION = "0.0.93"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.92
+  version: 0.0.93
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler