cocoapods-vemars 0.0.7 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce531382e591ecfbc337cc96b019dee3e01e08db54e74661edd8a9b7bfba5a09
-  data.tar.gz: d6d5e7a9c6ba4faa87d0c4c262053cc82fe33ebf891278a790e3d5f3229d12ce
+  metadata.gz: 95220f9df2d38ad1f3b902560dd7c10363d5153c93e02e253ce28836711488e6
+  data.tar.gz: b6d9069e06a1ec429d5718338fd4476c4050485dacd4a42cc61896ed2662ca9b
 SHA512:
-  metadata.gz: 2df655100debe173901074517f0ea78fc7742c6fe2afc611c73001effe77f606930224a677eeb4c49beaba6c60b75e8017d6c096dafffb48cb85d12cdbb51a4f
-  data.tar.gz: 7032cd7b71861d3c19a7917930dcaae1bcae32e849d17bdde3ed7b5d01c94eade1ceeb72841162db60ab5b88e33f84699f219032438eda74be4c93890676ea46
+  metadata.gz: '0904ed16ad954b514f3a544c23df8261403324872d0b59a03ec2ecfa2272f4c64fca54a6ea5c92dc0b031eef54d8dc66472bdf997cc46bfdbc4a0599ab9baa6e'
+  data.tar.gz: 29c4b869b6fc2020b4e7fa8498966b73cee3119abfc1b9dd42afe80e718543cbb045b854709e9a28242b96290aafa3433b3254cdb544cc6645dee6e9e048db17

data/Gemfile

@@ -7,9 +7,10 @@ gem 'plist', '~> 3.2'
 gem 'rexml'
 gem 'concurrent-ruby', require: 'concurrent'
 gem 'xcodeproj'
-gem 'json'
+gem 'json_pure'
 gem 'cocoapods'
-
+gem 'rubyzip', '>= 1.0.0'
+gem 'open-uri'
 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.5)
+    cocoapods-vemars (0.0.10)
 
 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,33 +72,36 @@ 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)
     nap (1.1.0)
     netrc (0.11.0)
+    open-uri (0.1.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)
     ruby-macho (1.4.0)
+    rubyzip (2.3.2)
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       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,11 +109,13 @@ DEPENDENCIES
   cocoapods-vemars!
   concurrent-ruby
   debase (= 0.2.5.beta2)
-  json
+  json_pure
+  open-uri
   plist (~> 3.2)
   rake
   rexml
   ruby-debug-ide
+  rubyzip (>= 1.0.0)
   xcodeproj
 
 BUNDLED WITH

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

@@ -3,7 +3,9 @@ require_relative '../services/patcher'
 require_relative '../services/tailor'
 require_relative 'basicInfo'
 require_relative '../services/renamer'
-require 'json'
+require 'zip'
+require 'open-uri'
+require 'json/pure'
 module Pod
 
   class VemarsProject
@@ -15,13 +17,13 @@ module Pod
     attr_reader :service_url
 
     attr_accessor :components_details
-    attr_accessor :source
+    attr_accessor :sources
 
     def project_folder
       File.join(Dir.pwd, "Project")
     end
 
-    def initialize(app_key, components, config_json, version=nil, bundle_id=nil, name='', language='objc', git_url, service_url)
+    def initialize(app_key, components, config_json, version=nil, bundle_id=nil, name='', language='objc', git_url, service_url,sources)
       @language = language
       @basicInfo = BasicInfo.new(app_key, bundle_id, name, version)
       @git_url = git_url
@@ -29,6 +31,7 @@ module Pod
       @selected_components = components | (language == 'swift' ? %w[OneKit SwiftOneKit] : ['OneKit'])
       @components_details = []
       @service_url = service_url
+      @sources = sources
     end
 
     def generate
@@ -55,7 +58,7 @@ module Pod
       collect_components
       Dir.chdir(podfile_dir) do
         construct_plist
-        patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @source, @git_url)
+        patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url)
         patcher.execute
       end
     end
@@ -65,9 +68,27 @@ module Pod
       if File.directory?(basicInfo.name) || File.file?(basicInfo.name)
         system("rm -rf #{basicInfo.name}")
       end
+      if git_url.end_with?(".git")
+        cmd = "git clone #{git_url} #{basicInfo.name}"
+        system(cmd)
+      else
+        destination = basicInfo.name
+        FileUtils.mkdir_p(destination)
+        content = URI.open(git_url)
+
+        Zip::File.open_buffer(content) do |zip|
+          zip.each do |f|
+            fname = f.name
+            if fname.start_with?("ve_Template_iOS")
+                paths = fname.split("/")
+                fname = fname.sub(paths[0],"")
+            end
+            fpath = File.join(destination, fname)
+            zip.extract(f, fpath) unless File.exist?(fpath)
+          end
+        end
 
-      cmd = "git clone #{git_url} #{basicInfo.name}"
-      system(cmd)
+      end
     end
 
     def language_switch
@@ -87,7 +108,6 @@ module Pod
     def collect_components
       components_api = Components_api.new(@basicInfo.version,@service_url)
       all_components = components_api.getComponents
-      @source = components_api.source
       @selected_components.each do |com|
         existed_com = all_components.find { |acom|
           acom.name == com
@@ -98,14 +118,15 @@ module Pod
     end
 
     def construct_podfile
-      template = PodfileTemplate.new(@basicInfo.version, @components_details, @source)
+      template = PodfileTemplate.new(@basicInfo.version, @components_details, @sources)
 
         File.open('Podfile', "w") { |file| file.puts template.to_dsl }
     end
 
 
     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

@@ -25,7 +25,8 @@ module Pod
             ['--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']
+            ['--pod_repo_no_update',    'do not run pod repo update'],
+            ['--sources','pod repos sources']
           ]
           options.concat(super.reject { |option, _| option == '--silent' })
         end
@@ -34,7 +35,7 @@ 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', '')
@@ -42,7 +43,8 @@ module Pod
           @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)
+          sources = argv.option('sources','https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/')
+          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @version, @bundle_id, @name, @language, git_url,service_url,sources)
           super
           @additional_args = argv.remainder!
         end

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

@@ -22,7 +22,8 @@ module Pod
             ['--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']
+            ['--pod_repo_no_update',    'do not run pod repo update'],
+            ['--sources','pod repos sources']
           ]
           options.concat(super.reject { |option, _| option == '--silent' })
         end
@@ -33,9 +34,10 @@ module Pod
           @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')
+          git_url = argv.option('git', 'https://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)
+          sources = argv.option('sources','https://github.com/volcengine/volcengine-specs.git,https://cdn.cocoapods.org/')
+          @project = VemarsProject.new(@appkey, @selected_components, @config_json, @baseline, git_url, service_url,sources)
           super
           @additional_args = argv.remainder!
         end

data/lib/cocoapods-vemars/gem_version.rb

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

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

@@ -2,15 +2,15 @@ module Pod
   class PodfileTemplate
 
     attr_reader :componentsList
-    attr_reader :source
+    attr_reader :sources
     attr_reader :baseline_version
 
     IOS_VERSION = '9.0'.freeze
 
-    def initialize(baseline_version, componentsList, source)
+    def initialize(baseline_version, componentsList, sources)
       @baseline_version = baseline_version
       @componentsList = componentsList
-      @source = source
+      @sources = sources
     end
 
     def to_dsl
@@ -21,7 +21,6 @@ module Pod
 #plugin 'cocoapods-vemars'
 install! 'cocoapods', :deterministic_uuids => false
 
-source 'https://cdn.cocoapods.org/'
 #{source_template}
 
 #{releasePod}
@@ -38,7 +37,8 @@ inhibit_all_warnings!
     end
 
     def source_template
-      "source '#{source}'"
+      source_urls = sources.split(",")
+      "#{source_urls.map{ |url| "source '#{url}'"}.join("\n")}"
     end
 
     def releasePod

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

@@ -4,7 +4,7 @@ module Pod
   class Baselines_api
     include Concurrent::Async
 
-    BASELINES_URL = 'https://poc-api.vemarsdev.com/mpaas/baseline/baselines'.freeze
+    BASELINES_URL = 'https://mars-fwk.vemarsdev.com/mpaas/baseline/baselines'.freeze
     attr_accessor :result
 
     public def initialize(url=BASELINES_URL)

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

@@ -5,7 +5,7 @@ module Pod
   class Components_api
     include Concurrent::Async
 
-    COMPONENTS_URL = 'https://poc-api.vemarsdev.com/mpaas/baseline/baseline_config'.freeze
+    COMPONENTS_URL = 'https://mars-fwk.vemarsdev.com/mpaas/baseline/baseline_config'.freeze
 
     attr_reader :source
     attr_reader :baseline

metadata

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