ggsm 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc278718389521b909307d6e17aa9c885a48dbb
-  data.tar.gz: af4aaca2ad7a49360347f304dccf7fe75092760a
+  metadata.gz: 6047a2466f671d94d9ed1632af90fc1362c24a98
+  data.tar.gz: e171938265ea8db94e4b051e7ece45d1a9dec9e1
 SHA512:
-  metadata.gz: 6131395780e5c21ac27c309ed2aea21891bd7f697c4babfcc74a7e1040e7f8b5a28a54ea6df981d29dbfda38383126221856fbfc61fc64d8b90685575d191b00
-  data.tar.gz: 3884e4075320d1dd1607ebc01866a77399bef0399af6c6e877231dd9c8e9d75f2e8418e2663b8b2e2ab2b40b0b27278ab67e840b9b3bbd4ac01d0d9309a8de0e
+  metadata.gz: c2d39d480055c9ffcbc9ff9dc604ec7b6e635fc709b4c696a0a06e79fa1334729edff7a5d2f8bfe1fef1e1a47a9c2fa54e65391921c709aacded640453e0de91
+  data.tar.gz: be44fcddb27f8b8691f563124fc3dc3187db7993cabaa90479916ac53ec516f0b579e715fb4f997394ae813edf94a1e51ceb94cb9a91c7902ea3a7b6beb28949

data/README.md

@@ -1,35 +1,28 @@
 # GGSM
-TODO
+Gitsubmodule workflow
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'ggsm'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Install it yourself as:
 
     $ gem install ggsm
 
 ## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+````
+Commands:
+  ggsm [help] [COMMAND]                          # 帮助
+  ggsm sync                                      # 同步(拉取)远程代码
+  ggsm start <branch> [<commit>] [<origin>]      # 检出新分支，新功能、修bug务必使用该命令
+  ggsm switch <branch>                           # 切换分支
+  ggsm merge [<branch>]                          # Merge，开发完成后执行
+  ggsm finish                                    # Merge后并解决冲突后执行
+  ggsm delete <branch> [-r|--remote] [-a|--all]  # 删除指定分支
+  ggsm foreach [<commands>...]                   # 所有模块执行git命令(foreach后跟git命令)
+````
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub https://github.com/YoKeyword/ggsm. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub https://github.com/YoKeyword/ggsm. This project is intended to be a safe, welcoming space for collaboration.
 
 
 ## License

data/lib/ggsm/flow/delete.rb

@@ -13,13 +13,9 @@ module GGSM
 
       delete_branch(all, branch, remote)
 
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
-        puts "==> 进入#{sub}：".yellow
+      foreach_module {
         delete_branch(all, branch, remote)
-        Dir.chdir '..'
-      end
+      }
     end
 
     def delete_branch(all, branch, remote)

data/lib/ggsm/flow/finish.rb

@@ -8,13 +8,9 @@ module GGSM
     def finish_flow
       check_submodule
 
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
-        puts "==> 进入#{sub}：".yellow
+      foreach_module {
         system "git add .;git commit;git push origin #{get_current_branch}"
-        Dir.chdir '..'
-      end
+      }
 
       puts '==> 进入主工程：'.yellow
       system "git add .;git commit;git push origin #{get_current_branch}"

data/lib/ggsm/flow/foreach.rb

@@ -22,13 +22,9 @@ module GGSM
         cmd = "#{cmd} #{arg}"
       end
 
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
-        puts "==> *进入#{sub}：".yellow
+      foreach_module {
         system "git #{cmd}"
-        Dir.chdir '..'
-      end
+      }
 
       puts '==> *进入主工程：'.yellow
       system "git #{cmd}"

data/lib/ggsm/flow/merge.rb

@@ -11,13 +11,11 @@ module GGSM
 
       arry_conflict = []
 
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
+      foreach_module {|sub|
         process_merge(arry_conflict, sub, branch)
-        Dir.chdir '..'
-      end
+      }
 
+      puts '==> 进入主工程：'.yellow
       process_merge(arry_conflict, '主工程', branch)
       puts "Modules执行：git merge #{branch}".blue
 
@@ -31,7 +29,6 @@ module GGSM
     end
 
     def process_merge(arry_conflict, module_name, branch)
-      puts "==> 进入#{module_name}：".yellow
       result_merge = `git merge #{branch}`
       puts result_merge
 

data/lib/ggsm/flow/start.rb

@@ -32,17 +32,13 @@ module GGSM
         return
       end
 
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
-        puts "==> 进入#{sub}：".yellow
+      foreach_module {|sub|
         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.size}个模块冲突："

data/lib/ggsm/flow/switch.rb

@@ -27,29 +27,9 @@ module GGSM
 
       sub_commits = get_submodule_commit
 
-      subs = get_submodule
-      subs.each do |sub|
-        Dir.chdir sub
-        puts "==> 进入#{sub}：".yellow
-        need_stash = try_stash
-        result = system "git checkout #{branch}"
-
-        if result
-          commit = sub_commits.fetch(subs.index(sub));
-          commit_exist = system "git reset --hard #{commit}"
-          unless commit_exist
-            arry_commit_not_exist.push("==> #{sub}模块不存在远程commit:#{commit}")
-          end
-        else
-          puts "[#{sub}] 没有#{branch}分支，创建并切换到#{branch}".blue
-          system "git checkout -b #{branch}"
-        end
-
-        if need_stash
-          stash_pop(arry_conflict, sub)
-        end
-        Dir.chdir '..'
-      end
+      foreach_module {|sub, index|
+        process_switch(arry_commit_not_exist, arry_conflict, branch, index, sub, sub_commits)
+      }
 
       if arry_conflict.size > 0
         tip = "==> #{arry_conflict.size}个模块冲突："
@@ -66,5 +46,25 @@ module GGSM
         tip_contact_author
       end
     end
+
+    def process_switch(commit_not_exist, arry_conflict, branch, index, sub, sub_commits)
+      need_stash = try_stash
+      result = system "git checkout #{branch}"
+
+      if result
+        commit = sub_commits.fetch(index);
+        commit_exist = system "git reset --hard #{commit}"
+        unless commit_exist
+          commit_not_exist.push("==> #{sub}模块不存在远程commit:#{commit}")
+        end
+      else
+        puts "[#{sub}] 没有#{branch}分支，创建并切换到#{branch}".blue
+        system "git checkout -b #{branch}"
+      end
+
+      if need_stash
+        stash_pop(arry_conflict, sub)
+      end
+    end
   end
 end

data/lib/ggsm/util/submodule.rb

@@ -9,7 +9,7 @@ module GGSM
     end
 
     def get_submodule
-      pattern = /(?<=\s)[0-9a-zA-Z]*(?=\s)/
+      pattern = /(?<=\s)[\/0-9a-zA-Z]*(?=\s)/
 
       sub_status = `git submodule`
       sub_status = sub_status.split(/\n/)
@@ -31,7 +31,13 @@ module GGSM
     end
 
     def get_submodule_commit
-      sub_commits = `git ls-tree HEAD | grep "160000"`
+      sub_tree = 'git ls-tree HEAD | grep "160000"'
+      sub_commits = `#{sub_tree}`
+      if sub_commits.strip == '' && (File.directory? 'submodules')
+        Dir.chdir 'submodules'
+        sub_commits = `#{sub_tree}`
+        Dir.chdir '..'
+      end
       pattern = /(?<=\s)[0-9a-zA-Z]{40}(?=\s)/
       sub_commits = sub_commits.split(/\n/)
       result = []
@@ -44,6 +50,7 @@ module GGSM
 
     def check_un_commit_code
       subs = get_submodule
+      project_path = Dir.pwd
       subs.each do |sub|
         Dir.chdir sub
         status = `git status --ignore-submodules | grep 'nothing to commit'`
@@ -51,7 +58,7 @@ module GGSM
           puts "#{sub} 有未提交的代码".red
           exit 1
         end
-        Dir.chdir '..'
+        Dir.chdir project_path
       end
 
       status = `git status --ignore-submodules | grep 'nothing to commit'`
@@ -61,6 +68,17 @@ module GGSM
       end
     end
 
+    def foreach_module
+      subs = get_submodule
+      project_path = Dir.pwd
+      subs.each do |sub|
+        Dir.chdir sub
+        puts "==> 进入#{sub}：".yellow
+        yield sub, subs.index(sub)
+        Dir.chdir project_path
+      end
+    end
+
     def get_current_branch
       `git branch | grep "*"`.split('* ')[1].split("\n")[0]
     end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler