git-daily 0.0.4 → 0.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/lib/git-daily/command.rb +1 -1
- data/lib/git-daily/command/hotfix.rb +5 -5
- data/lib/git-daily/command/init.rb +1 -1
- data/lib/git-daily/command/release.rb +2 -2
- data/lib/git-daily/version.rb +1 -1
- metadata +3 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: a517e430b7ed9c44d50b34a41c60a840c143f2848263af1cdcd6dfd53150eb21
|
4
|
+
data.tar.gz: bf15ad62c125861120ff1d2a8865abb20441d2557dc043c66d468f8650ffdd31
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e24fed8b6a859cb7c8cff11e66a40365e0a00c0c16009a7690d3d90d105157c86011a613ed9efbd93b40f66bd7ac04e06236b4e81fe8e4a0ff58f992981706c0
|
7
|
+
data.tar.gz: 2c3f02b3749f24a945499c458ce192db0d73e49c902a6fa7c25479572c871b2fae7c1553c9e6b665eee2f831bbe468211ee25eaa749e691153e33e3d3603267a
|
data/lib/git-daily/command.rb
CHANGED
@@ -7,9 +7,9 @@ module Git
|
|
7
7
|
class Hotfix < Release
|
8
8
|
|
9
9
|
def initialize
|
10
|
-
@base_branch =
|
11
|
-
@merge_to = ["master", "develop", "release"]
|
10
|
+
@base_branch = Command.master
|
12
11
|
@branch_prefix = 'hotfix'
|
12
|
+
@release_branch_prefix = 'release'
|
13
13
|
end
|
14
14
|
|
15
15
|
def help
|
@@ -17,11 +17,11 @@ module Git
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def merge_branches
|
20
|
-
rel_branches = Command.release_branches(
|
20
|
+
rel_branches = Command.release_branches(@release_branch_prefix)
|
21
21
|
if rel_branches.empty?
|
22
|
-
return [
|
22
|
+
return [Command.master, Command.develop]
|
23
23
|
else
|
24
|
-
return [
|
24
|
+
return [Command.master, @release_branch_prefix]
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
@@ -22,7 +22,7 @@ module Git
|
|
22
22
|
end
|
23
23
|
remotes = `git config --list`.split(/\n/).select {|a| a[/^remote\.([^\.]+)\.url/] }
|
24
24
|
if remotes.empty?
|
25
|
-
raise "don't have remote
|
25
|
+
raise "don't have remote repository"
|
26
26
|
end
|
27
27
|
|
28
28
|
remotes.map! {|r| r[/^remote\.([^\.]+)\.url=(.*)/, 1] }
|
@@ -14,9 +14,9 @@ module Git
|
|
14
14
|
} unless const_defined? :SUBCOMMAND
|
15
15
|
|
16
16
|
def initialize
|
17
|
-
@base_branch =
|
17
|
+
@base_branch = Command.develop
|
18
18
|
@branch_prefix = "release"
|
19
|
-
@merge_to = [
|
19
|
+
@merge_to = [Command.master, Command.develop]
|
20
20
|
end
|
21
21
|
|
22
22
|
def help
|
data/lib/git-daily/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git-daily
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Koichiro Ohba
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-11-01 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: 'git-daily on Ruby is a tool which helps you to do daily workflow easier
|
14
14
|
on Git. This is the Ruby version. The original PHP version is here: https://github.com/sotarok/git-daily'
|
@@ -62,8 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
62
62
|
- !ruby/object:Gem::Version
|
63
63
|
version: '0'
|
64
64
|
requirements: []
|
65
|
-
|
66
|
-
rubygems_version: 2.6.11
|
65
|
+
rubygems_version: 3.0.3
|
67
66
|
signing_key:
|
68
67
|
specification_version: 4
|
69
68
|
summary: git-daily on ruby is a tool which helps you to do daily workflow easier on
|