t1k 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0764df51973aececa4ea017db567b069034eed9
-  data.tar.gz: dd02b07f3c521598ac9536324f419b5e1505632b
+  metadata.gz: b0ac343a1d40e6f6f93980ed30e9433d8e757227
+  data.tar.gz: 6e1d04961678159cc4b08bb77106ff78b3942dae
 SHA512:
-  metadata.gz: 6be56803a0c99f500a513eae59564b70c0a0fea55bc03e09da0973b26cad69e449a245f0355a3959a1c9c8caefa8c7830cabc2e267df8c507127e3527917d410
-  data.tar.gz: 9d3d4fd0ea95e31e9a7d8938e37234bc06754bebd715e6cf213a90db433d8f8a54cbe40acbc57b4eb0e50b0c7236a3c793863f5ae3eaa19f22ee24dc1182df68
+  metadata.gz: da789a64807229b32351d755970695f01a25db78b68c3a566b9d26250bbddde707c88903220be0264fb8851d52235ae40eaa4e6bee8dd2a2d1e72920036616c9
+  data.tar.gz: b1040d4d332a51750dbe50a7e4644a6d9bd6ba15cfa108444d56669f294342549721dcd191266db2045df5d4c1a24c18556edabf8693c9a6e59579dc90e3b0b6

data/lib/t1k/commands/sink.rb

@@ -3,32 +3,19 @@ module T1k
     class Sink
       def self.run
         T1k.setup_credentials
-
-        default_remote_branch = T1k::Repository.default_remote_branch
-        branch                = T1k::Commands::Branch.actual_branch
-
-        if default_remote_branch == :master
-          commands_if_master(branch)
-        elsif default_remote_branch == :branch
-          commands_if_branch(branch)
-        else
-          puts "Invalid default_remote_branch"
-        end
+        branch = T1k::Commands::Branch.actual_branch
+        self.rebasing(branch)
       end
 
-      def self.commands_if_master(branch)
-        [ "git checkout master",
+      def self.rebasing(branch)
+        [
+          "git checkout master",
           "git pull --rebase origin master",
-          "git checkout #{branch.strip}",
-          "git rebase master"
-        ].each do |cmd|
-          system cmd
-        end
-      end
 
-      def self.commands_if_branch(branch)
-        [ "git checkout #{branch}",
+          "git checkout #{branch}",
           "git pull --rebase origin #{branch}",
+
+          "git merge master"
         ].each do |cmd|
           system cmd
         end

data/lib/t1k/version.rb

@@ -1,3 +1,3 @@
 module T1k
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/spec/t1k/commands/pull_request_spec.rb

@@ -21,6 +21,7 @@ describe T1k::Commands::PullRequest do
           "git checkout master",
           "git pull --rebase origin master",
           "git checkout branch_name",
+          "git pull --rebase origin branch_name",
           "git rebase master"
         ].each do |cmd|
           allow_any_instance_of(Kernel).to receive(:system).with( cmd )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t1k
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Rodrigo Maia
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler