branch_io_cli 0.12.7 → 0.12.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +9 -4
  3. data/lib/branch_io_cli/core_ext/xcodeproj.rb +4 -4
  4. data/lib/branch_io_cli/helper/tool_helper.rb +13 -10
  5. data/lib/branch_io_cli/version.rb +1 -1
  6. metadata +67 -61
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4f4b56f1ff4b570ba8dfd1efbfa07ce22bfc5845203e1cda6362de90af8c61a5
4
- data.tar.gz: ccd9d333c5163062dee9ed5f241614e2a52f1ca450bf24d7a22a891ded00c44a
3
+ metadata.gz: a43dac3b34a35b9fe3c09e189fbe996da33f0528fc56d1c6161795f51625882b
4
+ data.tar.gz: a563d5f884ef2d9364d8f9c04f618cf51da4a791240caee4d056bec248860b1f
5
5
  SHA512:
6
- metadata.gz: 4101b50e8f1751a8fbbe4e6b1ef79dc3cd014dd79b9f6a23e16eee0475a0df6f666ccbf83f6816e106b7d68b77df8cd79de2eec80488690d9c76cd016cb22eff
7
- data.tar.gz: a10b7cba90bb2ccd86bd3b3e04a67d27272331addc3844d5e55ad71de43f55ec8b77ac640bc7824d5b32c8e3f21ac6fffe90526e311c33d596ff741ee6c0886e
6
+ metadata.gz: e26bd95cc0fb79b6edc8a31c7006b95c10d8e75b4b29c776dc669b5a04ce5ac2c2ce8c1d0f0899a55c2f9c84f075c27f1c52102e48f851c7203df7677e734dff
7
+ data.tar.gz: ce87717c89eb5a30cd5d7a2916584fef3d12f18dcd568163bb3db5159f59790d2970bdf5b591e6d5b214e79a28b0a86b1d52b6dc41ca0fb4cd624bd6a64ad184
data/README.md CHANGED
@@ -7,10 +7,6 @@ This is a command-line tool to integrate the Branch SDK into mobile app projects
7
7
  [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/BranchMetrics/branch_io_cli/blob/master/LICENSE)
8
8
  [![CircleCI](https://img.shields.io/circleci/project/github/BranchMetrics/branch_io_cli.svg)](https://circleci.com/gh/BranchMetrics/branch_io_cli)
9
9
 
10
- ## Preliminary release
11
-
12
- This is a preliminary release of this gem. Please report any problems by opening issues in this repo.
13
-
14
10
  ### Using Fastlane?
15
11
 
16
12
  See also the [Branch Fastlane plugin](https://github.com/BranchMetrics/fastlane-plugin-branch), which offers
@@ -26,6 +22,15 @@ gem install branch_io_cli
26
22
 
27
23
  Note that this command may require `sudo` access if you are using the system Ruby, i.e. `sudo gem install branch_io_cli`.
28
24
 
25
+ ### Experimental: Install using Homebrew
26
+
27
+ ```bash
28
+ brew tap jdee/tap
29
+ brew install branch_io_cli
30
+ ```
31
+
32
+ ### Getting help
33
+
29
34
  ```bash
30
35
  branch_io -h
31
36
  branch_io setup -h
data/lib/branch_io_cli/core_ext/xcodeproj.rb CHANGED
@@ -73,7 +73,7 @@ module Xcodeproj
73
73
  end
74
74
 
75
75
  # TODO: What is the correct resolution order here? Which overrides which in
76
- # Xcode?
76
+ # Xcode? Or does it matter here?
77
77
  if setting_value.nil? && defined?(BranchIOCLI::Configuration::XcodeSettings)
78
78
  setting_value = BranchIOCLI::Configuration::XcodeSettings[configuration][setting_name]
79
79
  end
@@ -118,13 +118,13 @@ module Xcodeproj
118
118
  # Everything else becomes a hyphen, including underscores.
119
119
  expanded_macro.gsub!(/[^A-Za-z0-9-]/, '-') if modifier == "rfc1034identifier"
120
120
 
121
- string.gsub!(/\$\(#{original_macro}\)|\$\{#{original_macro}\}|^#{original_macro}/, expanded_macro)
121
+ string.gsub!(/\$\(#{original_macro}\)|\$\{#{original_macro}\}/, expanded_macro)
122
122
  search_position += expanded_macro.length
123
123
  end
124
124
 
125
125
  # HACK: When matching against an xcconfig, as here, sometimes the macro is just returned
126
- # without delimiters, e.g. TARGET_NAME or PROJECT_DIR/PROJECT_NAME/BridgingHeader.h. We allow
127
- # these two patterns for now.
126
+ # without delimiters as the entire string or as a path component, e.g. TARGET_NAME or
127
+ # PROJECT_DIR/PROJECT_NAME/BridgingHeader.h.
128
128
  string = string.split("/").map do |component|
129
129
  next component unless component =~ /^[A-Z0-9_]+$/
130
130
  expanded_build_setting(component, configuration) || component
data/lib/branch_io_cli/helper/tool_helper.rb CHANGED
@@ -257,28 +257,31 @@ github "BranchMetrics/ios-branch-deep-linking"
257
257
  true
258
258
  end
259
259
 
260
+ def install_cmd
261
+ ENV["BRANCH_IO_CLI_INSTALLED_FROM_HOMEBREW"] == "true" ? :brew : :gem
262
+ end
263
+
260
264
  def verify_cocoapods
261
265
  pod_cmd = `which pod`
262
266
  return unless pod_cmd.empty?
263
267
 
264
- gem_cmd = `which gem`
265
- if gem_cmd.empty?
266
- say "'pod' command not available in PATH and 'gem' command not available in PATH to install cocoapods."
268
+ cmd = `which #{install_cmd}`
269
+ if cmd.empty?
270
+ say "'pod' command not available in PATH and '#{install_command}' command not available in PATH to install cocoapods."
267
271
  exit(-1)
268
272
  end
269
273
 
270
- install = confirm "'pod' command not available in PATH. Install cocoapods (may require a sudo password)?", true
274
+ sudo = install_cmd == :brew || File.writable?(Gem.dir) ? "" : "sudo "
275
+ sudo_warning = sudo.blank? ? "" : " (requires a sudo password)"
276
+
277
+ install = confirm "'pod' command not available in PATH. Install cocoapods#{sudo_warning}?", true
271
278
  unless install
279
+ # TODO: There are times that --no-add-sdk is not available or doesn't avoid the need.
272
280
  say "Please install cocoapods or use --no-add-sdk to continue."
273
281
  exit(-1)
274
282
  end
275
283
 
276
- gem_home = Gem.dir
277
- if gem_home && File.writable?(gem_home)
278
- sh "gem install cocoapods"
279
- else
280
- sh "sudo gem install cocoapods"
281
- end
284
+ sh "#{sudo}#{install_cmd} install cocoapods"
282
285
 
283
286
  # Ensure master podspec repo is set up (will update if it exists).
284
287
  sh "pod setup"
data/lib/branch_io_cli/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BranchIOCLI
2
- VERSION = "0.12.7"
2
+ VERSION = "0.12.8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: branch_io_cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.7
4
+ version: 0.12.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Branch
@@ -9,50 +9,50 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-12-26 00:00:00.000000000 Z
12
+ date: 2017-12-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: CFPropertyList
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ">="
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '0'
20
+ version: '2.3'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ">="
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
- version: '0'
27
+ version: '2.3'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: cocoapods-core
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ">="
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '0'
34
+ version: '1.3'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ">="
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '0'
41
+ version: '1.3'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: commander
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ">="
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '0'
48
+ version: '4.4'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ">="
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '0'
55
+ version: '4.4'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: pattern_patch
58
58
  requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,9 @@ dependencies:
60
60
  - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: 0.5.4
63
+ - - "~>"
64
+ - !ruby/object:Gem::Version
65
+ version: '0.5'
63
66
  type: :runtime
64
67
  prerelease: false
65
68
  version_requirements: !ruby/object:Gem::Requirement
@@ -67,174 +70,177 @@ dependencies:
67
70
  - - ">="
68
71
  - !ruby/object:Gem::Version
69
72
  version: 0.5.4
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '0.5'
70
76
  - !ruby/object:Gem::Dependency
71
77
  name: plist
72
78
  requirement: !ruby/object:Gem::Requirement
73
79
  requirements:
74
- - - ">="
80
+ - - "~>"
75
81
  - !ruby/object:Gem::Version
76
- version: '0'
82
+ version: '3.3'
77
83
  type: :runtime
78
84
  prerelease: false
79
85
  version_requirements: !ruby/object:Gem::Requirement
80
86
  requirements:
81
- - - ">="
87
+ - - "~>"
82
88
  - !ruby/object:Gem::Version
83
- version: '0'
89
+ version: '3.3'
84
90
  - !ruby/object:Gem::Dependency
85
91
  name: rubyzip
86
92
  requirement: !ruby/object:Gem::Requirement
87
93
  requirements:
88
- - - ">="
94
+ - - "~>"
89
95
  - !ruby/object:Gem::Version
90
- version: '0'
96
+ version: '1.1'
91
97
  type: :runtime
92
98
  prerelease: false
93
99
  version_requirements: !ruby/object:Gem::Requirement
94
100
  requirements:
95
- - - ">="
101
+ - - "~>"
96
102
  - !ruby/object:Gem::Version
97
- version: '0'
103
+ version: '1.1'
98
104
  - !ruby/object:Gem::Dependency
99
105
  name: xcodeproj
100
106
  requirement: !ruby/object:Gem::Requirement
101
107
  requirements:
102
- - - ">="
108
+ - - "~>"
103
109
  - !ruby/object:Gem::Version
104
- version: '0'
110
+ version: '1.4'
105
111
  type: :runtime
106
112
  prerelease: false
107
113
  version_requirements: !ruby/object:Gem::Requirement
108
114
  requirements:
109
- - - ">="
115
+ - - "~>"
110
116
  - !ruby/object:Gem::Version
111
- version: '0'
117
+ version: '1.4'
112
118
  - !ruby/object:Gem::Dependency
113
119
  name: bundler
114
120
  requirement: !ruby/object:Gem::Requirement
115
121
  requirements:
116
- - - ">="
122
+ - - "~>"
117
123
  - !ruby/object:Gem::Version
118
- version: '0'
124
+ version: '1.15'
119
125
  type: :development
120
126
  prerelease: false
121
127
  version_requirements: !ruby/object:Gem::Requirement
122
128
  requirements:
123
- - - ">="
129
+ - - "~>"
124
130
  - !ruby/object:Gem::Version
125
- version: '0'
131
+ version: '1.15'
126
132
  - !ruby/object:Gem::Dependency
127
133
  name: cocoapods
128
134
  requirement: !ruby/object:Gem::Requirement
129
135
  requirements:
130
- - - ">="
136
+ - - "~>"
131
137
  - !ruby/object:Gem::Version
132
- version: '0'
138
+ version: '1.3'
133
139
  type: :development
134
140
  prerelease: false
135
141
  version_requirements: !ruby/object:Gem::Requirement
136
142
  requirements:
137
- - - ">="
143
+ - - "~>"
138
144
  - !ruby/object:Gem::Version
139
- version: '0'
145
+ version: '1.3'
140
146
  - !ruby/object:Gem::Dependency
141
147
  name: pry
142
148
  requirement: !ruby/object:Gem::Requirement
143
149
  requirements:
144
- - - ">="
150
+ - - "~>"
145
151
  - !ruby/object:Gem::Version
146
- version: '0'
152
+ version: '0.11'
147
153
  type: :development
148
154
  prerelease: false
149
155
  version_requirements: !ruby/object:Gem::Requirement
150
156
  requirements:
151
- - - ">="
157
+ - - "~>"
152
158
  - !ruby/object:Gem::Version
153
- version: '0'
159
+ version: '0.11'
154
160
  - !ruby/object:Gem::Dependency
155
161
  name: rake
156
162
  requirement: !ruby/object:Gem::Requirement
157
163
  requirements:
158
- - - ">="
164
+ - - "<"
159
165
  - !ruby/object:Gem::Version
160
- version: '0'
166
+ version: '13'
161
167
  type: :development
162
168
  prerelease: false
163
169
  version_requirements: !ruby/object:Gem::Requirement
164
170
  requirements:
165
- - - ">="
171
+ - - "<"
166
172
  - !ruby/object:Gem::Version
167
- version: '0'
173
+ version: '13'
168
174
  - !ruby/object:Gem::Dependency
169
175
  name: rspec
170
176
  requirement: !ruby/object:Gem::Requirement
171
177
  requirements:
172
- - - ">="
178
+ - - "~>"
173
179
  - !ruby/object:Gem::Version
174
- version: '0'
180
+ version: '3.5'
175
181
  type: :development
176
182
  prerelease: false
177
183
  version_requirements: !ruby/object:Gem::Requirement
178
184
  requirements:
179
- - - ">="
185
+ - - "~>"
180
186
  - !ruby/object:Gem::Version
181
- version: '0'
187
+ version: '3.5'
182
188
  - !ruby/object:Gem::Dependency
183
189
  name: rspec-simplecov
184
190
  requirement: !ruby/object:Gem::Requirement
185
191
  requirements:
186
- - - ">="
192
+ - - "~>"
187
193
  - !ruby/object:Gem::Version
188
- version: '0'
194
+ version: '0.2'
189
195
  type: :development
190
196
  prerelease: false
191
197
  version_requirements: !ruby/object:Gem::Requirement
192
198
  requirements:
193
- - - ">="
199
+ - - "~>"
194
200
  - !ruby/object:Gem::Version
195
- version: '0'
201
+ version: '0.2'
196
202
  - !ruby/object:Gem::Dependency
197
203
  name: rspec_junit_formatter
198
204
  requirement: !ruby/object:Gem::Requirement
199
205
  requirements:
200
- - - ">="
206
+ - - "~>"
201
207
  - !ruby/object:Gem::Version
202
- version: '0'
208
+ version: '0.3'
203
209
  type: :development
204
210
  prerelease: false
205
211
  version_requirements: !ruby/object:Gem::Requirement
206
212
  requirements:
207
- - - ">="
213
+ - - "~>"
208
214
  - !ruby/object:Gem::Version
209
- version: '0'
215
+ version: '0.3'
210
216
  - !ruby/object:Gem::Dependency
211
217
  name: rubocop
212
218
  requirement: !ruby/object:Gem::Requirement
213
219
  requirements:
214
220
  - - '='
215
221
  - !ruby/object:Gem::Version
216
- version: 0.52.0
222
+ version: 0.50.0
217
223
  type: :development
218
224
  prerelease: false
219
225
  version_requirements: !ruby/object:Gem::Requirement
220
226
  requirements:
221
227
  - - '='
222
228
  - !ruby/object:Gem::Version
223
- version: 0.52.0
229
+ version: 0.50.0
224
230
  - !ruby/object:Gem::Dependency
225
231
  name: simplecov
226
232
  requirement: !ruby/object:Gem::Requirement
227
233
  requirements:
228
- - - ">="
234
+ - - "~>"
229
235
  - !ruby/object:Gem::Version
230
- version: '0'
236
+ version: '0.15'
231
237
  type: :development
232
238
  prerelease: false
233
239
  version_requirements: !ruby/object:Gem::Requirement
234
240
  requirements:
235
- - - ">="
241
+ - - "~>"
236
242
  - !ruby/object:Gem::Version
237
- version: '0'
243
+ version: '0.15'
238
244
  description: Set up mobile app projects (currently iOS only) to use the Branch SDK
239
245
  without opening Xcode. Validate the Universal Link settings for any project.
240
246
  email:
@@ -347,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
347
353
  requirements:
348
354
  - - ">="
349
355
  - !ruby/object:Gem::Version
350
- version: '0'
356
+ version: 2.0.0
351
357
  required_rubygems_version: !ruby/object:Gem::Requirement
352
358
  requirements:
353
359
  - - ">="