ggsm 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996c39374cb11250d79913de7faf12ae2730290b
-  data.tar.gz: 5045631bff91d67cf68cf1595869b5dc0715094d
+  metadata.gz: dd8da8540d6e4e736ff782af1c43fb71b08d95ea
+  data.tar.gz: 571682bd82ddf00beec4397a219c057b83993b0a
 SHA512:
-  metadata.gz: fd593cfc4cb21c7fc66f51fcacb431ab913f44fd4f58bd95449ec0323de2a3f00e34776a7ac1e50939d62a4df68bb0f1d0226b90f1b367d1335cfd30f9067c8e
-  data.tar.gz: 648ea7a0822727659814fdb4938a1767a1368f955d0b78a2dbf52d055d39990ad254c11edc6a2c169049f286fc841319660499b0819ce35287550ac0d0752da7
+  metadata.gz: e0a269fc7173ec80d4caa9716ebf5a0f228c520bb4a8067a4dc68f7dc2bc6dd192fbf48bcbc58ee9df6cade109cf447ca63015c634d50c6e86a95923e77db5ca
+  data.tar.gz: c9c6fd2df3576848858315683ba6beefe870e21de8d6f93f7a162a5964363c5dfe071613a4cae3ef7dc6a7e6aa6ac4b0da40ae5ee25090520dc93c783206ceb4

data/lib/ggsm/command/delete.rb

@@ -19,19 +19,38 @@ module GGSM
     end
 
     def delete_branch(all, branch, remote)
+      if branch == get_current_branch
+        puts "无法删除当前所在分支：#{branch}，请switch其他分支后再执行\"ggsm delete\"".red
+        exit 0
+      end
+
       if all
-        system "git branch -D #{branch}"
-        result = system "git push origin -d #{branch}"
-        unless result
-          system 'git fetch -p origin'
-        end
+        delete_local_branch(branch)
+        delete_remote_branch(branch)
       elsif remote
-        result = system "git push origin -d #{branch}"
-        unless result
-          system 'git fetch -p origin'
+        delete_remote_branch(branch)
+      else
+        delete_local_branch(branch)
+      end
+    end
+
+    def delete_local_branch(branch)
+      if `git branch | grep -e '\s|*#{branch}$'`.strip == ''
+        puts "warning: branch '#{branch}' not found"
+      else
+        info = `git branch -D #{branch}`
+        if info.strip != ''
+          puts "✓  #{info}"
         end
+      end
+    end
+
+    def delete_remote_branch(branch)
+      if `git branch -r | grep -e '\s|*origin/#{branch}$'`.strip == ''
+        puts "warning: remote branch '#{branch}' not found"
       else
-        system "git branch -D #{branch}"
+        system "git push origin -d #{branch}"
+        `git fetch -p origin`
       end
     end
   end

data/lib/ggsm/command/finish.rb

@@ -25,14 +25,18 @@ module GGSM
       if branch.include?('rebas')
         system 'git rebase --continue'
       else
-        system 'git commit'
+        stage = `git diff --cached --name-only`.strip
+        if stage == ''
+          `git commit`
+        else
+          result = system 'git commit'
+          unless result
+            exit 1
+          end
+        end
       end
 
-      if force
-        system "git push -u origin #{get_current_branch} -f"
-      else
-        system "git push -u origin #{get_current_branch}"
-      end
+      `git push -u origin #{get_current_branch} #{force ? '-f' : ''}`
     end
   end
 end

data/lib/ggsm/command/switch.rb

@@ -17,7 +17,7 @@ module GGSM
       arry_commit_not_exist = []
 
       need_stash = try_stash
-      result = system "git checkout #{branch}"
+      `git checkout #{branch}`; result=$?.success?
       if need_stash
         stash_pop(arry_conflict, '主工程')
       end
@@ -50,12 +50,13 @@ module GGSM
 
     def process_switch(commit_not_exist, arry_conflict, branch, index, sub, sub_commits)
       need_stash = try_stash
-      result = system "git checkout #{branch}"
+
+      `git checkout #{branch}`; result=$?.success?
 
       if result
         commit = sub_commits.fetch(index);
-        commit_exist = system "git reset --hard #{commit}"
-        unless commit_exist
+        `git reset --hard #{commit}`; result=$?.success?
+        unless result
           commit_not_exist.push("==> #{sub}模块不存在远程commit:#{commit}")
         end
       else

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler