XZMRBin 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b675706f4f7dd63cbcbb7f81c822064b292ede4f53ebdabf362ed9065632c558
-  data.tar.gz: 3f3b79ddd97bbca8a1d09d94e24115665a05e0853383673e3a1882320ff2068f
+  metadata.gz: ac3bd4cbc3a61f5751ed19c81d9437aa004c66799c3a8483a0407768d79b74e9
+  data.tar.gz: 3c696cd7c47d25a05392ae73f465abae72cdc38b623cec6fdc244742d8711b2c
 SHA512:
-  metadata.gz: 8762f7259b4a1eaeba5bc3ee1d464bacc122cb4030436106c72294b61a5bb15b246bc7618f078d04a93b9aaaf59a5349e8e94d7612e8ad2f95198cf8552b8587
-  data.tar.gz: 8747e5736e17ad5fd56af239085d9c0e57f21af275dd662f7004474b0527bc8b2b72c18e743e17df5e351bc91f75a5fb531fc63cbd9ff90020b08a958769abee
+  metadata.gz: c5c6e0a262ec4d3786f363abfd43fe56ca257054789ebb681e93c650bc202c8f46a7d58db486ccb354bf653025d82a981d979190c2e808ff24f06f9b9b4da056
+  data.tar.gz: d1f11fdca14a890c37075546f322b85f74a2150383fd5caf9287d48807295e10ebd3efc3938759af2242490ce3c1b2bcedba7e6194e53e7ee54c76b41c260981

data/lib/filename.crt

@@ -0,0 +1,25 @@
+Bag Attributes
+    friendlyName: imgsec.xiaozhustatic1.com
+    localKeyID: 9E 6C 12 26 46 73 85 F7 15 BC 1C F9 D9 F1 01 42 E1 AD 56 EA 
+subject=/C=cn/ST=Beijing/O=xiaozhu.com/OU=develop/CN=imgsec.xiaozhustatic1.com
+issuer=/C=cn/ST=Beijing/L=Beijing/O=xiaozhu.com/OU=develop/CN=imgsec.xiaozhustatic1.com
+-----BEGIN CERTIFICATE-----
+MIIDVzCCAsCgAwIBAgIBKTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJjbjEQ
+MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEUMBIGA1UEChMLeGlh
+b3podS5jb20xEDAOBgNVBAsTB2RldmVsb3AxIjAgBgNVBAMTGWltZ3NlYy54aWFv
+emh1c3RhdGljMS5jb20wHhcNMTUwMTEwMTIyODQzWhcNMjUwMTA3MTIyODQzWjBr
+MQswCQYDVQQGEwJjbjEQMA4GA1UECBMHQmVpamluZzEUMBIGA1UEChMLeGlhb3po
+dS5jb20xEDAOBgNVBAsTB2RldmVsb3AxIjAgBgNVBAMTGWltZ3NlYy54aWFvemh1
+c3RhdGljMS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVL9qeLh4Yu
+7VTf/i+iY0GRsUz/vKObZUI7+NgQ/zrbdXpYVBnnia5f2JJRRrcnFG/f1F9flgOd
+MVyHQu+Y2ty1DiOTQ0ufdaAEtKZeGoDcbgHFsfTFY+JfiUtO5UpuwMglz5OdIwRs
+p6vUjDaBhW34o3jlk6/3a6VmbQZ8E5V/AgMBAAGjgfgwgfUwCQYDVR0TBAIwADAs
+BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+VR0OBBYEFJ5sEiZGc4X3Fbwc+dnxAULhrVbqMIGaBgNVHSMEgZIwgY+hgYGkfzB9
+MQswCQYDVQQGEwJjbjEQMA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamlu
+ZzEUMBIGA1UEChMLeGlhb3podS5jb20xEDAOBgNVBAsTB2RldmVsb3AxIjAgBgNV
+BAMTGWltZ3NlYy54aWFvemh1c3RhdGljMS5jb22CCQC2kTPc10/8jzANBgkqhkiG
+9w0BAQUFAAOBgQAGymZrVnFpcetadS8NpsfCmX0Cn6Tee5bPvZpEdpnpHqmEs5Ep
+folTLuh+ssaB+F9sOVMI8hqVV2oG+ulwqmuDcJoyY9i17Apc6/ak6aZPUyekft6f
+zV8WevZO1u3BmPViMiV0ws3TUIMXAcj0xIhp3RiFnFqT5lv8jrrjZvvscA==
+-----END CERTIFICATE-----

data/lib/mrbin/command.rb

@@ -51,4 +51,7 @@ module XZGit
         end
     end
     require 'mrbin/xzcommand/xzmr'
+    require 'mrbin/xzcommand/xzintegratecommit'
+    require 'mrbin/xzcommand/xzdevgit'
+    require 'mrbin/xzcommand/xzupversion'
 end

data/lib/mrbin/gemversion.rb

@@ -1,3 +1,3 @@
 module XZGit
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'.freeze
 end

data/lib/mrbin/xzcommand/xzdevgit.rb

@@ -0,0 +1,68 @@
+require 'set'
+require 'find'
+module XZGit
+    class XZDevGit < XZGit::Command
+        self.summary = 'DevPods git command'
+
+        def self.options 
+            [
+                ['--exclude','exclude pod name']
+            ].concat(super)
+        end
+
+        def initialize(argv)
+            @exclude = argv.option('exclude','').split(',')
+            @gitcommands = argv.arguments
+            super
+        end
+
+        def validate!
+            root_path = Dir.pwd()
+            dev_path = "#{root_path}/DevPods"
+            if File.directory?(dev_path) && !Dir.empty?(dev_path)
+                puts "devpods path --> #{dev_path}"
+            else
+                puts "DevPods does not exist or DevPods is empty"
+                exit(1) 
+            end
+        end
+
+        def run
+            pods = excutepods()
+            excutecommand(pods)
+        end
+
+        private
+        def excutepods
+            root_path = Dir.pwd()
+		    dev_path = "#{root_path}/DevPods"
+		    pods = Set.new
+            Find.find(dev_path) do |file|
+                filename = File.basename(file)
+                if filename.end_with?('.podspec')
+                    filepath = File.dirname(file)
+                    pods << filepath
+                    podname = filename.split('.')[0]
+                    if @exclude.include?(podname)
+                        pods.delete(filepath)
+                    end
+                end
+            end
+		    pods
+        end
+
+        def excutecommand(paths)
+            if @gitcommands.count > 0 && paths.count > 0
+                paths.each do |path|
+                    commandarr = []
+				    commandarr << 'git'
+				    commandarr << '-C'
+                    commandarr << path
+                    commandarr << @gitcommands
+                    commandstr = commandarr.join(' ')
+                    system(commandstr)
+                end
+            end
+        end
+    end
+end

data/lib/mrbin/xzcommand/xzintegratecommit.rb

@@ -0,0 +1,40 @@
+
+module XZGit
+    class XZInteCommit < XZGit::Command
+        self.summary = 'read all commit pods from podfile'
+
+        def self.options 
+            [
+                ['--std','target branch name'],
+            ].concat(super)
+        end
+
+        def initialize(argv)
+            @std = argv.flag?('std',false)
+            super
+        end
+
+        def validate!
+            super
+            pwdpath = Dir.pwd.strip
+            podfilepath = "#{pwdpath}/Podfile"
+            if !File.exist?(podfilepath)
+                puts "can not found Podfile, please inspect your project path"
+                exit(1)
+            end
+        end
+
+        def run
+            pwdpath = Dir.pwd.strip
+            podfilepath = "#{pwdpath}/Podfile"
+            if @std
+                res = `cat #{podfilepath} | grep commit | grep -v MJRefresh | grep -v XZMonitor`
+                puts res
+            else
+                `cat #{podfilepath} | grep commit | grep -v MJRefresh | grep -v XZMonitor > commit.txt`
+            end
+            
+        end
+
+    end
+end

data/lib/mrbin/xzcommand/xzmr.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'json'
 module XZGit
     class XZMr < XZGit::Command
-        self.summary = 'inspect mr if no conflicts create mr to target branch, otherwise output conflicts'
+        self.summary = 'create merge request'
             
         def self.options 
             [

data/lib/mrbin/xzcommand/xzupversion.rb

@@ -0,0 +1,126 @@
+require 'uri'
+require 'digest'
+require 'net/http'
+require 'find'
+require 'json'
+module XZGit
+    class XZUpVersion < XZGit::Command
+        self.summary = 'update xzteanant version && update global api'
+        def self.options 
+            [
+                ['--version','new version']
+            ].concat(super)
+        end
+        def initialize(argv)
+            @version = argv.option('version','')
+            super
+        end
+
+        def validate!
+            super
+            if @version.empty?
+                puts "--version is required"
+                exit(1)
+            end
+            root_path = Dir.pwd()
+            dev_path = "#{root_path}/Podfile"
+            if !File.exist?(dev_path)
+                puts "not found podfile,must excute in podfile directory"
+                exit(1)
+            end
+        end
+
+        def run
+            update_app_version(@version)
+            updateserver(@version)
+        end
+
+        private
+
+        def update_app_version(version)
+            Find.find(Dir.pwd()) do |file|
+                filename = File.basename(file)
+                if !file.include?('DevPods')
+                    if filename == 'XZAppDelegate.m'
+                        content = File.read(file)
+                        content = content.gsub(/setGlobalAPIVersion\(@"(.)+?"\);/,"setGlobalAPIVersion(@\"#{version}\");")
+                        File.open(file,'w') do |wf|
+                            wf.write(content)
+                        end
+                    elsif filename == 'XZTenant-Info.plist'
+                        `plutil -replace CFBundleShortVersionString -string #{version} #{file}`
+                    elsif filename == 'Info.plist' && file.include?('SiriShortcuts')
+                        `plutil -replace CFBundleShortVersionString -string #{version} #{file}`
+                    end
+                end
+                 
+            end
+        end
+
+        def updateserver(version)
+            timestamp = Time.now.to_i
+            urlpath = "https://securewireless.xiaozhu.com/app/xzfk/ios/#{version}/global/preInformation?"
+            idfap = "uniqueId=8D6CCD72-D9C3-4949-A719-959F8EDFA396&"
+            bundletype = "bundleType=xiaozhu&"
+            timestap = "_={#{timestamp}}&"
+            typestr = "type=serverSideContents"
+            url = urlpath+idfap+bundletype+timestap+typestr
+            uri = parseurl(url)
+            startrequest(uri)
+        end
+
+        def parseurl(urlstr)
+            uri = URI(urlstr)
+            querystr = uri.query
+            queryarr = querystr.split('&')
+            parameters = Hash.new
+            queryarr.each do |para|
+                paraarr = para.split('=')
+                parameters[paraarr[0]] = paraarr[1]
+            end
+            allkeys = parameters.keys.sort()
+            kw = uri.path
+            allkeys.each do |key|
+                kw = kw + '|' + key
+                kw = kw + '|' + parameters[key]
+            end
+            kw += '|2016v001'
+            kcount = URI.encode_www_form_component(kw).length
+            kcount = kcount % 5 + 2
+            sign = kw
+            while kcount > 0
+                sign = Digest::MD5.hexdigest(sign)
+                kcount -= 1
+            end
+            parameters['xzsign'] = 'md5_' + sign
+            new_query = URI.encode_www_form(parameters)
+            uri.query = new_query
+            uri
+        end
+
+        def startrequest(uri)
+            https = Net::HTTP.new(uri.host, Net::HTTP.https_default_port)
+            https.use_ssl = true
+            https.ssl_timeout = 2
+            https.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            libpath = File.expand_path('../../../../lib',__FILE__)
+            https.cert = OpenSSL::X509::Certificate.new(File.read("#{libpath}/filename.crt"))
+            https.key = OpenSSL::PKey::RSA.new(File.read("#{libpath}/newfile.key.pem"))
+            https.start do |http|
+                req = Net::HTTP::Get.new(uri)
+                res = https.request(req)
+                if res.code == '200'
+                    jsres =  JSON.parse(res.body)
+                    if jsres['status'] == 200
+                        File.open('XZServerContents.json','w') do |resf|
+                            JSON.dump(jsres,resf)
+                        end
+                        `plutil -convert xml1 XZServerContents.json -o XZServerContents.plist`
+                        `rm XZServerContents.json`
+                        `mv XZServerContents.plist XZTenant/XZServerContents.plist`
+                    end
+                end
+            end
+        end
+    end
+end

data/lib/newfile.key.pem

@@ -0,0 +1,20 @@
+Bag Attributes
+    friendlyName: 5370DDFC
+    localKeyID: 9E 6C 12 26 46 73 85 F7 15 BC 1C F9 D9 F1 01 42 E1 AD 56 EA 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANVL9qeLh4Yu7VTf
+/i+iY0GRsUz/vKObZUI7+NgQ/zrbdXpYVBnnia5f2JJRRrcnFG/f1F9flgOdMVyH
+Qu+Y2ty1DiOTQ0ufdaAEtKZeGoDcbgHFsfTFY+JfiUtO5UpuwMglz5OdIwRsp6vU
+jDaBhW34o3jlk6/3a6VmbQZ8E5V/AgMBAAECgYAY9aOuZXh9bj5dgTyobFM7GAZs
+YTy81HFb99Kdzhdf1tB/eZiV029cFWEtdg9VXWBZ2xJp+rB+ScW98yIVEYkCtgXq
+Jgxc4DT3NnJmlW6T4Gc7M4QnrmorrKH4IdiOEiNPPEkDMd1sEHN0dBEHSDlDOJqh
+776ntBSQK/n9F3C38QJBAO5tiG0JBsYZBlSkdZpcv9ysBMU2ephW7GxhHYzQVOdt
+zNNPQgSCHzXcUbulX1Gfus5X/AeGo8RuMO/awowgVAkCQQDlBEbDVek7cNlD2r8K
+Z1prX/6USDsIgNLfcMpjfXpt4AEtcJ0TN4Nx5SAYyRYaJeCAUq4XjAO6rO5i8Bj2
+Ic9HAkBJrKj6YE6qifMN1p/MahqTOshilDn/tuRpfPzflUSXGrOvHA+fSwIP55uN
+60Tv+PaFamSjgrQ6L36Jr0RsflTZAkAes84QzemwsFZQRHksGeMDViE5G93eK/cZ
+QXPAlsfdBxThVKGaO+0BTehZqkuuQbmxOmRgf8LYOerTlMCj7rBtAkEAoCwQoGUo
+/HLqV+1uJ+LV2BmxUqoPfxbMTqQWTMLoXVwlDhAGr21Ex0Se3+HkCkfs1t+irIiJ
+DX/3bvS9RjyuQA==
+-----END PRIVATE KEY-----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: XZMRBin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - liushuhua
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,14 +46,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - LICENSE.txt
 - XZMRBin.gemspec
 - bin/xzmr
+- lib/filename.crt
 - lib/mrbin.rb
+- lib/mrbin/.DS_Store
 - lib/mrbin/command.rb
 - lib/mrbin/config.rb
 - lib/mrbin/gemversion.rb
+- lib/mrbin/xzcommand/xzdevgit.rb
+- lib/mrbin/xzcommand/xzintegratecommit.rb
 - lib/mrbin/xzcommand/xzmr.rb
+- lib/mrbin/xzcommand/xzupversion.rb
+- lib/newfile.key.pem
 homepage: https://github.com/EXAMPLE/cocoapods-xzdevelop
 licenses:
 - MIT