cocoapods-vemars 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7bdedf40d7340147bc0587f4fa986e751273655edaa17cb21e8d9314c9d8a9
-  data.tar.gz: 43d084a4ccee5fc343af7d4f5e44a7d4c91c63d26cd68e3c4a0fb10e2c49dd7d
+  metadata.gz: a851c66bb67131db1792030b809e4e1e67efabe6f572773ad7dafb1074b44ad9
+  data.tar.gz: 37e96f45ae54e967b493d77c74862524e0d4dc2292dc4cddc24cf9c23011d3ae
 SHA512:
-  metadata.gz: aa023e879ca0e000beec163259c02123a63202e58df4381d9f35ce079c7f35064e48a93f4a4a2f94ea4631641259418d6cf8bcebe7dfa4d3158ed3f7facc85dd
-  data.tar.gz: cb8a73dba5d8fd82f2dcfb672cae9f59bfef124bb2e2ad8b7d2f80d84d23c7dd080b62febef86ff9df1bdc3bcf80d5a0ceadacf7e331d0f2e7e7753d21e6d60f
+  metadata.gz: ea27b65735cc062c672fd4c40beb42704c0445f9878a577c2d0ae28dea4052dc88edb1e1bf0d51c67cf36feba19f94cf93eb67a01b5d857df9bb8b1ec67cbcbf
+  data.tar.gz: c579291d9c2719de1135781d658634190d88cca41042df43a82fb86fd79e980e18548bd2bfef179549e39cc57f9daca7038017059396c743351da8b0d3bf5cb5

data/Gemfile

@@ -7,9 +7,9 @@ gem 'plist', '~> 3.2'
 gem 'rexml'
 gem 'concurrent-ruby', require: 'concurrent'
 gem 'xcodeproj'
-gem 'json'
+gem 'json_pure'
 gem 'cocoapods'
-
+# gem 'json'
 group :debug do
   gem 'ruby-debug-ide'
   gem 'debase', '0.2.5.beta2'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-vemars (0.0.4)
+    cocoapods-vemars (0.0.9)
 
 GEM
   remote: https://rubygems.org/
@@ -12,17 +12,17 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.10.1)
+    cocoapods (1.10.2)
       addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
+      cocoapods-core (= 1.10.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -37,7 +37,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
+    cocoapods-core (1.10.2)
       activesupport (> 5.0, < 6)
       addressable (~> 2.6)
       algoliasearch (~> 1.0)
@@ -47,24 +47,24 @@ GEM
       netrc (~> 0.11)
       public_suffix
       typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
+    cocoapods-deintegrate (1.0.5)
     cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0)
+    cocoapods-search (1.0.1)
     cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     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.1)
+    ffi (1.15.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -72,6 +72,7 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json (2.5.1)
+    json_pure (2.5.1)
     minitest (5.14.4)
     molinillo (0.6.6)
     nanaimo (0.3.0)
@@ -79,7 +80,7 @@ GEM
     netrc (0.11.0)
     plist (3.6.0)
     public_suffix (4.0.6)
-    rake (13.0.3)
+    rake (13.0.6)
     rexml (3.2.5)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
@@ -89,16 +90,16 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    xcodeproj (1.19.0)
+    xcodeproj (1.21.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)
@@ -106,7 +107,7 @@ DEPENDENCIES
   cocoapods-vemars!
   concurrent-ruby
   debase (= 0.2.5.beta2)
-  json
+  json_pure
   plist (~> 3.2)
   rake
   rexml

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
@@ -85,7 +85,7 @@ module Pod
     end
 
     def collect_components
-      components_api = Components_api.new(@basicInfo.version,service_url)
+      components_api = Components_api.new(@basicInfo.version,@service_url)
       all_components = components_api.getComponents
       @source = components_api.source
       @selected_components.each do |com|
@@ -105,7 +105,8 @@ module Pod
 
 
     def construct_plist
-      json = JSON.load_file @config_json
+      content = File.read(@config_json)
+      json = JSON.parse(content)
       json["project_info"]["app_id"] = json["project_info"]["app_id"].to_s
       services = Hash.new
       if @selected_components.include? "BDHotfix"

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

@@ -23,7 +23,9 @@ module Pod
             ['--bundle_id=bundle_id',    'the bundle_id from Vemars'],
             ['--com=COM1,COM2', 'Selected components in vemars.'],
             ['--config=CONFIG_PATH', 'config path of vemars.'],
-            ['--service_url=SERVICE_URL', 'url of vemars CLI service.']
+            ['--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
@@ -34,12 +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') 
           service_url = argv.option('service_url',nil)
-          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,@service_url)
+          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url)
           super
           @additional_args = argv.remainder!
         end
@@ -81,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,9 +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.'],
-            ['--service_url=SERVICE_URL', 'url of vemars CLI service.']
+            ['--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,11 +32,12 @@ module Pod
           @path = argv.option('path', '')
           @selected_components = argv.option('com', '').split(',')
           @config_json = argv.option('config', '/onekit-config.json') 
-          super
-          @additional_args = argv.remainder!
+          @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!
         end
 
         def validate!
@@ -67,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.5"
+  VERSION = "0.0.9"
 end

metadata

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