ggsm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb26eff5e32f1ba8b71d831c1882c6e8b1ece4a
-  data.tar.gz: c784dbf1527230dc28e27604e903230fe961d51b
+  metadata.gz: 0becae26dd9412725ec0aaa41e067be0b92b5412
+  data.tar.gz: f99f03d56b2a956a9b8bc5a04fe5525bb9bfa1ad
 SHA512:
-  metadata.gz: 7520bd496694396834e374671dc004762b132cf2c910cf58c03170355953375a6f4461e2831d6ec46174a3ada2dc206d9325d75a04d4a2e9b027587844e171a1
-  data.tar.gz: 4db64a146f5901380e24054fb4cae81e3afdb9167ddae0a4d1b184a27ed4d87dee29e2f1442ec073c14c831476fba7caaeafe9a018fc3092fa01a5a3569f5882
+  metadata.gz: 4d6db5af5878df733ea14abef954121302f147237036095b577e0eb843296e241be5b39fdafbf3d8b9118d384849fdba5d9f5a22178e6e06bfb72b47fd9a59f9
+  data.tar.gz: a94420a6d9a7a3a7e69684c71fa677aeac62e43a2e780b53e472ce7562efe4c10fadd70d4b18bdf2a771b4495ac6f04130c9d70d34de7d8f2d5e0ab32edc5d6f

data/lib/ggsm/flow/finish.rb

@@ -0,0 +1,52 @@
+require 'colorize'
+require_relative '../util/submodule'
+require_relative '../util/stash'
+
+module GGSM
+  module Finish
+    include Submodule
+    include Stash
+
+    def start_flow(branch, action)
+      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/switch.rb

@@ -26,6 +26,8 @@ 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.0"
+  VERSION = '1.0.1'
 end

data/lib/ggsm.rb

@@ -6,6 +6,7 @@ require_relative 'ggsm/flow/sync'
 require_relative 'ggsm/flow/switch'
 require_relative 'ggsm/flow/delete'
 require_relative 'ggsm/flow/foreach'
+require_relative 'ggsm/flow/finish'
 
 module GGSM
   class Cli < Thor
@@ -15,6 +16,7 @@ module GGSM
     include Switch
     include Delete
     include Foreach
+    include Finish
 
     desc 'start <branch> [<commit>] [<origin>]', 'Start to develop new feature'
     def start(branch, action='')
@@ -49,5 +51,10 @@ module GGSM
     def foreach(*commands)
       foreach_flow(*commands)
     end
+
+    desc 'finish <branch>', 'Finish the feature'
+    def finish(branch)
+      finish_flow(branch)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,9 +83,11 @@ files:
 - README.md
 - Rakefile
 - bin/ggsm
+- ggsm-1.0.0.gem
 - ggsm.gemspec
 - lib/ggsm.rb
 - lib/ggsm/flow/delete.rb
+- lib/ggsm/flow/finish.rb
 - lib/ggsm/flow/foreach.rb
 - lib/ggsm/flow/start.rb
 - lib/ggsm/flow/switch.rb