furion 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88af458021bc7618aeda209a06c96fefe324857cc36284d40aaf6ffe9e1a0a4f
-  data.tar.gz: 92100ff9ec52165dae9a1933d113e35b3fc483c6b716f253a1b8e13b6e71d633
+  metadata.gz: 33e050630738005972a285c19d87fae626442832a08048feec1d27406d628f1f
+  data.tar.gz: '068fa164b18a1d937ffb31269c217fec0031c24e9c96fc6a47c25556a7e40ad1'
 SHA512:
-  metadata.gz: 866e8db42a8585fdb0e3b9176fa9a974663033fce27d3fbfa213551b044713a9c757286022e367edffa3b24257c7b9b152bd3df01212e7f8a6ceb5c535413c76
-  data.tar.gz: fba8475942b5e2b374635a68c8df43bcb287f062b6e4920869fb52261eb73ced1b2e7b0a0d5463cfa4b4dd52e1e77f1b970fbd3198942fa53c0778a9d195e2fe
+  metadata.gz: 80f2baf81d9f32d026a3188b275ecbb2c771712c1b6470222aaeeb4a76f91559acb456f866204975d46a5f1d4f903b418665deddb18e2cbe729ca49962a4e159
+  data.tar.gz: 8a0b25c6ed61ee1e34e14ad0f27688de12e5e7ef5d12cf2a3b98f32c287db672d65888d9680109f8d6538ae7ca39921476546a87d38603023ec3f218d880e8a0

data/bin/furion

@@ -13,10 +13,11 @@ OptionParser.new do |opts|
 -h      : print the help message
 init    : run wrapper-pick work flow in existed project
 update  : update the config of sdk-wrapper
+create
 "
   end
   opts.on("-v", "--version", "Prints version") do |dh|
-    puts "1.0.9"
+    puts "1.0.9.1"
   end
 
 
@@ -26,6 +27,26 @@ if ARGV[0] == "init"
   Furion.makeConfig
 end
 
+if ARGV[0] == "create"
+  name = ARGV[1]
+  if name == nil
+    puts "please input project name"
+  else
+    if name.length > 1
+      Furion.genProj(name)
+      puts Dir.pwd
+      Dir.chdir name
+      puts Dir.pwd
+      Furion.makeConfig
+      system("open .")
+    else
+      puts "project name too short "
+    end
+
+  end
+
+end
+
 if ARGV[0] == "confdet"
   Furion.detectConflict
 end

data/lib/furion.rb

@@ -4,7 +4,9 @@ require 'json'
 require 'plist'
 require 'open-uri'
 require 'furion/file_editor'
+require 'zip'
 require 'furion/ver_conflict_detector'
+require 'furion/project_generate'
 class Furion
 
     def self.fetchFile(fileName)
@@ -73,6 +75,16 @@ class Furion
         ConflictDetector.detectConflict
     end
 
+    def self.genProj(name)
+      fileName = "FurionExample.zip"
+      self.fetchFile(fileName)
+      system("unzip", fileName)
+      File.delete(fileName)
+      ProjectGenerater.setupProject("FurionExample",name)
+      FileUtils.rm_rf("FurionExample")
+    end
+    
+
      def self.runCMD
            cmd = ARGV[0]
            if cmd == "init"
@@ -84,3 +96,5 @@ class Furion
            end
      end
 end
+
+

data/lib/furion/project_generate.rb

@@ -0,0 +1,63 @@
+
+$placeHolderStr = "FurionExample"
+$createInfo     = "//  Created by $AUTHOR on $DATE."
+$copyrightInfo  = "//  Copyright © $YEAR $PROJECT. All rights reserved."
+$zipCodeUri = "https://git.huya.com/chenguohao2/FurionTemplateResource/raw/master/iOS/FurionExample.zip"
+class ProjectGenerater
+
+  def self.fetchExampleCode
+
+  end
+
+  def self.setupProject(projPath,newName)
+    Find.find(projPath) do |path|
+      puts "[o]"+path
+      newPath = path.gsub($placeHolderStr,newName)
+      puts "[*]"+newPath
+      if File.file?(path)
+        copyUpdateFile(path,newPath,$placeHolderStr,newName)
+      else
+        Dir.mkdir(newPath)
+      end
+    end
+  end
+
+
+  def self.copyUpdateFile(oldPath,newPath,oldName,newName)
+    File.open(newPath, "w") do |out|
+      File.foreach(oldPath) do |line|
+
+        content = self.updateCopyRight(line,newName)
+        content = self.updateCreatedInfo(content)
+        if content.include?oldName
+          newLine = content.gsub(oldName,newName)
+          out.puts newLine
+        else
+          out.puts content
+        end
+      end
+    end
+  end
+
+  def self.updateCopyRight(content,projName)
+     if content.include? $copyrightInfo
+       current_year = Time.new.year
+       year_content = content.sub("$YEAR",String(current_year))
+       result = year_content.sub("$PROJECT",projName)
+       return result
+     end
+    return content
+  end
+
+  def self.updateCreatedInfo(content)
+    if content.include?  $createInfo
+      curTime = Time.now.strftime("%Y/%m/%d")
+      time_content = content.sub("$DATE",curTime)
+      author = Etc.getpwuid(Process.uid).name
+      result = time_content.sub("$AUTHOR",author)
+      return result
+    end
+    return content
+  end
+
+end

data/lib/furion/ver_conflict_detector.rb

@@ -1,5 +1,8 @@
 require 'cocoapods'
 require 'etc'
+require 'net/http'
+require 'digest/sha1'
+require 'date'
 class ConflictDetector
   def self.detectConflict
     @openingSpec = []
@@ -7,6 +10,7 @@ class ConflictDetector
     # 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"]
@@ -58,7 +62,6 @@ class ConflictDetector
 
     if path.length == 0
       # 如果在wrapper也没找到就说明找不到
-      puts "[FurionError]:spec load Error in "+path
       return
     end
 
@@ -69,13 +72,21 @@ class ConflictDetector
       return
     end
 
+    dependencies = ret.dependencies
+
+    for spec in ret.subspecs
+      subDependencies = spec.dependencies
+      for item in subDependencies
+        dependencies.append(item)
+      end
+    end
 
-    for item in  ret.dependencies
+    for item in  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)
+        content = self.wrapSpecificVersion(requireStr) # 去掉空格和等号，只剩下大于/小于
+        self.loadSpec(item.name,content)
       end
     end
   end
@@ -107,12 +118,6 @@ class ConflictDetector
     return content
   end
 
-  def self.readSpecFromRepo(specName,version)
-
-
-
-    self.loadSpec(specName,version)
-  end
 
 
   def self.getSpecFromSDK(groupPath,sdkName,version)
@@ -189,6 +194,7 @@ class ConflictDetector
       else
         if min == max
           if containMax == 0 || containMin == 0
+
             isConflict = 1
           end
         end
@@ -233,7 +239,7 @@ class ConflictDetector
     end
 
     varNumArray2 = String(otherVersion).split("-")
-    verNum2 = varNumArray1[0]
+    verNum2 = varNumArray2[0]
     if varNumArray2.length() > 1
       verExt2 = varNumArray2[1]
     else
@@ -241,10 +247,11 @@ class ConflictDetector
     end
 
 
-    if Gem::Version.new(verNum1) > Gem::Version.new(otherVersion)
+    if Gem::Version.new(verNum1) > Gem::Version.new(verNum2)
+
       return 1
     else
-      if  Gem::Version.new(verNum1) == Gem::Version.new(otherVersion)
+      if  Gem::Version.new(verNum1) == Gem::Version.new(verNum2)
         if verExt1 == '*' && verExt2 != '*'
           return 1
         end
@@ -253,7 +260,36 @@ class ConflictDetector
     return 0
   end
 
-  def self.getLastVersionFromDir(dirPath)
 
+
+  # clientType=1&name=yome&projectCode=yome&type=1
+  def self.requestVersionDependancy
+
+    Find.find(Dir::pwd) do |path|
+      puts path
+    end
+
+    appId = "mtpwebservices"
+    token = "43010711d680a54c"
+    time = DateTime.now.strftime('%Q')
+    content = token + appId + String(time)
+    puts content
+    sign = Digest::SHA1.hexdigest(content)
+    url = URI('http://aplus.local.web.hy/open-api/1.0/dependency/get?')
+# 设置请求参数
+    params = {'clientType':0,'type':1}
+    url.query = URI.encode_www_form(params)
+    puts url
+    http = Net::HTTP.new(url.host, url.port)
+
+
+# 设置请求头
+    header = {'X-APLUS-APP':appId,
+              'X-APLUS-SIGN':sign,
+              'X-APLUS-TS':String(time)}
+    puts header
+
+    response = http.get(url, header)
+    puts response.body
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: furion
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - MTP Huya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-12-12 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/project_generate.rb
 - lib/furion/ver_conflict_detector.rb
 homepage: https://rubygems.org/gems/furion
 licenses: