docman 0.0.57 → 0.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17cc53f17b11541845641a2484a3f6511065c50
-  data.tar.gz: 6f6b8bba4b65b3d41473eb7f9f6b03b81bfb0d55
+  metadata.gz: 2bdd883823f0e69f4f90e51057458cf324078dc4
+  data.tar.gz: 137c6f73fc77ce5a44a617361593202002664e0a
 SHA512:
-  metadata.gz: 3a04a93690ef52e90d3a763d11bfef783e3b56f26c147516da5f1680c309ce6004d5a5dd5fa606f12f977c8f28311b4092577f5c757764e6d1f869aaf60fe291
-  data.tar.gz: da1ea048d609e0a0176c36cc5ba80c74944b8e9137ca87d59619678fc0f8323e7aaf6f367dd47902d9fb0d8e01d494542148706bafa5791bc0ce6c62b62f88ad
+  metadata.gz: 92c3c175673d9b25e7d04b3a927b3ab204d82febd6cf07f6d5983e51de0a2561ee76ed65085336aa025ae7463fddda2cef9897a445a2593f142e0688e7788a84
+  data.tar.gz: 1a238ca622220d257bd8b8bb8ac39895b03854e403cca265b5f049ba076f99bb9d2cae6bfd4e7735aa9623cabd63498816f2dc38a62648f1b0317a408547a39f

data/bin/check-branch.sh

@@ -0,0 +1,15 @@
+#!/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
+fi

data/lib/application.rb

@@ -111,6 +111,22 @@ module Docman
       end
     end
 
+    def drush(env, site, command)
+      with_rescue(false) do
+        cmd = "drush env: '#{env}', site: '#{site}', '#{command}'"
+        log cmd
+        path = Dir.pwd
+        branch = 'commands'
+        currentBranch = GitUtil.branch
+        Exec.do "#{Application::bin}/check-branch.sh #{branch}"
+        File.open(File.join(path, 'commands'), 'w') {|f| f.write cmd}
+        GitUtil.exec("add commands")
+        GitUtil.exec("commit -m 'Added command'")
+        GitUtil.push(path, branch)
+        GitUtil.exec("checkout #{currentBranch}")
+      end
+    end
+
     def write_state state
       filepath = File.join(@workspace_dir, 'state')
       File.open(filepath, 'w') { |file| file.write(state) }

data/lib/docman/cli.rb

@@ -86,6 +86,14 @@ module Docman
       say('Complete!', :green)
     end
 
+    desc 'drush', 'Execute remote drush commands'
+    def drush(drush_alias, command)
+      env = drush_alias.partition('.').first.partition('@').last
+      site = drush_alias.partition('.').last
+      Application.instance.drush(env, site, command)
+      say('Complete!', :green)
+    end
+
     no_commands {
       def current_dir_has_config_dir
         File.directory?('config')

data/lib/docman/git_util.rb

@@ -82,9 +82,13 @@ module Docman
       end
     end
 
-    def self.pull(path)
+    def self.pull(path, options = nil)
       Dir.chdir path
-      exec 'pull'
+      exec "pull#{options}"
+    end
+
+    def self.branch()
+      exec "rev-parse --abbrev-ref HEAD", false
     end
 
     def self.repo?(path)
@@ -101,10 +105,10 @@ module Docman
       result.delete!("\n")
     end
 
-    def self.push(root_path, version)
+    def self.push(root_path, version, show_result = true)
       Dir.chdir root_path
-      exec "pull origin #{version}"
-      exec "push origin #{version}"
+      exec "pull origin #{version}", show_result
+      exec "push origin #{version}", show_result
     end
 
     def self.tag(root_path, tag)

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.57"
+  VERSION = "0.0.58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.58
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ email:
 - atolstikov@adyax.com
 executables:
 - bump-version.sh
+- check-branch.sh
 - dm_repo_clean.sh
 - docman
 - docman.rb
@@ -155,6 +156,7 @@ files:
 - README.md
 - Rakefile
 - bin/bump-version.sh
+- bin/check-branch.sh
 - bin/dm_repo_clean.sh
 - bin/docman
 - bin/docman.rb