ggsm 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71e1029697a1eead63ca6f7ebb9f438081cee594
-  data.tar.gz: 706371f506f149e9536f1b67175e76678af6bd46
+  metadata.gz: 2e3db0d922cbb3319db68a35b1266e9280009de0
+  data.tar.gz: 78282fa39aff4c9962e676bc21770967c2bfd611
 SHA512:
-  metadata.gz: ff228d1a643376b269b30c33d64cda00a4c871765d8747c2ce01b607d5c36aff33b4f95ef7aa6a75c91846d14fcdbaebffe18571752efcce8fde3f140267f9f2
-  data.tar.gz: 2c7c0f0c86c47253e062ed08fc1a29b45874dfb85cd8ce5aa881ce161fe0c4795bc3986ea1c58a46316ac42930f92acb7040adecfe06656c9c01f5098556e926
+  metadata.gz: ff341201951c97639e1ebd5c721f7ea3a303b8c1a63e6d2ebe79d12c4a7740b8daa464446f5213ee4b79a040b321c1d7c216c1aee925f442595e4881befd3dbc
+  data.tar.gz: 3f07193eb11ee94e1b80b091b46f510e40ef315c2b5a143ea641c8a5c033fd271ea29a51235badaacaa5738c7e53d028b1362ea037a4150d9fc0fcec9286bced

data/lib/ggsm/command/mr.rb

@@ -81,40 +81,29 @@ module GGSM
       if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
           get_head_commit("origin/#{@@current_branch}") != 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)
+        # origin	https://git.souche-inc.com/Destiny_Android/Mine.git (push)
         result = `git remote -v | grep push`
-        project_name = result.split('.com/')[1]
-        if project_name == nil || project_name.strip == ''
-          project_name = result.split('.com:')[1]
+        project_path = result.split('.com/')[1]
+        if project_path == nil || project_path.strip == ''
+          project_path = result.split('.com:')[1]
         end
 
-        if project_name != nil
-          project_name = project_name.split('.git')[0].gsub('/', '%2F')
-
+        if project_path != nil
+          project_path = project_path.split('.git')[0]
+          project_name = project_path.split('/')[1]
           begin
-            params = {}
-            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)
+            uri = URI.parse("https://git.souche-inc.com/api/v4/projects?private_token=#{@@token}&search=#{project_name}")
+            response = Net::HTTP.get_response(uri)
 
             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
+                result = Oj.load(response.body)
+                result.each do |object|
+                  if object['path_with_namespace'].strip == project_path.strip
+                    id = object['id']
+                    return request_mr(id, sub)
+                  end
                 end
-              when Net::HTTPConflict then
-                puts 'Merge Request已存在！'
               when Net::HTTPNotFound, Net::HTTPUnauthorized
                 Dir.chdir @@pwd
                 `rm -rf .git/ggsm/TOKEN`
@@ -122,6 +111,7 @@ module GGSM
                 create_mr(sub)
                 return
             end
+
           rescue => e
             puts "error: #{e}".red
             exit 1
@@ -129,5 +119,38 @@ module GGSM
         end
       end
     end
+
+    def request_mr(id, sub)
+      params = {}
+      params['source_branch'] = @@current_branch
+      params['target_branch'] = @@target_branch
+      params['title'] = @@msg
+      # params['remove_source_branch'] = true
+      uri = URI.parse("https://git.souche-inc.com/api/v4/projects/#{id}/merge_requests?private_token=#{@@token}")
+      response = Net::HTTP.post_form(uri, params)
+
+      case response
+        when Net::HTTPSuccess then
+          result = Oj.load(response.body)
+          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
+    end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler