ggsm 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d194bcbcc90cdf2025160a000a16360e3de891a7
-  data.tar.gz: e84546de9fcaacbf29e0c95ee69591e3d2cd98f8
+  metadata.gz: edc278718389521b909307d6e17aa9c885a48dbb
+  data.tar.gz: af4aaca2ad7a49360347f304dccf7fe75092760a
 SHA512:
-  metadata.gz: 15111fb0282681c54cc30635b6b323c15e729349774c49550d1a1791988c3da63a1c77496f45ecd2b40bfa7bf1126d4c4af3a070be3483ba32d0c8ec50ce9eaf
-  data.tar.gz: 2a263cbb1f36d1bd8e748b35a44bd8afa5e361e680ab3d2aa7a7298350c148c676b7892c6a2c785fb5d2e2a66eade4583724df43e63f1dfe42729949612f7df5
+  metadata.gz: 6131395780e5c21ac27c309ed2aea21891bd7f697c4babfcc74a7e1040e7f8b5a28a54ea6df981d29dbfda38383126221856fbfc61fc64d8b90685575d191b00
+  data.tar.gz: 3884e4075320d1dd1607ebc01866a77399bef0399af6c6e877231dd9c8e9d75f2e8418e2663b8b2e2ab2b40b0b27278ab67e840b9b3bbd4ac01d0d9309a8de0e

data/README.md

@@ -1,8 +1,5 @@
 # GGSM
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/hex`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+TODO
 
 ## Installation
 
@@ -18,7 +15,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install hex
+    $ gem install ggsm
 
 ## Usage
 
@@ -32,7 +29,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hex. 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, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/ggsm.rb

@@ -1,7 +1,6 @@
 require 'thor'
 require_relative 'ggsm/version'
 require_relative 'ggsm/flow/start'
-require_relative 'ggsm/flow/update'
 require_relative 'ggsm/flow/sync'
 require_relative 'ggsm/flow/switch'
 require_relative 'ggsm/flow/delete'
@@ -12,7 +11,6 @@ require_relative 'ggsm/flow/finish'
 module GGSM
   class Cli < Thor
     include Start
-    include Update
     include Sync
     include Switch
     include Delete
@@ -30,11 +28,6 @@ module GGSM
       switch_flow(branch)
     end
 
-    desc 'update', '更新当前commit对应的子模块commit'
-    def update
-      update_flow
-    end
-
     desc 'sync', '当前分支同步(拉取)远程代码'
     def sync
       sync_flow
@@ -49,7 +42,7 @@ module GGSM
       delete_flow(branch, remote, all)
     end
 
-    desc 'foreach [<commands>...]', '全模块执行git命令(foreach后跟git命令)'
+    desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
     def foreach(*commands)
       foreach_flow(*commands)
     end
@@ -59,7 +52,7 @@ module GGSM
       merge_flow(branch)
     end
 
-    desc 'finish', '完成开发，ggsm merge并解决冲突后执行'
+    desc 'finish', 'Merge后并解决冲突后执行'
     def finish
       finish_flow
     end

data/lib/ggsm/flow/merge.rb

@@ -9,18 +9,35 @@ module GGSM
       check_submodule
       check_un_commit_code
 
+      arry_conflict = []
+
       subs = get_submodule
       subs.each do |sub|
         Dir.chdir sub
-        puts "==> 进入#{sub}：".yellow
-        system "git merge #{branch}"
+        process_merge(arry_conflict, sub, branch)
         Dir.chdir '..'
       end
 
-      puts '==> 进入主工程：'.yellow
-      system "git merge #{branch}"
-
+      process_merge(arry_conflict, '主工程', branch)
       puts "Modules执行：git merge #{branch}".blue
+
+      if arry_conflict.size > 0
+        tip = "==> #{arry_conflict.size}个模块冲突："
+        arry_conflict.reverse.each do |sub|
+          tip = "#{tip}  #{sub}"
+        end
+        puts tip.red
+      end
+    end
+
+    def process_merge(arry_conflict, module_name, branch)
+      puts "==> 进入#{module_name}：".yellow
+      result_merge = `git merge #{branch}`
+      puts result_merge
+
+      if result_merge.include? 'Merge conflict'
+        arry_conflict.push(module_name)
+      end
     end
   end
 end

data/lib/ggsm/flow/start.rb

@@ -13,6 +13,7 @@ module GGSM
       puts '==> 进入主工程：'.yellow
 
       arry_conflict = []
+      current_branch = get_current_branch
 
       need_stash = try_stash
       result = system "git checkout -b #{branch} #{action}"
@@ -24,7 +25,12 @@ module GGSM
         return
       end
 
-      `git submodule update --init --recursive`
+      result = system 'git submodule update --init --recursive'
+      unless result
+        tip_contact_author
+        `git checkout #{current_branch};git branch -D #{branch}`
+        return
+      end
 
       subs = get_submodule
       subs.each do |sub|
@@ -39,7 +45,7 @@ module GGSM
       end
 
       if arry_conflict.size > 0
-        tip = '==> 冲突待解决：'
+        tip = "==> #{arry_conflict.size}个模块冲突："
         arry_conflict.each do |sub|
           tip = "#{tip}  #{sub}"
         end

data/lib/ggsm/flow/switch.rb

@@ -13,6 +13,7 @@ module GGSM
       puts '==> 进入主工程：'.yellow
 
       arry_conflict = []
+      arry_commit_not_exist = []
 
       need_stash = try_stash
       result = system "git checkout #{branch}"
@@ -34,7 +35,11 @@ module GGSM
         result = system "git checkout #{branch}"
 
         if result
-          system "git reset --hard #{sub_commits.fetch(subs.index(sub))}"
+          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}"
@@ -47,12 +52,19 @@ module GGSM
       end
 
       if arry_conflict.size > 0
-        tip = '==> 冲突待解决：'
+        tip = "==> #{arry_conflict.size}个模块冲突："
         arry_conflict.each do |sub|
           tip = "#{tip}  #{sub}"
         end
         puts tip.red
       end
+
+      if arry_commit_not_exist.size > 0
+        arry_commit_not_exist.each do |tip|
+          puts tip.red
+        end
+        tip_contact_author
+      end
     end
   end
 end

data/lib/ggsm/flow/sync.rb

@@ -13,8 +13,7 @@ module GGSM
         return
       end
 
-      current_branch = `git branch | grep "*"`.split("* ")[1].split("\n")[0]
-      switch_flow(current_branch)
+      switch_flow(get_current_branch)
     end
   end
-end
+end

data/lib/ggsm/util/submodule.rb

@@ -9,16 +9,25 @@ module GGSM
     end
 
     def get_submodule
-      sub_status = `git submodule`
       pattern = /(?<=\s)[0-9a-zA-Z]*(?=\s)/
+
+      sub_status = `git submodule`
       sub_status = sub_status.split(/\n/)
+      match = pattern.match(sub_status[0])
+
+      if match==nil
+        puts '==> 初始化子模块'.yellow
+        `git submodule update --init --recursive`
+        sub_status = `git submodule`
+        sub_status = sub_status.split(/\n/)
+      end
 
       result = []
       sub_status.each do |sub|
         match = pattern.match(sub.strip)
         result.push(match[0])
       end
-      return result
+      result
     end
 
     def get_submodule_commit
@@ -30,7 +39,7 @@ module GGSM
         match = pattern.match(sub.strip)
         result.push(match[0][0...7])
       end
-      return result
+      result
     end
 
     def check_un_commit_code
@@ -53,7 +62,13 @@ module GGSM
     end
 
     def get_current_branch
-      return `git branch | grep "*"`.split('* ')[1].split("\n")[0]
+      `git branch | grep "*"`.split('* ')[1].split("\n")[0]
+    end
+
+    def tip_contact_author
+      latest_commit = `git log test -1 --oneline | grep ''`.split(' ')[0]
+      author = `git show #{latest_commit}|grep "Author:"`.chomp
+      puts "请联系#{author} 推送远程缺失的commit".red
     end
   end
 end

data/lib/ggsm/version.rb

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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for Git Submodule
@@ -74,16 +74,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/ggsm
-- ggsm-1.0.0.gem
 - ggsm.gemspec
 - lib/ggsm.rb
 - lib/ggsm/flow/delete.rb
@@ -93,7 +92,6 @@ files:
 - lib/ggsm/flow/start.rb
 - lib/ggsm/flow/switch.rb
 - lib/ggsm/flow/sync.rb
-- lib/ggsm/flow/update.rb
 - lib/ggsm/util/stash.rb
 - lib/ggsm/util/submodule.rb
 - lib/ggsm/version.rb
@@ -107,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ggsm

data/lib/ggsm/flow/update.rb

@@ -1,10 +0,0 @@
-module GGSM
-  module Update
-    def update_flow
-      check_submodule
-
-      system 'git submodule update --init --recursive'
-      puts '==> 更新子模块完成！'.yellow
-    end
-  end
-end