firespring_dev_commands 2.1.7.pre.alpha.1 → 2.1.8
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 56b724b0a6f7c0ab20b780894cc5c312fe545efb7a0460801bdde3fd25ea5d0c
|
4
|
+
data.tar.gz: 940ff9bff43521dbc47be595adb02cc369ec7e0e1f70c0ea1361ecf0f32a796f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3faa331db0c214a38e4d17c352f86c4978e2813985111b59b1e43fc7a775907e7bf1fe178ccfbd2df275933345a16fe4882c99ac6a9779e8dee877a66143b0e5
|
7
|
+
data.tar.gz: 0e5da5e49aa2664c7fb678cd4cd11c37d85a4787c3aa91210022f1d20f1084109815cb3e875729c81932eb074a1f81b3372eb9e5f21c41a3ddeb2caae921669e
|
@@ -41,7 +41,7 @@ module Dev
|
|
41
41
|
# If the user answers 'y' then the block is executed.
|
42
42
|
# If the user answers 'n' then the block is skipped.
|
43
43
|
def with_confirmation(message, default = 'y', color_message: true)
|
44
|
-
message = "\n #{message}?
|
44
|
+
message = "\n #{message}" << '? '.light_green
|
45
45
|
message = message.light_green if color_message
|
46
46
|
print message
|
47
47
|
print '('.light_green << 'y'.light_yellow << '/'.light_green << 'n'.light_yellow << ') '.light_green
|
@@ -203,7 +203,7 @@ module Dev
|
|
203
203
|
|
204
204
|
# Checks out the given branch in the given repo
|
205
205
|
# Defaults to the current directory
|
206
|
-
def checkout(branch, dir: default_project_dir)
|
206
|
+
def checkout(branch, dir: default_project_dir, raise_errors: false)
|
207
207
|
raise 'branch is required' if branch.to_s.strip.empty?
|
208
208
|
return unless File.exist?(dir)
|
209
209
|
|
@@ -224,12 +224,14 @@ module Dev
|
|
224
224
|
indent g.pull('origin', actual_branch)
|
225
225
|
true
|
226
226
|
rescue ::Git::GitExecuteError => e
|
227
|
+
raise e if raise_errors
|
228
|
+
|
227
229
|
print_errors(e.message)
|
228
230
|
false
|
229
231
|
end
|
230
232
|
|
231
233
|
# Create the given branch in the given repo
|
232
|
-
def create_branch(branch, dir: default_project_dir)
|
234
|
+
def create_branch(branch, dir: default_project_dir, raise_errors: false)
|
233
235
|
raise 'branch is required' if branch.to_s.strip.empty?
|
234
236
|
raise "refusing to create protected branch '#{branch}'" if %w(master develop).any?(branch.to_s.strip)
|
235
237
|
return unless File.exist?(dir)
|
@@ -240,7 +242,7 @@ module Dev
|
|
240
242
|
g = ::Git.open(dir)
|
241
243
|
g.fetch('origin', prune: true)
|
242
244
|
|
243
|
-
puts "Fetching the latest changes for base branch #{staging_branch}"
|
245
|
+
puts "Fetching the latest changes for base branch \"#{staging_branch}\""
|
244
246
|
g.checkout(staging_branch)
|
245
247
|
g.pull('origin', staging_branch)
|
246
248
|
|
@@ -251,6 +253,19 @@ module Dev
|
|
251
253
|
g.config("branch.#{branch}.merge", "refs/heads/#{branch}")
|
252
254
|
puts
|
253
255
|
rescue ::Git::GitExecuteError => e
|
256
|
+
raise e if raise_errors
|
257
|
+
|
258
|
+
print_errors(e.message)
|
259
|
+
false
|
260
|
+
end
|
261
|
+
|
262
|
+
def add(*paths, dir: default_project_dir, raise_errors: false)
|
263
|
+
g = ::Git.open(dir)
|
264
|
+
indent g.add(paths)
|
265
|
+
true
|
266
|
+
rescue ::Git::GitExecuteError => e
|
267
|
+
raise e if raise_errors
|
268
|
+
|
254
269
|
print_errors(e.message)
|
255
270
|
false
|
256
271
|
end
|
@@ -277,7 +292,7 @@ module Dev
|
|
277
292
|
end
|
278
293
|
|
279
294
|
# Merge the given branch into the given repo
|
280
|
-
def merge(branch, dir: default_project_dir)
|
295
|
+
def merge(branch, dir: default_project_dir, raise_errors: false)
|
281
296
|
raise 'branch is required' if branch.to_s.strip.empty?
|
282
297
|
return unless File.exist?(dir)
|
283
298
|
|
@@ -296,6 +311,8 @@ module Dev
|
|
296
311
|
indent g.merge(branch)
|
297
312
|
true
|
298
313
|
rescue ::Git::GitExecuteError => e
|
314
|
+
raise e if raise_errors
|
315
|
+
|
299
316
|
print_errors(e.message)
|
300
317
|
false
|
301
318
|
end
|
@@ -320,7 +337,7 @@ module Dev
|
|
320
337
|
end
|
321
338
|
|
322
339
|
# Pull the given repo
|
323
|
-
def pull(dir: default_project_dir)
|
340
|
+
def pull(dir: default_project_dir, raise_errors: false)
|
324
341
|
return unless File.exist?(dir)
|
325
342
|
|
326
343
|
g = ::Git.open(dir)
|
@@ -331,6 +348,8 @@ module Dev
|
|
331
348
|
indent g.pull('origin', branch)
|
332
349
|
true
|
333
350
|
rescue ::Git::GitExecuteError => e
|
351
|
+
raise e if raise_errors
|
352
|
+
|
334
353
|
print_errors(e.message)
|
335
354
|
false
|
336
355
|
end
|
@@ -355,7 +374,7 @@ module Dev
|
|
355
374
|
end
|
356
375
|
|
357
376
|
# Push the given repo
|
358
|
-
def push(dir: default_project_dir)
|
377
|
+
def push(dir: default_project_dir, raise_errors: false)
|
359
378
|
return unless File.exist?(dir)
|
360
379
|
|
361
380
|
g = ::Git.open(dir)
|
@@ -366,6 +385,8 @@ module Dev
|
|
366
385
|
indent g.push('origin', branch)
|
367
386
|
true
|
368
387
|
rescue ::Git::GitExecuteError => e
|
388
|
+
raise e if raise_errors
|
389
|
+
|
369
390
|
print_errors(e.message)
|
370
391
|
false
|
371
392
|
end
|
@@ -378,7 +399,7 @@ module Dev
|
|
378
399
|
# Clones the repo_name into the dir
|
379
400
|
# Optionally specify a repo_org
|
380
401
|
# Optionally specify a branch to check out (defaults to the repository default branch)
|
381
|
-
def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil)
|
402
|
+
def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil, depth: nil)
|
382
403
|
if Dir.exist?("#{dir}/.git")
|
383
404
|
puts "#{dir} already cloned".light_green
|
384
405
|
return
|
@@ -390,6 +411,7 @@ module Dev
|
|
390
411
|
|
391
412
|
opts = {}
|
392
413
|
opts[:branch] = branch unless branch.to_s.strip.empty?
|
414
|
+
opts[:depth] = depth unless depth.to_s.strip.empty?
|
393
415
|
g = ::Git.clone(ssh_repo_url(repo_name, repo_org), dir, opts)
|
394
416
|
g.fetch('origin', prune: true)
|
395
417
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: firespring_dev_commands
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Firespring
|
@@ -333,9 +333,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
333
333
|
version: '3.1'
|
334
334
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
335
335
|
requirements:
|
336
|
-
- - "
|
336
|
+
- - ">="
|
337
337
|
- !ruby/object:Gem::Version
|
338
|
-
version:
|
338
|
+
version: '0'
|
339
339
|
requirements: []
|
340
340
|
rubygems_version: 3.4.10
|
341
341
|
signing_key:
|