cocoapods-mars 0.0.16 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c527d994607efe3b26c4e9b82f2946909800bc6114b9426d3f20b6bf9ac945
-  data.tar.gz: f28621350cff835d3e93bbd65621a4e2e2d40cc88992ab45456742127832cb08
+  metadata.gz: 1541b08c9b9032c0f9072b5dee44bc86a8f489219c52ccdadbce186dadb2e168
+  data.tar.gz: 38b8f8909d827a2ac3e8c27f69a8ff4087864d6a7cede3a20163f98e8b6dea7a
 SHA512:
-  metadata.gz: ef47b260fc6882835bfb067eabb6bdb1bc45d02e9355fad4f893cf045020cd743f447efba1ae8369e382799153a8c514b6289028b7fbdebdaaae897dcd9fc906
-  data.tar.gz: 215f8bfa6df6333006e8bcbcd37d8a06c062501b9309832c251b2f5ff6ad2020a05f45da28a35e39242dd3c9f0201d19058ef5b66ebd1b7b5a55068ad90d611f
+  metadata.gz: e5738ecdce830dde3204906e0f59b2df0e925b56892d5664a132e6f6df858f45a0da85464ffbebfa22ec07ce611a4422855f0d1edff4f14bcf7803e67f51449f
+  data.tar.gz: 67cb1716b80d1f24aa2a8109a25095ec849b47757181a7db5364e778c666353df1c2e939e37123a21dc9220d3ea10130d80c96ac916fd47ef5d3d7a81dfaf69c

data/Gemfile

@@ -13,6 +13,7 @@ gem 'rubyzip', '>= 1.0.0'
 gem 'open-uri'
 gem "tty-prompt"
 gem "moneta"
+gem "macaddr"
 group :debug do
   gem 'ruby-debug-ide'
   gem 'debase', '0.2.5.beta2'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-mars (0.0.15)
+    cocoapods-mars (0.0.16)
 
 GEM
   remote: https://rubygems.org/
@@ -73,6 +73,8 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     json_pure (2.5.1)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
     minitest (5.14.4)
     molinillo (0.6.6)
     moneta (1.4.2)
@@ -90,6 +92,7 @@ GEM
       rake (>= 0.8.1)
     ruby-macho (1.4.0)
     rubyzip (2.3.2)
+    systemu (2.6.5)
     thread_safe (0.3.6)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
@@ -124,6 +127,7 @@ DEPENDENCIES
   concurrent-ruby
   debase (= 0.2.5.beta2)
   json_pure
+  macaddr
   moneta
   open-uri
   plist (~> 3.2)

data/cocoapods-vemars.gemspec

@@ -18,6 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.2.15'
-  spec.add_development_dependency 'rake'
+  spec.add_runtime_dependency 'cocoapods'
+  spec.add_runtime_dependency 'plist', '>= 3.2'
+  spec.add_runtime_dependency 'json_pure'
+  spec.add_runtime_dependency 'rubyzip', '>= 1.0.0'
+  spec.add_runtime_dependency "tty-prompt"
+  spec.add_runtime_dependency "moneta"
+  spec.add_runtime_dependency "macaddr"
+
+  spec.add_development_dependency 'rexml'
+  spec.add_development_dependency 'xcodeproj'
+  spec.add_development_dependency 'open-uri'
 end

data/lib/cocoapods-vemars/command/project.rb

@@ -1,4 +1,5 @@
 require_relative '../services/components_api'
+require_relative '../services/log_api'
 require_relative '../services/patcher'
 require_relative '../services/tailor'
 require_relative 'basicInfo'
@@ -34,6 +35,7 @@ module Pod
       @components_details = []
       @service_url = service_url
       @sources = sources
+      @log_api = Log_api.new()
     end
 
     def generate
@@ -55,6 +57,9 @@ module Pod
         end
         reinitialize_git_repo
       end
+      @log_api.record_event("fwk_new_project",{"app_id" => @app_id,"type" => "新项目"})
+      @log_api.record_event("fwk_pv",{"app_id" => @app_id})
+      @log_api.record_sdks(@selected_components,@app_id)
     end
 
     def patch(podfile_dir)
@@ -67,6 +72,10 @@ module Pod
         patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url, @demo_tag)
         patcher.execute
       end
+      @log_api.record_event("fwk_new_project",{"app_id" => @app_id,"type" => "存量项目"})
+      @log_api.record_event("fwk_pv",{"app_id" => @app_id})
+      @log_api.record_sdks(@selected_components,@app_id)
+
     end
 
     def clone_template_project
@@ -148,6 +157,7 @@ module Pod
       content = File.read(@config_json)
       json = JSON.parse(content)
       json["project_info"]["app_id"] = json["project_info"]["app_id"].to_s
+      @app_id = json["project_info"]["app_id"]
       services = json["services"]
 
       if @selected_components.include?("BDHotfix") 

data/lib/cocoapods-vemars/command/vemars/prompt.rb

@@ -46,7 +46,13 @@ module Pod
           languages = [  {name: "Objective-C", value: "objc"},{name:"Swift", value: "swift"}]
           @language = prompt.select("选择开发语言:", languages)
           promptAskWithCache("请输入config.json配置文件路径","config-path",store,prompt)
-          @version = prompt.select("选择基线:", baselines)
+          select_baseline = prompt.ask("是否需要选择基线？(默认使用最新版本）", convert: :boolean, default: "no")
+          if select_baseline
+            @version = prompt.select("选择基线:", baselines)
+          else
+            @version = baselines.first
+            puts "将使用最新基线版本: " + @version
+          end
           @selected_components = prompt.multi_select("选择组件:",getComponents,per_page: 10)
           
           #toDO
@@ -61,7 +67,7 @@ module Pod
 
           private_configs = prompt.ask("是否进行私有化配置？",convert: :boolean,default:"no")
           if private_configs
-            service_url = prompt.ask('请输入基线服务的URL地址:',default: 'https://mars-fwk.vemarsdev.com/')
+            service_url = prompt.ask('请输入基线服务的URL地址:',default: 'https://mars-fwk.vemarsdev.com/mpaas')
             git_url = prompt.ask('请输入脚手架Demo仓库的地址:',default: 'https://github.com/volcengine/ve_Template_iOS.git')
             sources = prompt.ask('请输入Cocoapods源的地址的URL地址:',default: 'https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/')
             @repo_no_update = prompt.ask("是否跳过更新本地Pod仓库？",convert: :boolean,default:"no")
@@ -77,7 +83,6 @@ module Pod
           super
           @additional_args = argv.remainder!
 
-                    
           if @prompt_type == 1
             @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url,sources)
           elsif @prompt_type == 2

data/lib/cocoapods-vemars/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsVemars
-  VERSION = "0.0.16"
+  VERSION = "0.0.20"
 end

data/lib/cocoapods-vemars/services/baselines_api.rb

@@ -8,7 +8,7 @@ module Pod
     attr_accessor :result
 
     public def initialize(url=BASELINES_URL)
-      @baseline_url = (url.blank? ? BASELINES_URL : url + "mpaas/baseline/baselines")
+      @baseline_url = (url.blank? ? BASELINES_URL : url + "/baseline/baselines")
     end
 
     def getBaselines(silent=false)

data/lib/cocoapods-vemars/services/components_api.rb

@@ -18,7 +18,7 @@ module Pod
       @source = ""
       @component_list = []
       @baseline_api = Baselines_api.new(url)
-      @components_url = (url.blank? ? COMPONENTS_URL : url + "mpaas/baseline/baseline_config")
+      @components_url = (url.blank? ? COMPONENTS_URL : url + "/baseline/baseline_config")
     end
 
     public def validate!

data/lib/cocoapods-vemars/services/log_api.rb

@@ -0,0 +1,67 @@
+require 'Rest'
+require 'macaddr'
+
+
+module Pod
+  class Log_api
+    include Concurrent::Async
+
+    LOG_URL = 'http://fwk-log.vemarsdev.com/api/invoke/MultiUpload'.freeze
+    attr_accessor :result
+
+    public def initialize()
+      @log_url = LOG_URL
+    end
+
+    def record_event(event=nil,params=nil)
+      if event == "fwk_pv"
+        params["did"] = Mac.addr
+        params["from"] = "cli"
+      elsif
+        params["tech"] = "ios"
+      end
+      
+      body= {"debug" => true,"unique_id" => Mac.addr,"events" => [{"event" => event,"params" => params}]}
+      header = {"content-type" => 'application/json'}
+      body_str = JSON.generate(body)
+      puts body_str
+      response = REST.post(@log_url, body_str, header)
+      if response.ok?
+        json = JSON.parse(response.body)
+        error_code = json["code"]
+        if error_code == 0
+          puts "Log Success #{json["msg"]}" 
+        else
+          puts "Error #{error_code}: #{json["msg"]}"
+        end
+      else
+        puts "response status: #{response.status_code}"
+      end
+    end
+
+
+    def record_sdks(sdks=nil,appid=nil)
+      events = sdks.map{ |sdk|
+        {"event" => "fwk_add_sdk","params" => {"app_id" => appid,"sdk" => sdk,"tech" => "ios","type" => "custom"}}
+      }
+      
+      body= {"debug" => true,"unique_id" => Mac.addr,"events" => events}
+      header = {"content-type" => 'application/json'}
+      body_str = JSON.generate(body)
+      puts body_str
+      response = REST.post(@log_url, body_str, header)
+      if response.ok?
+        json = JSON.parse(response.body)
+        error_code = json["code"]
+        if error_code == 0
+          puts "Log Success #{json["msg"]}" 
+        else
+          puts "Error #{error_code}: #{json["msg"]}"
+        end
+      else
+        puts "response status: #{response.status_code}"
+      end
+    end
+
+  end
+end

metadata

@@ -1,31 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mars
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.20
 platform: ruby
 authors:
 - huangbomao@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.15
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: moneta
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: macaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.15
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: open-uri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,6 +180,7 @@ files:
 - lib/cocoapods-vemars/hook/podfile_template.rb
 - lib/cocoapods-vemars/services/baselines_api.rb
 - lib/cocoapods-vemars/services/components_api.rb
+- lib/cocoapods-vemars/services/log_api.rb
 - lib/cocoapods-vemars/services/patcher.rb
 - lib/cocoapods-vemars/services/renamer.rb
 - lib/cocoapods-vemars/services/tailor.rb