docman 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ccb5c7f248c0ccd33a8690ee0fb519f0ffbc76
-  data.tar.gz: 0f1eb379c6d0b5021927f0641e1d24c8e2f03afd
+  metadata.gz: 7009223c674b7c9586daddfc4e26dfc83acbe8d5
+  data.tar.gz: 73fc9033d667cea02df6797f509807d6f05bdbad
 SHA512:
-  metadata.gz: 0594b39d8fece6de40b68137c249857b35327dd1fe7c7b3fadee7722cd5689a3cc2267edfaf7f85ddc66a8b18b76034d5a68c985beaf990b8b6e7bd50e80328c
-  data.tar.gz: ce420265f490e7c08e0a4e7a149331e72705e92d540a2c1699a0b13f159548b1f9e9079d33dc4de14b5ed65df287c470314ca42877818da4af4f6d684d5ef68b
+  metadata.gz: 02fa60e273348c2bb71bfbb05e4d67a5e00a1998781c47822bc89aabcb045352807da7735cf837f6ed551c68d83e1ca24bb5178e2ab2599dbd6f2637434d2385
+  data.tar.gz: e60b30a0ba2a0564302dfe2e35163ee2e6ee6e890ee68147a02ff603bb7003000bcf6ba53430738debf32dfbfd51fe8a0976325a8ca431a21045679289a91406

data/lib/application.rb

@@ -117,13 +117,23 @@ module Docman
         log cmd
         path = Dir.pwd
         branch = 'commands'
-        currentBranch = GitUtil.branch
-        Exec.do "#{Application::bin}/check-branch.sh #{branch}"
+        current_branch = GitUtil.branch
+        GitUtil.exec("fetch")
+        have_branch = Exec.do("git ls-remote --exit-code . origin/#{branch} &> /dev/null")
+        log have_branch
+        if have_branch
+          GitUtil.exec("checkout #{branch}")
+          GitUtil.exec("pull origin #{branch}")
+        else
+          GitUtil.exec("checkout --orphan #{branch}")
+          GitUtil.exec("rm --cached -r .", false)
+          GitUtil.exec("clean -f -d", false)
+        end
         File.open(File.join(path, 'commands'), 'a') {|f| f.puts cmd}
         GitUtil.exec("add commands")
         GitUtil.exec("commit -m 'Added command'")
         GitUtil.push(path, branch, true)
-        GitUtil.exec("checkout #{currentBranch}")
+        GitUtil.exec("checkout #{current_branch}")
       end
     end
 

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.60"
+  VERSION = "0.0.61"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Alexander Tolstikov
@@ -141,7 +141,6 @@ email:
 - atolstikov@adyax.com
 executables:
 - bump-version.sh
-- check-branch.sh
 - dm_repo_clean.sh
 - docman
 - docman.rb
@@ -156,7 +155,6 @@ files:
 - README.md
 - Rakefile
 - bin/bump-version.sh
-- bin/check-branch.sh
 - bin/dm_repo_clean.sh
 - bin/docman
 - bin/docman.rb

data/bin/check-branch.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -n "$1" ]; then
-  git fetch
-  BRANCH="$1"
-  git ls-remote --exit-code . origin/${BRANCH} &> /dev/null
-  if [ $? == 0 ]; then
-    git checkout ${BRANCH}
-    git pull origin ${BRANCH}
-  else
-    git checkout --orphan ${BRANCH}
-    git rm --cached -r .
-    git clean -f -d
-  fi
-  git push -u origin ${BRANCH}
-fi