cocoapods-vemars 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30550c108fbd5a78c3700c13e93afac49018e01bdb1905c7d173b0c70c7a3b7b
-  data.tar.gz: d4903f6342f6a8e0b1a7b7ca632ca0595165d948137e05a84e009101b25fd03f
+  metadata.gz: 9c337e1f709eba511b7f96eca02cdf565a548b0c5f1ef954ddccf2d2ac8fdb15
+  data.tar.gz: 786f22698dd0f88f3fa3cf226ae25a06582a8010757ec2c4ec98a55be9594279
 SHA512:
-  metadata.gz: d8f4de048cf85455d281aead71f02a32a032709963dc793bba8aa410425fe29f866ad83c73973f3f6b32ae8558e07b2990b894a6eac62baa9c61d6daaa395f48
-  data.tar.gz: e1f51022de625322340b8bf1b6283c9152b61832358fb8d445458f6bf1f34ee8f1abd80dc8a70dd09f96bba4b8b41c97fc05d03f75b10cff26d94178185b1a7e
+  metadata.gz: 0fa61a165444b572aebd01cb958e4387291de453b55d0b91bf56ff041f01eace0db174abdd70439ac2af39410bcd968e2f5d642ac884a6f22ec312b19eeaf874
+  data.tar.gz: 2e8a4f9a5402d62da38def7174451ebc3092abe18da29d1f51ec6bdd34d68befd09097d93ad93f5a816f832059b8c7da4f3dd3224f33471f2c45ab8c96ff806a

data/Gemfile

@@ -9,7 +9,8 @@ gem 'concurrent-ruby', require: 'concurrent'
 gem 'xcodeproj'
 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.1)
+    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,10 +109,14 @@ DEPENDENCIES
   cocoapods-vemars!
   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
    2.2.15

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,14 @@ module Pod
     attr_reader :service_url
 
     attr_accessor :components_details
-    attr_accessor :source
+    attr_accessor :sources
+    attr_accessor :demo_tag
 
     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,12 +32,13 @@ module Pod
       @selected_components = components | (language == 'swift' ? %w[OneKit SwiftOneKit] : ['OneKit'])
       @components_details = []
       @service_url = service_url
+      @sources = sources
     end
 
     def generate
       puts "generate project..."
-      clone_template_project
       collect_components
+      clone_template_project
       Dir.chdir(basicInfo.name) do
         language_switch
         tailor_demos
@@ -55,7 +59,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, @demo_tag)
         patcher.execute
       end
     end
@@ -65,9 +69,32 @@ module Pod
       if File.directory?(basicInfo.name) || File.file?(basicInfo.name)
         system("rm -rf #{basicInfo.name}")
       end
+      if git_url.end_with?(".git")
+        cmd = ""
+        if @demo_tag.nil?
+          cmd = "git clone #{git_url} #{basicInfo.name}"
+        else
+          cmd = "git clone #{git_url} #{basicInfo.name} -b #{@demo_tag} --config advice.detachedHead=false"
+        end
+        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,33 +114,48 @@ 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
         }
         @components_details.append existed_com unless existed_com.nil?
       end
+      
+      demo_com = all_components.find { |acom|
+        acom.name == "ve_Template_iOS"
+      }
+
+      if !demo_com.nil?
+        @demo_tag = demo_com.version
+      end
 
     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"
-        services["bdhotfix"] =  { "dist_area" => "cn", "domain_name" => "", "debug" => true}
+      services = json["services"]
+      if @selected_components.include?("BDHotfix") && services.include?("hotfix")
+        hotfix = services["hotfix"]
+        hotfix["dist_area"] = "cn"
+        hotfix["debug"] = true
+        services["hotfix"] = hotfix
       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" => ""}
+      if @selected_components.include?("VEH5Kit") && services.include?("h5")
+        h5 = services["h5"]
+        h5["auth_enable"] = false
+        h5["pattern"] =  ""
+        h5["gecko_channels"] = []
+        h5["gecko_access_key"] = ""
+        services["h5"] = h5
       end
       json["services"] = services
       File.open(Dir.pwd + "/onekit-config.plist", 'w') { |file|

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.8"
+  VERSION = "0.0.12"
 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

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

@@ -13,7 +13,7 @@ module Pod
     attr_reader :podfile_dir
     attr_reader :template
 
-    def initialize(podfile_dir, baseline, components_details, source, git_url)
+    def initialize(podfile_dir, baseline, components_details, source, git_url,demo_tag)
       @podfile_dir = podfile_dir
       @template = PodfileTemplate.new(baseline, components_details, source)
       @components_details = components_details
@@ -21,6 +21,7 @@ module Pod
       puts git_url
       @hasInjectedSource = false
       @hasInjectedVemarsPods = false
+      @demo_tag = demo_tag
     end
 
     def execute
@@ -77,7 +78,11 @@ module Pod
     end
 
     def clone_project
-      system("git clone #{@git_url} ./.vemars")
+      if @demo_tag.nil?
+        system("git clone #{@git_url} ./.vemars")
+      else
+        system("git clone #{@git_url} ./.vemars -b #{@demo_tag} --config advice.detachedHead=false")
+      end
       system("mv ./.vemars/DevPods ./DevPods")
     end
 

metadata

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