t1k 3.0.3 → 3.0.4
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/t1k/commands/sink.rb +8 -21
- data/lib/t1k/version.rb +1 -1
- data/spec/t1k/commands/pull_request_spec.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b0ac343a1d40e6f6f93980ed30e9433d8e757227
|
|
4
|
+
data.tar.gz: 6e1d04961678159cc4b08bb77106ff78b3942dae
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: da789a64807229b32351d755970695f01a25db78b68c3a566b9d26250bbddde707c88903220be0264fb8851d52235ae40eaa4e6bee8dd2a2d1e72920036616c9
|
|
7
|
+
data.tar.gz: b1040d4d332a51750dbe50a7e4644a6d9bd6ba15cfa108444d56669f294342549721dcd191266db2045df5d4c1a24c18556edabf8693c9a6e59579dc90e3b0b6
|
data/lib/t1k/commands/sink.rb
CHANGED
|
@@ -3,32 +3,19 @@ module T1k
|
|
|
3
3
|
class Sink
|
|
4
4
|
def self.run
|
|
5
5
|
T1k.setup_credentials
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
branch = T1k::Commands::Branch.actual_branch
|
|
9
|
-
|
|
10
|
-
if default_remote_branch == :master
|
|
11
|
-
commands_if_master(branch)
|
|
12
|
-
elsif default_remote_branch == :branch
|
|
13
|
-
commands_if_branch(branch)
|
|
14
|
-
else
|
|
15
|
-
puts "Invalid default_remote_branch"
|
|
16
|
-
end
|
|
6
|
+
branch = T1k::Commands::Branch.actual_branch
|
|
7
|
+
self.rebasing(branch)
|
|
17
8
|
end
|
|
18
9
|
|
|
19
|
-
def self.
|
|
20
|
-
[
|
|
10
|
+
def self.rebasing(branch)
|
|
11
|
+
[
|
|
12
|
+
"git checkout master",
|
|
21
13
|
"git pull --rebase origin master",
|
|
22
|
-
"git checkout #{branch.strip}",
|
|
23
|
-
"git rebase master"
|
|
24
|
-
].each do |cmd|
|
|
25
|
-
system cmd
|
|
26
|
-
end
|
|
27
|
-
end
|
|
28
14
|
|
|
29
|
-
|
|
30
|
-
[ "git checkout #{branch}",
|
|
15
|
+
"git checkout #{branch}",
|
|
31
16
|
"git pull --rebase origin #{branch}",
|
|
17
|
+
|
|
18
|
+
"git merge master"
|
|
32
19
|
].each do |cmd|
|
|
33
20
|
system cmd
|
|
34
21
|
end
|
data/lib/t1k/version.rb
CHANGED
|
@@ -21,6 +21,7 @@ describe T1k::Commands::PullRequest do
|
|
|
21
21
|
"git checkout master",
|
|
22
22
|
"git pull --rebase origin master",
|
|
23
23
|
"git checkout branch_name",
|
|
24
|
+
"git pull --rebase origin branch_name",
|
|
24
25
|
"git rebase master"
|
|
25
26
|
].each do |cmd|
|
|
26
27
|
allow_any_instance_of(Kernel).to receive(:system).with( cmd )
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: t1k
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.0.
|
|
4
|
+
version: 3.0.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Rodrigo Maia
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2016-09-
|
|
13
|
+
date: 2016-09-21 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: bundler
|