cocoapods-vemars 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900891781b0e66c13781cf48797a0082ee45e4f31d4d0abd2e961f9e6192e038
-  data.tar.gz: 7a66a578915f7857a06b733ecec258c78932c8161e4a9655acc54e96fa7c6b62
+  metadata.gz: 503b86605e7ed3937976076c9e1d6bd3089631f7bd8840e669a2fb583be2f158
+  data.tar.gz: 7715fb8c8817e21b10e7198be4df9e6a367ab56b5e0c013d2b4811e932207ba4
 SHA512:
-  metadata.gz: 27618bd7e1553cae3f8081533d262b54ff508cd1d67b976e70f70838c5a3d2afded84453616b1dc7cd314e3e15b39e9e21be7fdeef915ccc355ddd10da9f360a
-  data.tar.gz: 58ed550b09bfdb4c8302a0ce9fbb5b19fecc2ba94bd4c627f03ff4d9e3d3074bdd6f46f02b18acee7c1309e109ca3682164908dc3f9efce8359fc28e1784bea2
+  metadata.gz: 57b157fdf9b702ffc70fe634a68685db0e276fa70c1b3cdfd50f10f8bdecdf189438c9571e949dd2dd911d2c5ca64462527ebdb2841a5673c338c4989112884f
+  data.tar.gz: 7e56f1593607cb17e568ce11389d808ec2e6144afa8d56209734cd68a719a16326802508d486406f75e741e7a2de94a2fe52cd583c77f0905fdbd00cb2de6da6

data/.gitignore

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

data/Gemfile

@@ -3,14 +3,16 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cocoapods-vemars.gemspec
 gemspec
 
+gem 'plist', '~> 3.2'
+gem 'rexml'
+gem 'concurrent-ruby', require: 'concurrent'
+gem 'xcodeproj'
+gem 'json'
+gem 'cocoapods'
+
 group :debug do
-  gem 'cocoapods'
-  # gem 'ruby-debug-ide'
-  # gem 'debase', '0.2.5.beta2'
-  gem 'plist', '~> 3.2'
-  gem 'rexml'
-  gem 'concurrent-ruby', require: 'concurrent'
-  gem 'xcodeproj'
+  gem 'ruby-debug-ide'
+  gem 'debase', '0.2.5.beta2'
 end
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-vemars (0.0.1)
+    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,33 +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

@@ -3,7 +3,7 @@ require_relative '../services/patcher'
 require_relative '../services/tailor'
 require_relative 'basicInfo'
 require_relative '../services/renamer'
-
+require 'json'
 module Pod
 
   class VemarsProject
@@ -12,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
@@ -20,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
@@ -83,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|
@@ -104,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
@@ -31,13 +34,15 @@ module Pod
           @name = argv.shift_argument
           @version = argv.shift_argument
           @language = argv.option('language', 'objc')
-          git_url = argv.option('git', 'git@github.com:volcengine/ve_Template_iOS.git')
+          git_url = argv.option('git', 'https://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
@@ -77,8 +82,14 @@ module Pod
           end
 
           Dir.chdir(project_dir) do
-            system('bundle install')
-            system('bundle exec pod install --repo-update')
+            # system('bundle install')
+            # system('bundle exec pod install --repo-update')
+            if @repo_no_update
+              puts "Pod install skipped!"
+              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!
@@ -63,8 +67,14 @@ module Pod
           end
 
           Dir.chdir(project_dir) do
-            system('bundle install')
-            system('bundle exec pod install --repo-update')
+            # system('bundle install')
+            # system('bundle exec 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.2"
+  VERSION = "0.0.6"
 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.2
+  version: 0.0.6
 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