dngg 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a44d21d8641e361b5ffa3b19b5b4198ef7da899f21364f0042e33df241ddfe0
-  data.tar.gz: 6023c6a7996eea055fc8cd3cd90af3db0023b74d04d5b90dbd130f3593eec63e
+  metadata.gz: ed83c69c8ffd9f281d9bda6d8d0a2534f5f543b80052dc9b445c49a99144ce5d
+  data.tar.gz: 2406d79be38a740e8ed633c4c89efab8ba1036d524405cdb8972e9a1136a15db
 SHA512:
-  metadata.gz: b7603c1f0d4a837a8985ee257d2da193b28b7316c19a493d49f22c003e2f8aad4a2ee4a323eb969cb43996f4b52629ae10bdb507f1c76f5f34a33b03a6ce5dec
-  data.tar.gz: fe2b17bccd2ed52dd0cb45a42e6703dde4ed6186243ad88498483cc263228994e717adfde40bbb56d3c4d23d986461cdb90feb75554f6066395f4970f31223ca
+  metadata.gz: cc0258704a57f9703daf63be525ca98f7b8065c4c392cbcd8814972116b5d9542439b829579011c3436da2d273830ad4eda4e236a0eaa686e72450af35301d21
+  data.tar.gz: df102c00a4c7b29081032559a9797f6f03a75d4226af1f71841c082f3c3f9ce9da4ccd61d077864f8a9533bbb4eb5ea8e7a09561bfb068e0e0833e0c4e2616ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dngg (0.0.4)
+    dngg (0.0.5)
       colorize (= 0.8.1)
       oj (= 3.8.0)
       thor (= 1.0.0)

data/lib/dngg.rb

@@ -20,6 +20,10 @@ module DNGG
     include Finish
     include MR
     
+    def self.exit_on_failure?
+      true
+    end
+
     desc 'sync', '当前分支同步(拉取)远程代码'
     def sync
       sync_flow
@@ -73,5 +77,4 @@ module DNGG
       puts VERSION
     end
   end
-  # Cli.start(ARGV)
 end

data/lib/dngg/command/mr.rb

@@ -80,8 +80,8 @@ module DNGG
 
       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	git@gitlab.qima-inc.com:guang-mobile-shop/AiGuangMaxApp.git (push)
+        # origin	https://gitlab.qima-inc.com/guang-mobile-shop/AiGuangMaxApp.git (push)
         result = `git remote -v | grep push`
         project_name = result.split('.com/')[1]
         if project_name == nil || project_name.strip == ''
@@ -90,14 +90,13 @@ module DNGG
 
         if project_name != nil
           project_name = project_name.split('.git')[0].gsub('/', '%2F')
-
           begin
             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/#{project_name}/merge_requests?private_token=#{@@token}")
+            uri = URI.parse("https://gitlab.qima-inc.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
             response = Net::HTTP.post_form(uri, params)
             result = Oj.load(response.body)
 
@@ -121,6 +120,8 @@ module DNGG
                 @@token = init_check_token
                 create_mr(sub)
                 return
+              when Net::HTTPForbidden then
+                puts response.body.red
             end
           rescue => e
             puts "error: #{e}".red

data/lib/dngg/mr/email.rb

@@ -4,18 +4,21 @@ require 'net/smtp'
 module DNGG
   module Email
     def send_email(user,title,msg)
+      user_mail = `git config user.email`
       message = <<END_OF_MESSAGE
-DNGG Merge Request <android.dev@guang.com>
+DNGG Merge Request <team_android@aiguang.com>
+From: #{user}
 To: Guang Android Team
 Subject: [#{user}] #{title}
 
 #{msg}
+
 END_OF_MESSAGE
 
-      Net::SMTP.start('smtp.exmail.qq.com', 25, 'iSnow',
-                      'zhuruixue@aiguang.com', 'wwL9RS9cLeBxv7co') do |smtp|
-        smtp.send_message message,
-                          'android.dev@guang.com'
+      Net::SMTP.start('smtp.exmail.qq.com',25,'zhuruixue',
+        'zhuruixue@aiguang.com','wwL9RS9cLeBxv7co', :plain) do |smtp|
+        smtp.send_message message, 'zhuruixue@aiguang.com',
+                                  'team_android@aiguang.com'
       end
     end
   end

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor