docman 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f999d877d7f852b25084023633e76f0b6a26ca8a
-  data.tar.gz: f94a3bddade51bfe5b7dbf01f32c337d8c326160
+  metadata.gz: 7c762f3f7a21b4b70bf6b92aa860570fed400928
+  data.tar.gz: 10a9f6b2ab53eed23dbc43fc5a1d17323431f5d9
 SHA512:
-  metadata.gz: 033048679f637f5a49b929882ec4fdbae5989e4c3c4aef08c6f2cda6a0027ffbf36f85f5b030a9b51b5118ecb7cb2f1bfc7cb2fd6214609bcdc92de992af8017
-  data.tar.gz: 643119ba5f68c98481c41820dee753597b818c8635c719b1bc98b32241ea2b479142fac6c5d49033bc28d16005e16bcd7725b6f64ebf66b13ab2d4401ddbb703
+  metadata.gz: fab9ec4b7c9e3b0cda8e388c9477c48c7863a4794fd3451f428d26ee50bcb5aa372aeb702db2c192cc90d391f1debdd31c3420ae9d5cd97538af57158a5df872
+  data.tar.gz: acc9b543de85946d7098d212d09fead6629d954f30c59c109ba94ece25400dae22db4904ed8435180953fa49be1e455082e32189abedf116026e957ba5cc97b7

data/bin/bump-version.sh

@@ -20,8 +20,9 @@ if [ -f VERSION ]; then
     V_MINOR=${BASE_LIST[1]}
     V_PATCH=${BASE_LIST[2]}
     echo "Current version : $BASE_STRING"
-    V_MINOR=$((V_MINOR + 1))
-    V_PATCH=0
+    #V_MINOR=$((V_MINOR + 1))
+    V_PATCH=$((V_PATCH + 1))
+    #V_PATCH=0
     SUGGESTED_VERSION="$V_MAJOR.$V_MINOR.$V_PATCH"
     read -p "Enter a version number [$SUGGESTED_VERSION]: " INPUT_STRING
     if [ "$INPUT_STRING" = "" ]; then
@@ -37,7 +38,7 @@ if [ -f VERSION ]; then
     cat CHANGES >> tmpfile
     mv tmpfile CHANGES
     git add CHANGES VERSION
-    git commit -m "Version bump to $INPUT_STRING"
+    git commit -m "[skip] Version bump to $INPUT_STRING"
     git tag -a -m "Tagging version $INPUT_STRING" "$INPUT_STRING"
     git push origin --tags
     git push
@@ -56,8 +57,8 @@ else
         echo "" >> CHANGES
         echo "" >> CHANGES
         git add VERSION CHANGES
-        git commit -m "Added VERSION and CHANGES files, Version bump to 0.1.0"
-        git tag -a -m "[skip] Tagging version 0.1.0" "0.1.0"
+        git commit -m "[skip] Added VERSION and CHANGES files, Version bump to 0.1.0"
+        git tag -a -m "Tagging version 0.1.0" "0.1.0"
         git push origin --tags
         git push
     fi
@@ -69,6 +70,7 @@ if [ -n "$1" ]; then
   git show-ref --verify --quiet "refs/heads/${BRANCH}"
   if [ $? == 0 ]; then
     git checkout ${BRANCH}
+    git pull
   else
     git checkout --orphan ${BRANCH}
     git rm --cached -r .
@@ -77,7 +79,7 @@ if [ -n "$1" ]; then
   echo "type: tag" > info.yaml
   echo "version: $TAG" >> info.yaml
   git add -A
-  git commit -m "[skip] Changed tag to: $TAG" & git push -u origin ${BRANCH}
-  #git checkout -
+  git commit -m "Changed tag to: $TAG" & git push -u origin ${BRANCH}
+  git checkout master
   echo ${TAG}
 fi

data/lib/docman/cli.rb

@@ -62,6 +62,17 @@ module Docman
       end
     end
 
+    desc 'bump', 'Bump version'
+    #option :state
+    def bump(state = nil)
+      if state
+        Exec.do "#{Application::bin}/bump-version.sh #{state}"
+      else
+        Exec.do "#{Application::bin}/bump-version.sh"
+      end
+      say('Complete!', :green)
+    end
+
     no_commands {
       def config_dir?
         raise 'ERROR: No config directory in docroot' unless File.directory?('config')

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Alexander Tolstikov