ggsm 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720e88a2a9390cc061414bf6acde20035124fa03
-  data.tar.gz: 8eacd0a554174bfbba66ea2affd3e9f3daa75372
+  metadata.gz: 69c805930e864b62f6d3d204382434aaa2834597
+  data.tar.gz: 76ccc110964243679acb139cd88a79bc3deb342a
 SHA512:
-  metadata.gz: 576e5d9a73dd563d26c6c6c6ba4401b79fdd00fc1f8d6b8aa1cae4b2e3febe312d6a8c11857ed4122b212d0530f6b1fea5c33d4e3713e5bc787c02cf9579130d
-  data.tar.gz: ffc96b9267b7247ce786f5f066fc07d119a9c87513608c5284b10ed5a35766b8ad8a97154f00ab05c926a59bbdb26d2eb15f9dd57aacbf038f46a80a9f2bbaf0
+  metadata.gz: 217a55a09c089548b21ab2cb2e593b743a890ad2a7375c63f7a37b1c1d638c357d9d5246adbbfe948a7ade9dc91b2b8a08a8e889277b9f39f903ac42e19b70e6
+  data.tar.gz: 3715f2f5a477b083bfcac5e9cbfe7f1739bc51b71e104d29faf97f66f793371220f0b4b7a1e4df150d99e5dc07f7d371b85fcde71e08c148e41bccdc0570e325

data/lib/ggsm.rb

@@ -1,12 +1,12 @@
 require 'thor'
 require_relative 'ggsm/version'
-require_relative 'ggsm/flow/start'
-require_relative 'ggsm/flow/sync'
-require_relative 'ggsm/flow/switch'
-require_relative 'ggsm/flow/delete'
-require_relative 'ggsm/flow/foreach'
-require_relative 'ggsm/flow/merge'
-require_relative 'ggsm/flow/finish'
+require_relative 'ggsm/command/start'
+require_relative 'ggsm/command/sync'
+require_relative 'ggsm/command/switch'
+require_relative 'ggsm/command/delete'
+require_relative 'ggsm/command/foreach'
+require_relative 'ggsm/command/merge'
+require_relative 'ggsm/command/finish'
 
 module GGSM
   class Cli < Thor
@@ -18,21 +18,31 @@ module GGSM
     include Merge
     include Finish
 
+    desc 'sync', '当前分支同步(拉取)远程代码'
+    def sync
+      sync_flow
+    end
+
     desc 'start <branch> [<commit>] [<origin>]', '检出新分支，新功能、修bug务必使用该命令'
     def start(branch, action='')
       start_flow(branch, action)
     end
 
+    desc 'merge <branch>', 'Merge，开发完成后执行'
+    def merge(branch)
+      merge_flow(branch)
+    end
+
+    desc 'finish', 'Merge后并解决冲突后执行'
+    def finish
+      finish_flow
+    end
+
     desc 'switch <branch>', '切换分支'
     def switch(branch)
       switch_flow(branch)
     end
 
-    desc 'sync', '当前分支同步(拉取)远程代码'
-    def sync
-      sync_flow
-    end
-
     desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
     option :remote, :default => false, :type => :boolean, aliases: '-r'
     option :all, :default => false, :type => :boolean, aliases: '-a'
@@ -42,21 +52,16 @@ module GGSM
       delete_flow(branch, remote, all)
     end
 
+    desc 'status', '显示所有模块的状态'
+    def status
+      foreach('status')
+    end
+
     desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
     def foreach(*commands)
       foreach_flow(*commands)
     end
 
-    desc 'merge <branch>', 'Merge，开发完成后执行'
-    def merge(branch)
-      merge_flow(branch)
-    end
-
-    desc 'finish', 'Merge后并解决冲突后执行'
-    def finish
-      finish_flow
-    end
-
     desc '[v|version]', '查看版本'
     def version
       puts VERSION

data/lib/ggsm/{flow → command}/switch.rb

@@ -7,8 +7,9 @@ module GGSM
     include Submodule
     include Stash
 
-    def switch_flow(branch)
+    def switch_flow(branch, *is_sync)
       check_submodule
+      check_submodule_status(is_sync)
 
       puts '==> 进入主工程：'.yellow
 

data/lib/ggsm/{flow → command}/sync.rb

@@ -13,7 +13,7 @@ module GGSM
         return
       end
 
-      switch_flow(get_current_branch)
+      switch_flow(get_current_branch, true)
     end
   end
 end

data/lib/ggsm/hook/commit-msg

@@ -4,7 +4,7 @@ require 'colorize'
 @msg = IO.read(ARGV[0]).force_encoding('UTF-8')
 
 def commit_check
-  standards = %w(fix: fix： feat: feat： style: style： doc: doc： docs: docs： ref: ref： refactor: refactor： chore: chore： test: test： Merge merge)
+  standards = %w(fix: fix： feat: feat： style: style： doc: doc： docs: docs： ref: ref： refactor: refactor： chore: chore： test: test： Merge merge Revert revert)
   standards.each do |standard|
     check(standard)
   end

data/lib/ggsm/hook/pre-commit

@@ -31,6 +31,7 @@ begin
       result = `java -jar #{Dir.pwd}/_script/checkstyle-7.0.jar -c #{Dir.pwd}/_script/checkstyle.xml #{Dir.pwd}/#{file}`
       result = result.gsub("Starting audit...\n", '')
       result = result.gsub("Audit done.\n", '')
+      result = result.force_encoding('UTF-8')
 
       if result.include?('WARN') || result.include?('ERROR')
         count = count + 1

data/lib/ggsm/util/hooks.rb

@@ -0,0 +1,46 @@
+module GGSM
+  module Hooks
+    def check_hooks
+      if update_hooks
+        subs = get_submodule
+        subs.each do |sub|
+          cp_hooks(sub)
+        end
+      end
+    end
+
+    def update_hooks
+      version = `ggsm v`
+      ggsm_path = '.git/ggsm'
+      unless File.exist?(ggsm_path)
+        Dir.mkdir(ggsm_path)
+      end
+
+      config_path = "#{ggsm_path}/VERSION"
+      target_path = '.git/hooks'
+
+      if !File.exist?(config_path) || version != IO.read(config_path)
+        cp_files(target_path)
+
+        file = File.new(config_path, 'w')
+        file << version
+        file.close
+
+        puts '已更新Hooks'.blue
+        return true
+      end
+      false
+    end
+
+    def cp_hooks(sub)
+      target_path = ".git/modules/#{sub}/hooks"
+      cp_files(target_path)
+    end
+
+    def cp_files(target_path)
+      path = `gem which ggsm`.split('/ggsm.rb')[0]
+      `cp #{path}/ggsm/hook/commit-msg #{target_path}/commit-msg`
+      `cp #{path}/ggsm/hook/pre-commit  #{target_path}/pre-commit`
+    end
+  end
+end

data/lib/ggsm/util/submodule.rb

@@ -1,5 +1,9 @@
+require_relative 'hooks'
+
 module GGSM
   module Submodule
+    include Hooks
+
     def check_submodule
       sub_str = `git submodule`
       if sub_str.empty?
@@ -7,7 +11,7 @@ module GGSM
         exit 1
       end
 
-      switch_dir
+      correct_dir
       check_hooks
     end
 
@@ -33,6 +37,49 @@ module GGSM
       result
     end
 
+    def check_submodule_status(is_sync)
+      modified_sub = get_modified_submodule
+      if !is_sync && modified_sub.size > 0
+        subs = ''
+        modified_sub.each do |sub|
+          subs = "#{sub} , #{subs}"
+        end
+        puts "\n存在未跟踪的子模块提交: #{subs[0...subs.size-2]} \n\n请选择操作：\n1 丢弃子模块的改动
+2 追踪子模块(仅追踪子模块)\n3 追踪所有改变\n4 取消".red
+
+        input = STDIN.gets.chomp.upcase
+        if input == '1'
+        elsif input == '2'
+          add = 'git add'
+          modified_sub.each do |sub|
+            add = "#{add} #{sub}"
+          end
+          system "#{add};git commit"
+        elsif input == '3'
+          system 'git add .;git commit'
+        else
+          puts '==> 取消操作'.blue
+          return
+        end
+      end
+    end
+
+    def get_modified_submodule
+      result = []
+
+      status = `git status -s`.split(/\n/)
+      subs = get_submodule
+
+      status.each do |sub|
+        array_name = sub.split(' ')
+        name = array_name[array_name.size-1]
+        if subs.include?name
+          result.push(name)
+        end
+      end
+      result
+    end
+
     def get_submodule_commit
       sub_tree = 'git ls-tree HEAD | grep "160000"'
       sub_commits = `#{sub_tree}`
@@ -92,46 +139,13 @@ module GGSM
       puts "请联系#{author} 推送远程缺失的commit".red
     end
 
-    def switch_dir
+    def correct_dir
       if File.exist?('.git')
         return
       end
 
       Dir.chdir '..'
-      switch_dir
-    end
-
-    def check_hooks
-      version = `ggsm v`
-      subs = get_submodule
-      subs.each do |sub|
-        cp_hooks(version, sub)
-      end
-      cp_hooks(version, nil)
-    end
-
-    def cp_hooks(version, sub)
-      if File.exist?('.git')
-        if sub != nil
-          config_path = ".git/modules/#{sub}/hooks/ggsm"
-        else
-          config_path = '.git/hooks/ggsm'
-        end
-        target_path = config_path.split('/ggsm')[0]
-        if !File.exist?(config_path) || version != IO.read(config_path)
-          path = `gem which ggsm`.split('/ggsm.rb')[0]
-          `cp #{path}/ggsm/hook/commit-msg #{target_path}/commit-msg`
-          `cp #{path}/ggsm/hook/pre-commit  #{target_path}/pre-commit`
-
-          file = File.new(config_path, 'w')
-          file << version
-          file.close
-
-          if sub == nil
-            puts '已更新Hooks'.blue
-          end
-        end
-      end
+      correct_dir
     end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,15 +85,16 @@ files:
 - bin/ggsm
 - ggsm.gemspec
 - lib/ggsm.rb
-- lib/ggsm/flow/delete.rb
-- lib/ggsm/flow/finish.rb
-- lib/ggsm/flow/foreach.rb
-- lib/ggsm/flow/merge.rb
-- lib/ggsm/flow/start.rb
-- lib/ggsm/flow/switch.rb
-- lib/ggsm/flow/sync.rb
+- lib/ggsm/command/delete.rb
+- lib/ggsm/command/finish.rb
+- lib/ggsm/command/foreach.rb
+- lib/ggsm/command/merge.rb
+- lib/ggsm/command/start.rb
+- lib/ggsm/command/switch.rb
+- lib/ggsm/command/sync.rb
 - lib/ggsm/hook/commit-msg
 - lib/ggsm/hook/pre-commit
+- lib/ggsm/util/hooks.rb
 - lib/ggsm/util/stash.rb
 - lib/ggsm/util/submodule.rb
 - lib/ggsm/version.rb