cocoapods-vemars 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db2b7ede8ac9872aa0750683c6cf6b937e7c5bfe619a1419acb3b946da631fdd
-  data.tar.gz: add3cfba272b078af7e24c2aa0a5e9acded640aba24f3bdeb6b653e74c7ecc6d
+  metadata.gz: ce531382e591ecfbc337cc96b019dee3e01e08db54e74661edd8a9b7bfba5a09
+  data.tar.gz: d6d5e7a9c6ba4faa87d0c4c262053cc82fe33ebf891278a790e3d5f3229d12ce
 SHA512:
-  metadata.gz: 3404059e79b56c1d3786d0a4a4c4f91c77259f54178b0a9e5bd16e6211f95202ea375a269563c21fa31dd379486872609f769c57e91eb5ab690c2e0286565268
-  data.tar.gz: d0bd479ded7c05962eb9c9b928b774ec5b90544cdba259b1c0f5b1eaeedd9f883be61cb070b1ead7218dcba7602f557c2bddf1b7e05df81040ed58855355d9e7
+  metadata.gz: 2df655100debe173901074517f0ea78fc7742c6fe2afc611c73001effe77f606930224a677eeb4c49beaba6c60b75e8017d6c096dafffb48cb85d12cdbb51a4f
+  data.tar.gz: 7032cd7b71861d3c19a7917930dcaae1bcae32e849d17bdde3ed7b5d01c94eade1ceeb72841162db60ab5b88e33f84699f219032438eda74be4c93890676ea46

data/.gitignore

@@ -6,4 +6,6 @@ install
 .bundle
 
 *.gem
-*.gemspec
+*.gemspec
+ruby/
+test/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-vemars (0.0.2)
+    cocoapods-vemars (0.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -12,7 +12,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
+    addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -57,11 +57,14 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.8)
+    debase (0.2.5.beta2)
+      debase-ruby_core_source (>= 0.10.12)
+    debase-ruby_core_source (0.10.12)
     escape (0.0.4)
     ethon (0.14.0)
       ffi (>= 1.15.0)
-    ffi (1.15.3)
+    ffi (1.15.1)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -76,34 +79,38 @@ GEM
     netrc (0.11.0)
     plist (3.6.0)
     public_suffix (4.0.6)
-    rake (13.0.6)
+    rake (13.0.3)
     rexml (3.2.5)
+    ruby-debug-ide (0.7.2)
+      rake (>= 0.8.1)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    xcodeproj (1.20.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
 
 PLATFORMS
   x86_64-darwin-19
+  x86_64-darwin-20
 
 DEPENDENCIES
   bundler (~> 2.2.15)
   cocoapods
   cocoapods-vemars!
   concurrent-ruby
+  debase (= 0.2.5.beta2)
   json
   plist (~> 3.2)
   rake
   rexml
+  ruby-debug-ide
   xcodeproj
 
 BUNDLED WITH

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

@@ -4,7 +4,6 @@ require_relative '../services/tailor'
 require_relative 'basicInfo'
 require_relative '../services/renamer'
 require 'json'
-
 module Pod
 
   class VemarsProject
@@ -13,6 +12,7 @@ module Pod
     attr_reader :basicInfo
     attr_reader :selected_components
     attr_reader :git_url
+    attr_reader :service_url
 
     attr_accessor :components_details
     attr_accessor :source
@@ -21,13 +21,14 @@ module Pod
       File.join(Dir.pwd, "Project")
     end
 
-    def initialize(app_key, components, config_json, version=nil, bundle_id=nil, name='', language='objc', git_url)
+    def initialize(app_key, components, config_json, version=nil, bundle_id=nil, name='', language='objc', git_url, service_url)
       @language = language
       @basicInfo = BasicInfo.new(app_key, bundle_id, name, version)
       @git_url = git_url
       @config_json = config_json
       @selected_components = components | (language == 'swift' ? %w[OneKit SwiftOneKit] : ['OneKit'])
       @components_details = []
+      @service_url = service_url
     end
 
     def generate
@@ -84,7 +85,7 @@ module Pod
     end
 
     def collect_components
-      components_api = Components_api.new(@basicInfo.version)
+      components_api = Components_api.new(@basicInfo.version,@service_url)
       all_components = components_api.getComponents
       @source = components_api.source
       @selected_components.each do |com|
@@ -105,6 +106,16 @@ module Pod
 
     def construct_plist
       json = JSON.load_file @config_json
+      json["project_info"]["app_id"] = json["project_info"]["app_id"].to_s
+      services = Hash.new
+      if @selected_components.include? "BDHotfix"
+        services["bdhotfix"] =  { "dist_area" => "cn", "domain_name" => "", "debug" => true}
+      end
+      if @selected_components.include? "VEH5Kit"
+        services["jsbridge_services"] =  { "auth_domain" => "", "auth_enable" => false}
+        services["gecko_services"] =  { "platform_domain" => "", "pattern" => "", "gecko_channels" => [], "gecko_access_key" => ""}
+      end
+      json["services"] = services
       File.open(Dir.pwd + "/onekit-config.plist", 'w') { |file|
         file.puts json.to_plist
       }

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

@@ -11,8 +11,20 @@ module Pod
           Query what baseline versions are available in vemars.
         DESC
 
+        def self.options
+          options = [
+            ['--service_url=SERVICE_URL', 'url of vemars CLI service.']
+          ]
+        end
+
+        def initialize(argv)
+          @service_url = argv.option('service_url',nil)
+          super
+          @additional_args = argv.remainder!
+        end
+
         def run
-          api = Baselines_api.new()
+          api = Baselines_api.new(@service_url)
           api.getBaselines
         end
 

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

@@ -15,9 +15,16 @@ module Pod
           CLAide::Argument.new('BASELINE', false)
         ]
 
+        def self.options
+          options = [
+            ['--service_url=SERVICE_URL', 'url of vemars CLI service.']
+          ]
+        end
+
         def initialize(argv)
           baseline = argv.shift_argument
-          @api = Components_api.new(baseline)
+          service_url = argv.option('service_url',nil)
+          @api = Components_api.new(baseline,service_url)
           super
           @additional_args = argv.remainder!
         end

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

@@ -22,7 +22,10 @@ module Pod
             ['--silent',    'do not run pod install'],
             ['--bundle_id=bundle_id',    'the bundle_id from Vemars'],
             ['--com=COM1,COM2', 'Selected components in vemars.'],
-            ['--config=CONFIG_PATH', 'config path of vemars.']
+            ['--config=CONFIG_PATH', 'config path of vemars.'],
+            ['--service_url=SERVICE_URL', 'url of vemars CLI service.'],
+            ['--git=GIT_URL', 'git url of demo repo'],
+            ['--pod_repo_no_update',    'do not run pod repo update']
           ]
           options.concat(super.reject { |option, _| option == '--silent' })
         end
@@ -33,11 +36,13 @@ module Pod
           @language = argv.option('language', 'objc')
           git_url = argv.option('git', 'git@github.com:volcengine/ve_Template_iOS.git')
           @silent = argv.flag?('silent', false)
+          @repo_no_update = argv.flag?('pod_repo_no_update',false)
           @appkey = argv.option('appkey', '')
           @bundle_id = argv.option('bundle_id', nil)
           @selected_components = argv.option('com', "").split(',')
           @config_json = argv.option('config', '/onekit-config.json') 
-          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url)
+          service_url = argv.option('service_url',nil)
+          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url)
           super
           @additional_args = argv.remainder!
         end
@@ -79,7 +84,12 @@ module Pod
           Dir.chdir(project_dir) do
             # system('bundle install')
             # system('bundle exec pod install --repo-update')
-            system('pod install --repo-update')
+            if @repo_no_update
+              puts "pod install with no repo update"
+              system('pod install --no-repo-update')
+            else
+              system('pod install --repo-update')
+            end
           end
         end
 

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

@@ -19,8 +19,10 @@ module Pod
           options = [
             ['--path=PODFILE_PATH',    'the /path/to/Dir_contains_Podfile'],
             ['--com=COM1,COM2', 'Selected components in vemars.'],
-            ['--silent',    'do not run pod install'],
-            ['--config=CONFIG_PATH', 'config path of vemars.']
+            ['--config=CONFIG_PATH', 'config path of vemars.'],
+            ['--service_url=SERVICE_URL', 'url of vemars CLI service.'],
+            ['--git=GIT_URL', 'git url of demo repo'],
+            ['--pod_repo_no_update',    'do not run pod repo update']
           ]
           options.concat(super.reject { |option, _| option == '--silent' })
         end
@@ -30,10 +32,12 @@ module Pod
           @path = argv.option('path', '')
           @selected_components = argv.option('com', '').split(',')
           @config_json = argv.option('config', '/onekit-config.json') 
+          @repo_no_update = argv.flag?('pod_repo_no_update',false)
+          git_url = argv.option('git', 'git@github.com:volcengine/ve_Template_iOS.git')
+          service_url = argv.option('service_url',nil)
+          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @baseline, git_url, service_url)
           super
           @additional_args = argv.remainder!
-          git_url = argv.option('git', 'git@github.com:volcengine/ve_Template_iOS.git')
-          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @baseline, git_url)
         end
 
         def validate!
@@ -65,7 +69,12 @@ module Pod
           Dir.chdir(project_dir) do
             # system('bundle install')
             # system('bundle exec pod install --repo-update')
-            system('pod install --repo-update')
+            if @repo_no_update
+              puts "pod install with no repo update"
+              system('pod install --no-repo-update')
+            else
+              system('pod install --repo-update')
+            end
           end
         end
 

data/lib/cocoapods-vemars/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsVemars
-  VERSION = "0.0.3"
+  VERSION = "0.0.7"
 end

data/lib/cocoapods-vemars/hook/podfile_template.rb

@@ -19,6 +19,7 @@ module Pod
  #{platform}
 
 #plugin 'cocoapods-vemars'
+install! 'cocoapods', :deterministic_uuids => false
 
 source 'https://cdn.cocoapods.org/'
 #{source_template}

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

@@ -4,13 +4,17 @@ module Pod
   class Baselines_api
     include Concurrent::Async
 
-    BASELINES_URL = 'http://mars-mpaas.bytedance.net/mpaas/baseline/baselines'.freeze
+    BASELINES_URL = 'https://poc-api.vemarsdev.com/mpaas/baseline/baselines'.freeze
     attr_accessor :result
 
+    public def initialize(url=BASELINES_URL)
+      @baseline_url = (url.blank? ? BASELINES_URL : url + "mpaas/baseline/baselines")
+    end
+
     def getBaselines
       body= "{\"technology_stack\": \"iOS\"}"
       header = {"ContentType" => 'application/json'}
-      response = REST.post(BASELINES_URL, body, header)
+      response = REST.post(@baseline_url, body, header)
       if response.ok?
         json = JSON.parse(response.body)
         error_code = json["error_no"]

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

@@ -5,18 +5,20 @@ module Pod
   class Components_api
     include Concurrent::Async
 
-    COMPONENTS_URL = 'http://mars-mpaas.bytedance.net/mpaas/baseline/baseline_config'.freeze
+    COMPONENTS_URL = 'https://poc-api.vemarsdev.com/mpaas/baseline/baseline_config'.freeze
 
     attr_reader :source
     attr_reader :baseline
     attr_reader :component_list
     attr_reader :baseline_api
+    attr_reader :components_url
 
-    public def initialize(baseline=nil)
+    public def initialize(baseline=nil,url=COMPONENTS_URL)
       @baseline = baseline
       @source = ""
       @component_list = []
-      @baseline_api = Baselines_api.new()
+      @baseline_api = Baselines_api.new(url)
+      @components_url = (url.blank? ? COMPONENTS_URL : url + "mpaas/baseline/baseline_config")
     end
 
     public def validate!
@@ -36,7 +38,7 @@ module Pod
     public def getComponents(baseline=@baseline)
       body= "{\"baseline_version\": \"#{baseline}\", \"technology_stack\": \"iOS\"}"
       header = {"ContentType" => 'application/json'}
-      response = REST.post(COMPONENTS_URL, body, header)
+      response = REST.post(@components_url, body, header)
       deserilise(response)
       return component_list
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-vemars
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - huangbomao@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler