ggsm 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3db0d922cbb3319db68a35b1266e9280009de0
-  data.tar.gz: 78282fa39aff4c9962e676bc21770967c2bfd611
+  metadata.gz: 4cd4084d853bd726f1af235384a2518fac554273
+  data.tar.gz: 3b6d2f5783054e843c99e9e9e91c3eb3d46bbce0
 SHA512:
-  metadata.gz: ff341201951c97639e1ebd5c721f7ea3a303b8c1a63e6d2ebe79d12c4a7740b8daa464446f5213ee4b79a040b321c1d7c216c1aee925f442595e4881befd3dbc
-  data.tar.gz: 3f07193eb11ee94e1b80b091b46f510e40ef315c2b5a143ea641c8a5c033fd271ea29a51235badaacaa5738c7e53d028b1362ea037a4150d9fc0fcec9286bced
+  metadata.gz: 4f6605690a3c7653a1ba4f4c189a10821e53c869322f09a2f48db432caef9b64cd6e12a1b0e46c794962c463a36acfd4805f7ae65a4ce47412d5014264f87f27
+  data.tar.gz: 9bb5c54c7cb0730c59d75ad7e82fa60e34bdf1cc52c596a6e0e252bee72f06b51e22bb032a245aa9df81be82dd91a494aca2316d69658efd08d48eec3699c719

data/lib/ggsm/command/mr.rb

@@ -81,29 +81,40 @@ 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	https://git.souche-inc.com/Destiny_Android/Mine.git (push)
+        # origin	http://git.souche.com/Destiny_Android/Mine.git (push)
         result = `git remote -v | grep push`
-        project_path = result.split('.com/')[1]
-        if project_path == nil || project_path.strip == ''
-          project_path = result.split('.com:')[1]
+        project_name = result.split('.com/')[1]
+        if project_name == nil || project_name.strip == ''
+          project_name = result.split('.com:')[1]
         end
 
-        if project_path != nil
-          project_path = project_path.split('.git')[0]
-          project_name = project_path.split('/')[1]
+        if project_name != nil
+          project_name = project_name.split('.git')[0].gsub('/', '%2F')
+
           begin
-            uri = URI.parse("https://git.souche-inc.com/api/v4/projects?private_token=#{@@token}&search=#{project_name}")
-            response = Net::HTTP.get_response(uri)
+            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)
 
             case response
               when Net::HTTPSuccess then
-                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
+                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`
@@ -111,7 +122,6 @@ module GGSM
                 create_mr(sub)
                 return
             end
-
           rescue => e
             puts "error: #{e}".red
             exit 1
@@ -119,38 +129,5 @@ 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.1'
+  VERSION = '1.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - YoKey