cocoapods-vemars 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea36ccb5da9226ceef1f978efd520bc78c6770f854b88d5429c54103bfbb935
-  data.tar.gz: 41841a5a35ae6dfb2bc7c69afca607f4b7ce74a3fc89aaf56ba7f813d0e6fe53
+  metadata.gz: 30550c108fbd5a78c3700c13e93afac49018e01bdb1905c7d173b0c70c7a3b7b
+  data.tar.gz: d4903f6342f6a8e0b1a7b7ca632ca0595165d948137e05a84e009101b25fd03f
 SHA512:
-  metadata.gz: 225984860fadd5d010475d77be742bfe67516e3bb7f507da032678547226a319ec50a5a464b5d9c38e83c735203b971eccc358c3c32a42b15b64843913de5500
-  data.tar.gz: fe9cc48afdb2c702357510da6275e311a2fcd0bbc9fd10d22131afd4daa00791ac117e097f8362f35fa3fd184dda419db32b4520ad1039cd60cf679ecbb31081
+  metadata.gz: d8f4de048cf85455d281aead71f02a32a032709963dc793bba8aa410425fe29f866ad83c73973f3f6b32ae8558e07b2990b894a6eac62baa9c61d6daaa395f48
+  data.tar.gz: e1f51022de625322340b8bf1b6283c9152b61832358fb8d445458f6bf1f34ee8f1abd80dc8a70dd09f96bba4b8b41c97fc05d03f75b10cff26d94178185b1a7e

data/Gemfile

@@ -7,7 +7,7 @@ gem 'plist', '~> 3.2'
 gem 'rexml'
 gem 'concurrent-ruby', require: 'concurrent'
 gem 'xcodeproj'
-gem 'json'
+gem 'json_pure'
 gem 'cocoapods'
 
 group :debug do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-vemars (0.0.4)
+    cocoapods-vemars (0.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -106,12 +106,10 @@ DEPENDENCIES
   cocoapods-vemars!
   concurrent-ruby
   debase (= 0.2.5.beta2)
-  json
   plist (~> 3.2)
   rake
   rexml
   ruby-debug-ide
-  xcodeproj
 
 BUNDLED WITH
-   2.2.25
+   2.2.15

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'
+require 'json/pure'
 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|

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.4"
+  VERSION = "0.0.8"
 end

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.4
+  version: 0.0.8
 platform: ruby
 authors:
 - huangbomao@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler