cocoapods-vemars 0.0.11 → 0.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 95220f9df2d38ad1f3b902560dd7c10363d5153c93e02e253ce28836711488e6
4
- data.tar.gz: b6d9069e06a1ec429d5718338fd4476c4050485dacd4a42cc61896ed2662ca9b
3
+ metadata.gz: 9c337e1f709eba511b7f96eca02cdf565a548b0c5f1ef954ddccf2d2ac8fdb15
4
+ data.tar.gz: 786f22698dd0f88f3fa3cf226ae25a06582a8010757ec2c4ec98a55be9594279
5
5
  SHA512:
6
- metadata.gz: '0904ed16ad954b514f3a544c23df8261403324872d0b59a03ec2ecfa2272f4c64fca54a6ea5c92dc0b031eef54d8dc66472bdf997cc46bfdbc4a0599ab9baa6e'
7
- data.tar.gz: 29c4b869b6fc2020b4e7fa8498966b73cee3119abfc1b9dd42afe80e718543cbb045b854709e9a28242b96290aafa3433b3254cdb544cc6645dee6e9e048db17
6
+ metadata.gz: 0fa61a165444b572aebd01cb958e4387291de453b55d0b91bf56ff041f01eace0db174abdd70439ac2af39410bcd968e2f5d642ac884a6f22ec312b19eeaf874
7
+ data.tar.gz: 2e8a4f9a5402d62da38def7174451ebc3092abe18da29d1f51ec6bdd34d68befd09097d93ad93f5a816f832059b8c7da4f3dd3224f33471f2c45ab8c96ff806a
@@ -18,6 +18,7 @@ module Pod
18
18
 
19
19
  attr_accessor :components_details
20
20
  attr_accessor :sources
21
+ attr_accessor :demo_tag
21
22
 
22
23
  def project_folder
23
24
  File.join(Dir.pwd, "Project")
@@ -36,8 +37,8 @@ module Pod
36
37
 
37
38
  def generate
38
39
  puts "generate project..."
39
- clone_template_project
40
40
  collect_components
41
+ clone_template_project
41
42
  Dir.chdir(basicInfo.name) do
42
43
  language_switch
43
44
  tailor_demos
@@ -58,7 +59,7 @@ module Pod
58
59
  collect_components
59
60
  Dir.chdir(podfile_dir) do
60
61
  construct_plist
61
- patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url)
62
+ patcher = Patcher.new(podfile_dir, @basicInfo.version, @components_details, @sources, @git_url, @demo_tag)
62
63
  patcher.execute
63
64
  end
64
65
  end
@@ -69,7 +70,12 @@ module Pod
69
70
  system("rm -rf #{basicInfo.name}")
70
71
  end
71
72
  if git_url.end_with?(".git")
72
- cmd = "git clone #{git_url} #{basicInfo.name}"
73
+ cmd = ""
74
+ if @demo_tag.nil?
75
+ cmd = "git clone #{git_url} #{basicInfo.name}"
76
+ else
77
+ cmd = "git clone #{git_url} #{basicInfo.name} -b #{@demo_tag} --config advice.detachedHead=false"
78
+ end
73
79
  system(cmd)
74
80
  else
75
81
  destination = basicInfo.name
@@ -114,6 +120,14 @@ module Pod
114
120
  }
115
121
  @components_details.append existed_com unless existed_com.nil?
116
122
  end
123
+
124
+ demo_com = all_components.find { |acom|
125
+ acom.name == "ve_Template_iOS"
126
+ }
127
+
128
+ if !demo_com.nil?
129
+ @demo_tag = demo_com.version
130
+ end
117
131
 
118
132
  end
119
133
 
@@ -128,13 +142,20 @@ module Pod
128
142
  content = File.read(@config_json)
129
143
  json = JSON.parse(content)
130
144
  json["project_info"]["app_id"] = json["project_info"]["app_id"].to_s
131
- services = Hash.new
132
- if @selected_components.include? "BDHotfix"
133
- services["bdhotfix"] = { "dist_area" => "cn", "domain_name" => "", "debug" => true}
145
+ services = json["services"]
146
+ if @selected_components.include?("BDHotfix") && services.include?("hotfix")
147
+ hotfix = services["hotfix"]
148
+ hotfix["dist_area"] = "cn"
149
+ hotfix["debug"] = true
150
+ services["hotfix"] = hotfix
134
151
  end
135
- if @selected_components.include? "VEH5Kit"
136
- services["jsbridge_services"] = { "auth_domain" => "", "auth_enable" => false}
137
- services["gecko_services"] = { "platform_domain" => "", "pattern" => "", "gecko_channels" => [], "gecko_access_key" => ""}
152
+ if @selected_components.include?("VEH5Kit") && services.include?("h5")
153
+ h5 = services["h5"]
154
+ h5["auth_enable"] = false
155
+ h5["pattern"] = ""
156
+ h5["gecko_channels"] = []
157
+ h5["gecko_access_key"] = ""
158
+ services["h5"] = h5
138
159
  end
139
160
  json["services"] = services
140
161
  File.open(Dir.pwd + "/onekit-config.plist", 'w') { |file|
@@ -1,3 +1,3 @@
1
1
  module CocoapodsVemars
2
- VERSION = "0.0.11"
2
+ VERSION = "0.0.12"
3
3
  end
@@ -13,7 +13,7 @@ module Pod
13
13
  attr_reader :podfile_dir
14
14
  attr_reader :template
15
15
 
16
- def initialize(podfile_dir, baseline, components_details, source, git_url)
16
+ def initialize(podfile_dir, baseline, components_details, source, git_url,demo_tag)
17
17
  @podfile_dir = podfile_dir
18
18
  @template = PodfileTemplate.new(baseline, components_details, source)
19
19
  @components_details = components_details
@@ -21,6 +21,7 @@ module Pod
21
21
  puts git_url
22
22
  @hasInjectedSource = false
23
23
  @hasInjectedVemarsPods = false
24
+ @demo_tag = demo_tag
24
25
  end
25
26
 
26
27
  def execute
@@ -77,7 +78,11 @@ module Pod
77
78
  end
78
79
 
79
80
  def clone_project
80
- system("git clone #{@git_url} ./.vemars")
81
+ if @demo_tag.nil?
82
+ system("git clone #{@git_url} ./.vemars")
83
+ else
84
+ system("git clone #{@git_url} ./.vemars -b #{@demo_tag} --config advice.detachedHead=false")
85
+ end
81
86
  system("mv ./.vemars/DevPods ./DevPods")
82
87
  end
83
88
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-vemars
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - huangbomao@bytedance.com
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-09-14 00:00:00.000000000 Z
11
+ date: 2021-11-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler