ggsm 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6047a2466f671d94d9ed1632af90fc1362c24a98
-  data.tar.gz: e171938265ea8db94e4b051e7ece45d1a9dec9e1
+  metadata.gz: a1815f21d14345d4fb9eaee303c6d9db195b5741
+  data.tar.gz: 89df586f2ed17db5c1d1bb8e07cff935d8d321da
 SHA512:
-  metadata.gz: c2d39d480055c9ffcbc9ff9dc604ec7b6e635fc709b4c696a0a06e79fa1334729edff7a5d2f8bfe1fef1e1a47a9c2fa54e65391921c709aacded640453e0de91
-  data.tar.gz: be44fcddb27f8b8691f563124fc3dc3187db7993cabaa90479916ac53ec516f0b579e715fb4f997394ae813edf94a1e51ceb94cb9a91c7902ea3a7b6beb28949
+  metadata.gz: 59e2f95a29e0d224f9864d8284a4550db3195c1ca200c77c42d6cc273acddbfd631ab88e8f739b4d56c61af8343ab8018d911d8b00ec299a646a32d9ddea2f12
+  data.tar.gz: 472f1d7bfbf0959cacf90b3e9559a56a0705b5e6f9cde4c0ebd9c0a8a540ee5b1dc2b39aaaffc4514c7b3a61c1ee5bac9590a75ebf72c994b4f362c8debab79f

data/bin/ggsm

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require_relative '../lib/ggsm'
+require_relative '../lib/ggsm/version'
 
 begin
   GGSM::Cli.start ARGV

data/lib/ggsm/flow/merge.rb

@@ -16,7 +16,7 @@ module GGSM
       }
 
       puts '==> 进入主工程：'.yellow
-      process_merge(arry_conflict, '主工程', branch)
+      process_rebase(arry_conflict, branch)
       puts "Modules执行：git merge #{branch}".blue
 
       if arry_conflict.size > 0
@@ -36,5 +36,14 @@ module GGSM
         arry_conflict.push(module_name)
       end
     end
+
+    def process_rebase(arry_conflict, branch)
+      result_merge = `git rebase #{branch}`
+      puts result_merge
+
+      if result_merge.include? 'Merge conflict'
+        arry_conflict.push('主工程')
+      end
+    end
   end
 end

data/lib/ggsm/hook/commit-msg

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby
+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.each do |standard|
+    check(standard)
+  end
+  puts '==> commit message不符合规范！'.red
+  exit 1
+end
+
+def check(keyword)
+  if @msg.start_with? keyword
+    exit 0
+  end
+end
+
+commit_check

data/lib/ggsm/hook/pre-commit

@@ -0,0 +1,53 @@
+#!/usr/bin/ruby
+require 'colorize'
+
+def switch_dir
+  if File.directory?('.git')
+    return
+  end
+
+  Dir.chdir '..'
+  switch_dir
+end
+
+begin
+  stage = `git diff --cached --name-only`.strip
+  if stage == ''
+    exit 0
+  end
+
+  @pass = true
+
+  files = stage.split("\n")
+
+  count = 0
+
+  files.each do |file|
+    if File.extname(file) == '.java'
+
+      current_path = Dir.pwd
+      switch_dir
+
+      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", '')
+
+      if result.include?('WARN') || result.include?('ERROR')
+        count = count + 1
+        puts "#{count}、 #{result}\n".red
+        @pass = false
+      elsif result.strip != ''
+        puts result
+      end
+
+      Dir.chdir current_path
+    end
+  end
+
+  unless @pass
+    exit 1
+  end
+rescue => e
+  puts "error: #{e}".red
+  exit 1
+end

data/lib/ggsm/util/submodule.rb

@@ -6,6 +6,9 @@ module GGSM
         puts '所在目录工程下不存在Submodule，请检查所在目录！'.red
         exit 1
       end
+
+      switch_dir
+      check_hooks
     end
 
     def get_submodule
@@ -88,5 +91,47 @@ module GGSM
       author = `git show #{latest_commit}|grep "Author:"`.chomp
       puts "请联系#{author} 推送远程缺失的commit".red
     end
+
+    def switch_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
+    end
   end
 end

data/lib/ggsm/version.rb

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

data/lib/ggsm.rb

@@ -47,8 +47,8 @@ module GGSM
       foreach_flow(*commands)
     end
 
-    desc 'merge [<branch>]', 'Merge，开发完成后执行'
-    def merge(branch='origin/dev')
+    desc 'merge <branch>', 'Merge，开发完成后执行'
+    def merge(branch)
       merge_flow(branch)
     end
 
@@ -56,5 +56,10 @@ module GGSM
     def finish
       finish_flow
     end
+
+    desc '[v|version]', '查看版本'
+    def version
+      puts VERSION
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,8 @@ files:
 - lib/ggsm/flow/start.rb
 - lib/ggsm/flow/switch.rb
 - lib/ggsm/flow/sync.rb
+- lib/ggsm/hook/commit-msg
+- lib/ggsm/hook/pre-commit
 - lib/ggsm/util/stash.rb
 - lib/ggsm/util/submodule.rb
 - lib/ggsm/version.rb