bard 0.55.0 → 0.56.0
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 +4 -4
- data/lib/bard/git.rb +11 -3
- data/lib/bard/version.rb +1 -1
- data/lib/bard.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e3317e259bb381214d5b61c3813055bdd55c2be030d9867e7910fcfa91a5177d
|
|
4
|
+
data.tar.gz: 5e11367f99e7f86889f9302a61d41720f6cf987f11c342389a65971a687f6b58
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 938fd14dd007599afa2d35e6f12bc687bd7dd95e66e49eb972819b4a6dedc34222e8cac61b8dc4248e24373c8749efc4f9f18b6db00298922fc93aa41f6618fb
|
|
7
|
+
data.tar.gz: 2502c3f75458d951ce17dae65b53b1ad1e222f9638f6d8c9efd9baf2d40929ea398793c823a502c9be6830b90a199bf24d0ec468c3e3044a28c6c7b696e29973
|
data/lib/bard/git.rb
CHANGED
|
@@ -8,14 +8,22 @@ module Bard::CLI::Git
|
|
|
8
8
|
end
|
|
9
9
|
|
|
10
10
|
def current_sha
|
|
11
|
-
|
|
11
|
+
sha_of("HEAD")
|
|
12
12
|
end
|
|
13
13
|
|
|
14
14
|
def fast_forward_merge?(root, branch)
|
|
15
|
-
root_head =
|
|
16
|
-
branch_head =
|
|
15
|
+
root_head = sha_of(root)
|
|
16
|
+
branch_head = sha_of(branch)
|
|
17
17
|
common_ancestor = `git merge-base #{root_head} #{branch_head}`.chomp
|
|
18
18
|
common_ancestor == root_head
|
|
19
19
|
end
|
|
20
|
+
|
|
21
|
+
def up_to_date_with_remote? branch
|
|
22
|
+
sha_of(branch) == sha_of("origin/#{branch}")
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
def sha_of ref
|
|
26
|
+
`git rev-parse #{ref}`.chomp
|
|
27
|
+
end
|
|
20
28
|
end
|
|
21
29
|
|
data/lib/bard/version.rb
CHANGED
data/lib/bard.rb
CHANGED
|
@@ -40,7 +40,7 @@ class Bard::CLI < Thor
|
|
|
40
40
|
branch = Git.current_branch
|
|
41
41
|
|
|
42
42
|
if branch == "master"
|
|
43
|
-
run_crucial "git push origin
|
|
43
|
+
run_crucial "git push origin #{branch}:#{branch}" if !Git.up_to_date_with_remote?(branch)
|
|
44
44
|
invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
|
|
45
45
|
|
|
46
46
|
else
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bard
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.56.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Micah Geisel
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-01-
|
|
11
|
+
date: 2024-01-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: thor
|
|
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
179
179
|
- !ruby/object:Gem::Version
|
|
180
180
|
version: '0'
|
|
181
181
|
requirements: []
|
|
182
|
-
rubygems_version: 3.
|
|
182
|
+
rubygems_version: 3.5.4
|
|
183
183
|
signing_key:
|
|
184
184
|
specification_version: 4
|
|
185
185
|
summary: CLI to automate common development tasks.
|