furion 1.0.8.1 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de60f21eaebb24d12a94110b907696c0b7dbc9bb308deb5fadabad1ff02d5b69
-  data.tar.gz: 699bb862f947c0c92e4a76cec7b5a8eaa25ff041449b90c50219365091fed69f
+  metadata.gz: 88af458021bc7618aeda209a06c96fefe324857cc36284d40aaf6ffe9e1a0a4f
+  data.tar.gz: 92100ff9ec52165dae9a1933d113e35b3fc483c6b716f253a1b8e13b6e71d633
 SHA512:
-  metadata.gz: d8ef667dcb984fddb8570c61c3bb524bd6f9fb6ee6d5c303e4018b8a556b33bb789a278117fddf74f5630001af5af3ef239e8d3e67f0abfe3b7b8d3ee690936a
-  data.tar.gz: 94aa38483bb12907c0e6bd0a8a4af8a91b9ad52c8306239cddb704087a9688f9612f8b2b1f7bff5e9e5c7bc924c905c27fe7aed3166f22ce3026270a5de6e34b
+  metadata.gz: 866e8db42a8585fdb0e3b9176fa9a974663033fce27d3fbfa213551b044713a9c757286022e367edffa3b24257c7b9b152bd3df01212e7f8a6ceb5c535413c76
+  data.tar.gz: fba8475942b5e2b374635a68c8df43bcb287f062b6e4920869fb52261eb73ced1b2e7b0a0d5463cfa4b4dd52e1e77f1b970fbd3198942fa53c0778a9d195e2fe

data/bin/furion

@@ -11,12 +11,12 @@ OptionParser.new do |opts|
     puts "Options and arguments:
 -v      : print the version number
 -h      : print the help message
-init   : run wrapper-pick work flow in existed project
-create [name]: create an empty project and init wrapper
+init    : run wrapper-pick work flow in existed project
+update  : update the config of sdk-wrapper
 "
   end
   opts.on("-v", "--version", "Prints version") do |dh|
-    puts "1.0.8.1"
+    puts "1.0.9"
   end
 
 
@@ -25,3 +25,11 @@ end.parse!
 if ARGV[0] == "init"
   Furion.makeConfig
 end
+
+if ARGV[0] == "confdet"
+  Furion.detectConflict
+end
+
+if ARGV[0] == "update"
+  Furion.updateConfig
+end

data/lib/furion.rb

@@ -4,10 +4,12 @@ require 'json'
 require 'plist'
 require 'open-uri'
 require 'furion/file_editor'
+require 'furion/ver_conflict_detector'
 class Furion
 
     def self.fetchFile(fileName)
-        uri = "https://git.huya.com/chenguohao2/FurionTemplateResource/raw/master/"+fileName
+        uri = "https://git.huya.com/chenguohao2/FurionTemplateResource/raw/master/iOS/"+fileName
+        puts "download from "+uri
         data = open(uri){|f| f.read}
         file = File.new fileName, 'w+'
         file.binmode
@@ -22,18 +24,55 @@ class Furion
         self.fetchFile("example.code")
         result = `python GenConfig.py `
         File.write('data.json', result)
-        puts "finish writting"
-        FileEditor.editPodfile
         `plutil -convert xml1 data.json -o MTPSDK.plist`
+        if !(File.exist?'MTPSDK.plist')
+          puts "error in Config Generation: "+result
+        end
+
+        FileEditor.editPodfile
+
         File.delete('GenConfig.py')
         File.delete('data.json')
         FileEditor.insertExampleCode
         File.delete('example.code')
+        puts "pod installing..."
         `pod install`
         projName = FileEditor.getCuriOSProjName
         puts "Config finished, run "+projName+".xcworkspace to continue "
     end
 
+    def self.updateConfig
+
+          if !(File.exist?'MTPSDK.plist')
+            puts "MTPSDK.plist not exist "
+            return
+          end
+
+          self.fetchFile("GenConfig.py")
+          sdkWrapperDict = Plist::parse_xml("MTPSDK.plist")
+          jsonObj = sdkWrapperDict.to_json
+          fJson = File.open("cachedConfig.json","w")
+          fJson.write(jsonObj)
+          fJson.close
+          result = `python GenConfig.py update`
+          File.write('data.json', result)
+          `plutil -convert xml1 data.json -o MTPSDK.plist`
+          if !(File.exist?'MTPSDK.plist')
+            puts "error in Config Generation: "+result
+          end
+          puts "pod installing..."
+          `pod install`
+          File.delete('GenConfig.py')
+          File.delete('data.json')
+          File.delete("cachedConfig.json")
+          projName = FileEditor.getCuriOSProjName
+          puts "Config finished, run "+projName+".xcworkspace to continue "
+    end
+
+    def self.detectConflict
+        ConflictDetector.detectConflict
+    end
+
      def self.runCMD
            cmd = ARGV[0]
            if cmd == "init"
@@ -45,6 +84,3 @@ class Furion
            end
      end
 end
-
-
-

data/lib/furion/file_editor.rb

@@ -20,7 +20,7 @@ class FileEditor
 
     projName = self.getCuriOSProjName
 
-    if projName.length == 0
+    if projName == nil
       return
     end
 
@@ -72,9 +72,9 @@ class FileEditor
   def self.insertExampleCode
 
     dict = Plist::parse_xml("MTPSDK.plist")
-    wrapperSDKDict = dict["sdkWrapper"]
+    #wrapperSDKDict = dict["sdkWrapper"]
     params = dict["commonParams"]
-    keys = wrapperSDKDict.keys()
+    keys = []#wrapperSDKDict.keys()
     keys.insert(0,"commonCode")
     keys.append("finnalInit")
     targetFilePath = ""

data/lib/furion/ver_conflict_detector.rb

@@ -0,0 +1,259 @@
+require 'cocoapods'
+require 'etc'
+class ConflictDetector
+  def self.detectConflict
+    @openingSpec = []
+    @specRequire = {}
+    # dict = Plist::parse_xml("MTPSDK.plist")
+    file = File.read('sdkConfig.json')
+    dict = JSON.parse(file)
+    # "sdk":{"hypushsdk": {"wrapperVersion": "0.1.13-dev", "sdkVersion": "*", "wrapper": "pushsdk-wrapper"}
+    sdkDict = {}
+    sdkWrapperDict = dict["sdk"]
+    for sdk in sdkWrapperDict.keys
+      sdkInfo = sdkWrapperDict[sdk]
+      sdkDict[sdk] = sdkInfo["sdkVersion"]
+      if sdkInfo.key?"wrapper"
+        sdkDict[sdkInfo["wrapper"]] =  sdkInfo["wrapperVersion"]
+      end
+    end
+
+
+
+    for sdk in sdkDict.keys
+      version = sdkDict[sdk]
+      self.loadSpec(sdk,version)
+    end
+
+
+    dependency = {}
+    conflictInfo = {}
+    for sdk in @specRequire.keys
+      requireinfo = @specRequire[sdk]
+      sdkConflict =  self.compareRequire(sdk,requireinfo.values)
+      dependency[sdk] = {"conflict"=>sdkConflict,"requirement"=>requireinfo}
+    end
+
+    json = dependency.to_json
+    File.open("verionDependency.json", "w") do |out|
+          out.write(json)
+    end
+  end
+
+  def self.loadSpec(specName,version)
+
+    if @openingSpec.include?(specName)
+      return
+    end
+
+    user = Etc.getpwuid(Process.uid).name
+    sourcePath = "/Users/" + user + "/.cocoapods/repos/huya-ci_team-specs"
+    path = self.getSpecFromSDK(sourcePath,specName,version)
+
+    if path.length == 0
+      # SDK的文件夹没找到，就从wrapper文件夹开始找
+      sourcePath = "/Users/" + user + "/.cocoapods/repos/Wrapper-Specs"
+      path = self.getSpecFromSDK(sourcePath,specName,version)
+    end
+
+    if path.length == 0
+      # 如果在wrapper也没找到就说明找不到
+      puts "[FurionError]:spec load Error in "+path
+      return
+    end
+
+
+    @openingSpec.append(specName)
+    ret = Pod::Specification.from_file(path, subspec_name = specName)
+    if ret.dependencies.length == 0
+      return
+    end
+
+
+    for item in  ret.dependencies
+      requireStr = String(item.requirement)
+      self.recordDependancy(item.name,requireStr,specName)
+      if self.isVersionSpecific(requireStr) == 0
+        content = self.wrapSpecificVersion(requireStr)
+        self.readSpecFromRepo(item.name,content)
+      end
+    end
+  end
+
+  def self.recordDependancy(sdk,requirement,subscriber)
+    requireInfo = @specRequire[sdk]
+    if requireInfo == nil
+      requireInfo = {}
+    end
+    requireInfo[subscriber] = requirement
+    @specRequire[sdk] = requireInfo
+
+  end
+
+  def self.isVersionSpecific(versionRequire)
+    symbols = ['~>','>=','<=','>','<']
+    for symbol in symbols
+      if versionRequire.include?(symbol)
+        return 1
+      end
+    end
+    return 0
+  end
+
+  def self.wrapSpecificVersion(versionStr)
+    content = String(versionStr)
+    content = content.sub(" ","")
+    content = content.sub("=","")
+    return content
+  end
+
+  def self.readSpecFromRepo(specName,version)
+
+
+
+    self.loadSpec(specName,version)
+  end
+
+
+  def self.getSpecFromSDK(groupPath,sdkName,version)
+
+    if version == "*"
+      allPath = groupPath + "/" + sdkName + "/" + version
+      subPathArray = Dir[allPath]
+      wrapperPath = subPathArray.last
+    else
+      wrapperPath = groupPath + "/" + sdkName + "/" + version
+      if !File.exist?(wrapperPath)
+        return ""
+      end
+    end
+
+
+
+    Find.find(wrapperPath) do |path|
+      if path.end_with? ".podspec"
+        return path
+        break
+      end
+    end
+    return ""
+  end
+
+  def self.compareRequire(sdk,requireArray)
+    # model a < x < b
+    smallVersion = "0"
+    min = smallVersion
+    containMin = 0 # 用于区分 < 和 <=
+    hugeVersion = "9999999.999999.999999"
+    max =  hugeVersion
+    containMax = 0
+
+    depency = nil
+    isConflict = 0
+    for require in requireArray
+
+      depency = Pod::Dependency.new(sdk,require)
+      operator = depency.requirement.requirements.first[0]
+      version = depency.requirement.requirements.first[1]
+      if String(operator) == '>=' || String(operator) == '~>'
+        if self.isVersionBigger(version,min) == 1
+          min = version
+          containMin = 1
+        end
+      end
+
+      if  String(operator) == '>'
+        if self.isVersionBigger(version,min) == 1
+          min = version
+          containMin = 0
+        end
+      end
+
+      if String(operator) == '<='
+        if self.isVersionBigger(version,max) == 1
+          max = version
+          containMax = 1
+        end
+      end
+
+      if String(operator) == '<'
+        if self.isVersionBigger(max,version) == 1
+          max = version
+          containMax = 0
+        end
+      end
+
+      if isVersionBigger(min,max) == 1
+        # 下限大于上限
+        isConflict = 1
+      else
+        if min == max
+          if containMax == 0 || containMin == 0
+            isConflict = 1
+          end
+        end
+      end
+
+      if String(operator) == '='
+        if isVersionBigger(version,max) == 1 || isVersionBigger(min,version) ==1
+          # 固定版本在已有范围之外
+          isConflict = 1
+        else
+          min = version
+          max = version
+          containMax = 1
+          containMin = 1
+        end
+      end
+    end
+    result = {"isConflict"=>isConflict}
+    if max != hugeVersion
+      maxOperater = containMax == 1 ? "<=" : "<"
+      maxRequire  = maxOperater+ " " + String(max)
+      result["maxRequire"] = maxRequire
+    end
+
+
+    if min != smallVersion
+      minOperater = containMin == 1 ? ">=" : ">"
+      minRequire  = minOperater+ " " + String(min)
+      result["minRequire"] = minRequire
+    end
+
+    return result
+  end
+
+  def self.isVersionBigger(version,otherVersion)
+    varNumArray1 = String(version).split("-")
+    verNum1 = varNumArray1[0]
+    if varNumArray1.length() > 1
+      verExt1 = varNumArray1[1]
+    else
+      verExt1 = "*"
+    end
+
+    varNumArray2 = String(otherVersion).split("-")
+    verNum2 = varNumArray1[0]
+    if varNumArray2.length() > 1
+      verExt2 = varNumArray2[1]
+    else
+      verExt2 = "*"
+    end
+
+
+    if Gem::Version.new(verNum1) > Gem::Version.new(otherVersion)
+      return 1
+    else
+      if  Gem::Version.new(verNum1) == Gem::Version.new(otherVersion)
+        if verExt1 == '*' && verExt2 != '*'
+          return 1
+        end
+      end
+    end
+    return 0
+  end
+
+  def self.getLastVersionFromDir(dirPath)
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: furion
 version: !ruby/object:Gem::Version
-  version: 1.0.8.1
+  version: 1.0.9
 platform: ruby
 authors:
 - MTP Huya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies: []
 description: MTP Huya is the best!!!
 email: mtphuya@yandex.com
@@ -20,6 +20,7 @@ files:
 - bin/furion
 - lib/furion.rb
 - lib/furion/file_editor.rb
+- lib/furion/ver_conflict_detector.rb
 homepage: https://rubygems.org/gems/furion
 licenses:
 - MIT