cocoapods-mars 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec365556b257eb08c48b114818d18c061aa6928eb620c997a5d135832de187b1
-  data.tar.gz: a69fc8c96861b24be94bb01fbe360b3f3b1f49d5e1cd088ace14945b595a92d8
+  metadata.gz: f2c527d994607efe3b26c4e9b82f2946909800bc6114b9426d3f20b6bf9ac945
+  data.tar.gz: f28621350cff835d3e93bbd65621a4e2e2d40cc88992ab45456742127832cb08
 SHA512:
-  metadata.gz: 0fb8787bb95ba63924685406916a22f3866f4e1946377bf13cdbf8cc7cd355a2d6c3dbcb707c8c52a930baf8fc99a95143412649fac1fcbe45976fc7db7c7aaf
-  data.tar.gz: 78c31abc76850709d3690f5671dbf1b6202a5c6353d5fc508a6cd38de73ee2877e7c4c078aac20929eefc084137b005a587b8c9e6f2d39ecd787dcab9ad20aa6
+  metadata.gz: ef47b260fc6882835bfb067eabb6bdb1bc45d02e9355fad4f893cf045020cd743f447efba1ae8369e382799153a8c514b6289028b7fbdebdaaae897dcd9fc906
+  data.tar.gz: 215f8bfa6df6333006e8bcbcd37d8a06c062501b9309832c251b2f5ff6ad2020a05f45da28a35e39242dd3c9f0201d19058ef5b66ebd1b7b5a55068ad90d611f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-mars (0.0.14)
+    cocoapods-mars (0.0.15)
 
 GEM
   remote: https://rubygems.org/

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

@@ -14,60 +14,6 @@ module Pod
       @name = json["name"]
       @version = json["version"]
       @subspecs = json["subspecs"]
-      if @name === "RangersAPM"
-        @subspecs = ['Crash',
-          'WatchDog',
-          'OOM',
-          'LAG',
-          'UserException',
-          'Monitors',
-          'UITrackers',
-          'Hybrid',
-          'MemoryGraph',
-          'Network',
-          'EventMonitor',
-          'CN']
-      elsif @name == "RangersAppLog"
-        @subspecs = [
-          'Core',
-          'Host/CN',
-          'OneKit',
-          'UITracker',
-          'Picker',
-          'Log',
-          'Unique'
-        ]
-      elsif @name == "VEAppUpdateHelper"
-        @subspecs = [
-          'VEUpdateHelper',
-          'VEUpdateView'    
-        ]
-      elsif @name == "VERemoteConfig"
-        @subspecs =  [
-          'Core',
-          'OneKit',
-          'TestPage'
-        ]
-      elsif @name == "VEInstall"
-        @subspecs =  [
-          'Core',
-          'URL/CN',
-          'IDFA',
-          'CAID',
-          'OneKit'
-        ]
-      elsif @name == "OneKit"
-        @subspecs =  [
-          'BaseKit',
-          'Defaults',
-          'Database',
-          'MARS/Auth',
-          'Reachability',
-          'Service',
-          'StartUp',
-          'Screenshot'
-        ]
-      end
     end
 
     def to_s

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

@@ -41,47 +41,31 @@ module Pod
           if @prompt_type == 1
             @name = prompt.ask("请输入工程名:", default: "MarsDemo")
           elsif @prompt_type == 2
-            if store.key?('podfile-path')
-              @path = prompt.ask("请输入Podfile所在的工程目录",default:store["podfile-path"])
-            elsif
-              @path = prompt.ask("请输入Podfile所在的工程目录")
-            end
+            promptAskWithCache("请输入Podfile所在的工程目录","podfile-path",store,prompt)
           end
           languages = [  {name: "Objective-C", value: "objc"},{name:"Swift", value: "swift"}]
           @language = prompt.select("选择开发语言:", languages)
-
-          if store.key?('config-path')
-            @config_json = prompt.ask("请输入config.json配置文件路径",default:store["config-path"])
-          elsif
-            @config_json = prompt.ask("请输入config.json配置文件路径")
-          end
+          promptAskWithCache("请输入config.json配置文件路径","config-path",store,prompt)
           @version = prompt.select("选择基线:", baselines)
-
-          comp_api = Components_api.new(@version,@service_url)
-          components = comp_api.getComponents().select do |components|
-            components.name != "ve_Template_iOS"
-          end
-          components = components.map {|c| c.name}.select {|c| c.length > 0}
-          components.insert(0, components.delete('RangersAPM'))
-          components.insert(0, components.delete('RangersAppLog'))
-          components.insert(0, components.delete('VEAppUpdateHelper'))
-          components.insert(0, components.delete('VERemoteConfig'))
-          components.insert(0, components.delete('BDHotfix'))
-          components.insert(0, components.delete('VEH5Kit'))
-          @selected_components = prompt.multi_select("选择组件:",components,per_page: 10)
-
-
+          @selected_components = prompt.multi_select("选择组件:",getComponents,per_page: 10)
           
           #toDO
-          # private_configs = prompt.ask("是否进行私有化配置？",convert:boolean,default:"no")
-          # if private_configs
+
           git_url = argv.option('git', 'https://github.com/volcengine/ve_Template_iOS.git')
-          @repo_no_update = argv.flag?('pod_repo_no_update',false)
-          service_url = argv.option('service_url',nil)
-          sources = argv.option('sources','https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/')
-          @silent = argv.flag?('silent', false)
-          @appkey = argv.option('appkey', '')
-          @bundle_id = argv.option('bundle_id', nil)
+          @repo_no_update = false
+          service_url = nil
+          sources = 'https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/'
+          @silent = false
+          @appkey = ''
+          @bundle_id = nil
+
+          private_configs = prompt.ask("是否进行私有化配置？",convert: :boolean,default:"no")
+          if private_configs
+            service_url = prompt.ask('请输入基线服务的URL地址:',default: 'https://mars-fwk.vemarsdev.com/')
+            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")
+          end
 
           #save Configs
           store['config-path'] = @config_json
@@ -115,10 +99,33 @@ module Pod
           end
         end
 
+        def promptAskWithCache(message,key,store,prompt)
+          if store.key?(key)
+            @config_json = prompt.ask(message,default:store[key])
+          elsif
+            @config_json = prompt.ask(message)
+          end
+        end
+
+        def getComponents
+          comp_api = Components_api.new(@version,@service_url)
+          components = comp_api.getComponents().select do |components|
+            components.name != "ve_Template_iOS"
+          end
+          components = components.map {|c| c.name}.select {|c| c.length > 0}
+          components.insert(0, components.delete('RangersAPM'))
+          components.insert(0, components.delete('RangersAppLog'))
+          components.insert(0, components.delete('VEAppUpdateHelper'))
+          components.insert(0, components.delete('VERemoteConfig'))
+          components.insert(0, components.delete('BDHotfix'))
+          components.insert(0, components.delete('VEH5Kit'))
+          components
+        end
+
         def podInstallInCreateProcess
-          puts "Current dir: #{Dir.pwd}"
+          puts "[MARS] Current dir: #{Dir.pwd}"
           project_dir = File.join(Dir.pwd, [@project.basicInfo.name, "Project"])
-          puts "Pod install directory: #{project_dir}"
+          puts "[MARS] Pod install directory: #{project_dir}"
           if @silent
             puts "Pod install skipped!"
             puts "You can run Pod install in '#{project_dir}' later!"
@@ -131,7 +138,7 @@ module Pod
             # system('bundle install')
             # system('bundle exec pod install --repo-update')
             if @repo_no_update
-              puts "pod install with no repo update"
+              puts "[MARS] pod install with no repo update"
               system('pod install --no-repo-update')
             else
               system('pod install --repo-update')
@@ -140,9 +147,9 @@ module Pod
         end
 
         def podInstallInPatchProcess
-          puts "Current dir: #{Dir.pwd}"
+          puts "[MARS] Current dir: #{Dir.pwd}"
           project_dir = @path
-          puts "Pod install directory: #{project_dir}"
+          puts "[MARS] Pod install directory: #{project_dir}"
           if @silent
             puts "Pod install skipped!"
             puts "You can run Pod install in '#{project_dir}' later!"
@@ -153,7 +160,7 @@ module Pod
             # system('bundle install')
             # system('bundle exec pod install --repo-update')
             if @repo_no_update
-              puts "pod install with no repo update"
+              puts "[MARS] pod install with no repo update"
               system('pod install --no-repo-update')
             else
               system('pod install --repo-update')

data/lib/cocoapods-vemars/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mars
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - huangbomao@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler