ggsm 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4858389fb5c20a3b246395fe6e5c18246cc46a
-  data.tar.gz: 2b203824bf4e802240216383f27da655ce3ee4f0
+  metadata.gz: d386e708f7018def7b458edf3e3f8e84833d5e50
+  data.tar.gz: c33fb18cb77719cec6b1e3bc436ca422758a798e
 SHA512:
-  metadata.gz: 744718845e73d92210fe384d7e62849c575fd3f408c3a659e983e054b7e587588f852ebf51b69dbd6c59d219c9e0781c818ac92d55434e3026eb7baa23376611
-  data.tar.gz: 1da3aec6b3dd0ff132746d7a06083a023f2aec752df821d7365710c7793e4051b70e629206d812448a5fc2775967ac0f00c9555c9e74dd43d5ddaf88c8b24449
+  metadata.gz: fe40bf703d42359e094aaeed1f6b86de37899cfb4cde86fd9909150bc2a4480f5f73bd56038ae54ce7dfebf0239769576849ca59e2fec3aa1f29657fe3191721
+  data.tar.gz: 9b5b30eca73b56baf9efe752abc755b9aa59d03d207fdb2e847a2784c971d0078667fef0165f24e7bd851352e44927102c64e41c589709d5131bd8818ffb3245

data/lib/ggsm/command/mr.rb

@@ -56,7 +56,7 @@ module GGSM
       unless check_token
         system "vim #{path}"
 
-        result = IO.read(path).split('# 请输入GitLab private-token')
+        result = IO.read(path).split('# 请输入正确的GitLab private-token')
 
         if result.length > 1
           token = result[0]
@@ -64,7 +64,7 @@ module GGSM
       end
 
       if token == ''
-        token = IO.read(path).split('# 请输入GitLab private-token')[0]
+        token = IO.read(path).split('# 请输入正确的GitLab private-token')[0]
       end
 
       if token == ''
@@ -76,7 +76,10 @@ module GGSM
     end
 
     def create_mr(sub)
-      if get_head_commit("origin/#{@@current_branch}") != get_head_commit("origin/#{@@target_branch}")
+      current_branch_head_commit = get_head_commit("origin/#{@@current_branch}").chomp
+
+      if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
+          current_branch_head_commit != get_head_commit("origin/#{@@target_branch}")
         # origin	git@git.souche.com:Destiny_Android/Destiny_Android.git (push)
         # origin	http://git.souche.com/Destiny_Android/Mine.git (push)
         result = `git remote -v | grep push`
@@ -93,29 +96,31 @@ module GGSM
             params['source_branch'] = @@current_branch
             params['target_branch'] = @@target_branch
             params['title'] = @@msg
+            params['remove_source_branch'] = true
             uri = URI.parse("http://git.souche.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
             response = Net::HTTP.post_form(uri, params)
             result = Oj.load(response.body)
 
-            if result['message'] == '404 Project Not Found'
-              Dir.chdir @@pwd
-              `rm -rf .git/ggsm/TOKEN`
-              @@token = init_check_token
-              create_mr(sub)
-              return
-            end
-
-            if Net::HTTPSuccess
-              mr_url = result['web_url']
-
-              if @@user == ''
-                @@user = result['author']['username']
-              end
-
-              if mr_url != nil
-                @@urls[sub] = mr_url
-                puts mr_url.blue
-              end
+            case response
+              when Net::HTTPSuccess then
+                mr_url = result['web_url']
+
+                if @@user == ''
+                  @@user = result['author']['username']
+                end
+
+                if mr_url != nil
+                  @@urls[sub] = mr_url
+                  puts mr_url.blue
+                end
+              when Net::HTTPConflict then
+                puts 'Merge Request已存在！'
+              when Net::HTTPNotFound, Net::HTTPUnauthorized
+                Dir.chdir @@pwd
+                `rm -rf .git/ggsm/TOKEN`
+                @@token = init_check_token
+                create_mr(sub)
+                return
             end
           rescue => e
             puts "error: #{e}".red

data/lib/ggsm/mr/token.rb

@@ -10,7 +10,7 @@ module GGSM
 
       if !File.exist?(config_path) || '' == IO.read(config_path).strip || IO.readlines(config_path)[0].strip == ''
         file = File.new(config_path, 'w')
-        file << "\n# 请输入GitLab private-token"
+        file << "\n# 请输入正确的GitLab private-token"
         file.close
         return false
       end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler