cocoapods-vemars 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95220f9df2d38ad1f3b902560dd7c10363d5153c93e02e253ce28836711488e6
-  data.tar.gz: b6d9069e06a1ec429d5718338fd4476c4050485dacd4a42cc61896ed2662ca9b
+  metadata.gz: 9c337e1f709eba511b7f96eca02cdf565a548b0c5f1ef954ddccf2d2ac8fdb15
+  data.tar.gz: 786f22698dd0f88f3fa3cf226ae25a06582a8010757ec2c4ec98a55be9594279
 SHA512:
-  metadata.gz: '0904ed16ad954b514f3a544c23df8261403324872d0b59a03ec2ecfa2272f4c64fca54a6ea5c92dc0b031eef54d8dc66472bdf997cc46bfdbc4a0599ab9baa6e'
-  data.tar.gz: 29c4b869b6fc2020b4e7fa8498966b73cee3119abfc1b9dd42afe80e718543cbb045b854709e9a28242b96290aafa3433b3254cdb544cc6645dee6e9e048db17
+  metadata.gz: 0fa61a165444b572aebd01cb958e4387291de453b55d0b91bf56ff041f01eace0db174abdd70439ac2af39410bcd968e2f5d642ac884a6f22ec312b19eeaf874
+  data.tar.gz: 2e8a4f9a5402d62da38def7174451ebc3092abe18da29d1f51ec6bdd34d68befd09097d93ad93f5a816f832059b8c7da4f3dd3224f33471f2c45ab8c96ff806a

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

@@ -18,6 +18,7 @@ module Pod
 
     attr_accessor :components_details
     attr_accessor :sources
+    attr_accessor :demo_tag
 
     def project_folder
       File.join(Dir.pwd, "Project")
@@ -36,8 +37,8 @@ module Pod
 
     def generate
       puts "generate project..."
-      clone_template_project
       collect_components
+      clone_template_project
       Dir.chdir(basicInfo.name) do
         language_switch
         tailor_demos
@@ -58,7 +59,7 @@ module Pod
       collect_components
       Dir.chdir(podfile_dir) do
         construct_plist
-        patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url)
+        patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url, @demo_tag)
         patcher.execute
       end
     end
@@ -69,7 +70,12 @@ module Pod
         system("rm -rf #{basicInfo.name}")
       end
       if git_url.end_with?(".git")
-        cmd = "git clone #{git_url} #{basicInfo.name}"
+        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
@@ -114,6 +120,14 @@ module Pod
         }
         @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
 
@@ -128,13 +142,20 @@ module Pod
       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/gem_version.rb

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

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.11
+  version: 0.0.12
 platform: ruby
 authors:
 - huangbomao@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler