cocoapods-vemars 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a851c66bb67131db1792030b809e4e1e67efabe6f572773ad7dafb1074b44ad9
-  data.tar.gz: 37e96f45ae54e967b493d77c74862524e0d4dc2292dc4cddc24cf9c23011d3ae
+  metadata.gz: 2ba9ab90fd36b586347031093d3cc9149fba48e2e7b046803f3378cf8befff96
+  data.tar.gz: 1099a71408c4ed0fc8adf99e17ce337d382f9917a5adcfe6526ccdd7c7ba422d
 SHA512:
-  metadata.gz: ea27b65735cc062c672fd4c40beb42704c0445f9878a577c2d0ae28dea4052dc88edb1e1bf0d51c67cf36feba19f94cf93eb67a01b5d857df9bb8b1ec67cbcbf
-  data.tar.gz: c579291d9c2719de1135781d658634190d88cca41042df43a82fb86fd79e980e18548bd2bfef179549e39cc57f9daca7038017059396c743351da8b0d3bf5cb5
+  metadata.gz: 0d7b77ac2bc9d11a0427f63baa4cd1a69476514536aa1ab997d8449406cbbd66fc6e69a9edec0b383757f42e9fe44f03dfd532753e173eee0790e7c3c0d51bf8
+  data.tar.gz: 9bfcffa24880642f69fe529a055febf5d404f54ab5e0316a3af556217ac0dc7c5c3bfc24b891b2b7113c41b5a3cfc399bcce1fdf85b88b8a77378b1fde4f49c0

data/Gemfile

@@ -9,7 +9,8 @@ gem 'concurrent-ruby', require: 'concurrent'
 gem 'xcodeproj'
 gem 'json_pure'
 gem 'cocoapods'
-# gem 'json'
+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.9)
+    cocoapods-vemars (0.0.10)
 
 GEM
   remote: https://rubygems.org/
@@ -78,6 +78,7 @@ GEM
     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.6)
@@ -85,6 +86,7 @@ GEM
     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)
@@ -108,10 +110,12 @@ DEPENDENCIES
   concurrent-ruby
   debase (= 0.2.5.beta2)
   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,6 +3,8 @@ require_relative '../services/patcher'
 require_relative '../services/tailor'
 require_relative 'basicInfo'
 require_relative '../services/renamer'
+require 'zip'
+require 'open-uri'
 require 'json/pure'
 module Pod
 
@@ -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,7 +118,7 @@ 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

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.9"
+  VERSION = "0.0.10"
 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

metadata

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