ggsm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0becae26dd9412725ec0aaa41e067be0b92b5412
-  data.tar.gz: f99f03d56b2a956a9b8bc5a04fe5525bb9bfa1ad
+  metadata.gz: 34d9787f4320d45a2351369c10eb1d20f8a044e9
+  data.tar.gz: 76b1eea58ff025fa196b8d26bc361661a5216714
 SHA512:
-  metadata.gz: 4d6db5af5878df733ea14abef954121302f147237036095b577e0eb843296e241be5b39fdafbf3d8b9118d384849fdba5d9f5a22178e6e06bfb72b47fd9a59f9
-  data.tar.gz: a94420a6d9a7a3a7e69684c71fa677aeac62e43a2e780b53e472ce7562efe4c10fadd70d4b18bdf2a771b4495ac6f04130c9d70d34de7d8f2d5e0ab32edc5d6f
+  metadata.gz: 0811971955639f68dbc09319acf62c820a9a636eacfdbcaeb1e78b05069fb9667ceffd442fc0a8acbb2581a2815fbe01dfd979ac352fdfb4f82d77f72fca7214
+  data.tar.gz: 9198afa8a6e42e81495a488fc55646d297ffb082ec003c4faf8453b7364f6384d6b13a029e0ed8293114fd88ccceb32e7eb0b2f6b2b36af87d144aecf4ef21f2

data/lib/ggsm/flow/delete.rb

@@ -27,9 +27,15 @@ module GGSM
     def delete_branch(all, branch, remote)
       if all
         system "git branch -D #{branch}"
-        system "git push origin -d #{branch}"
+        result = system "git push origin -d #{branch}"
+        unless result
+          system 'git fetch -p origin'
+        end
       elsif remote
-        system "git push origin -d #{branch}"
+        result = system "git push origin -d #{branch}"
+        unless result
+          system 'git fetch -p origin'
+        end
       else
         system "git branch -D #{branch}"
       end

data/lib/ggsm/flow/finish.rb

@@ -7,46 +7,12 @@ module GGSM
     include Submodule
     include Stash
 
-    def start_flow(branch, action)
+    def finish_flow(branch)
       unless check_submodule
         return
       end
 
       puts '==> 进入主工程：'.yellow
-
-      arry_conflict = []
-
-      need_stash = try_stash
-      result = system "git checkout -b #{branch} #{action}"
-      if need_stash
-        stash_pop(arry_conflict, '主工程')
-      end
-
-      unless result
-        return
-      end
-
-      `git submodule update --init --recursive`
-
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
-        puts "==> 进入#{sub}：".yellow
-        need_stash = try_stash
-        system "git checkout -b #{branch}"
-        if need_stash
-          stash_pop(arry_conflict, sub)
-        end
-        Dir.chdir '..'
-      end
-
-      if arry_conflict.size > 0
-        tip = '==> 冲突待解决：'
-        arry_conflict.each do |sub|
-          tip = "#{tip}  #{sub}"
-        end
-        puts tip.red
-      end
     end
   end
 end

data/lib/ggsm/flow/foreach.rb

@@ -23,7 +23,6 @@ module GGSM
       commands.each do |arg|
         cmd = "#{cmd} #{arg}"
       end
-      puts cmd
 
       subs = get_submodule
       subs.each do |sub|

data/lib/ggsm/flow/switch.rb

@@ -26,8 +26,6 @@ module GGSM
         return
       end
 
-      `git submodule update --init --recursive`
-
       sub_commits = get_submodule_commit
 
       subs = get_submodule

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler