t1k 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00fb15bd08b42750f3e4e1d68d2880ba7cee574
-  data.tar.gz: 9607d5c8562fad145232fd20bb49b4552e737bf5
+  metadata.gz: f0764df51973aececa4ea017db567b069034eed9
+  data.tar.gz: dd02b07f3c521598ac9536324f419b5e1505632b
 SHA512:
-  metadata.gz: de69ffb11d0ecfc37b6b7be7a7978bf932bd3e67c32fc56f9ea77b61dabca50fc3ea8c626cda77b31a0b227f35ec9f04ddb5572b74651c9c0edea0a58d4d3e9a
-  data.tar.gz: ef59f6ef62749d076a5d1271f41f4307fd3b18466612a7b2efe56f2f196e360315d2748d17adcfc6a27559b21e660c0c38daabd47fafbba342234e9184913d7c
+  metadata.gz: 6be56803a0c99f500a513eae59564b70c0a0fea55bc03e09da0973b26cad69e449a245f0355a3959a1c9c8caefa8c7830cabc2e267df8c507127e3527917d410
+  data.tar.gz: 9d3d4fd0ea95e31e9a7d8938e37234bc06754bebd715e6cf213a90db433d8f8a54cbe40acbc57b4eb0e50b0c7236a3c793863f5ae3eaa19f22ee24dc1182df68

data/lib/t1k/commands/ship.rb

@@ -19,7 +19,7 @@ module T1k
 
       def self.commands_if_master(branch)
         [ "git checkout master",
-          "git pull --rebase",
+          "git pull --rebase master",
           "git merge #{branch}",
           "git commit -v",
           "git push origin master"
@@ -30,7 +30,7 @@ module T1k
 
       def self.commands_if_branch(branch)
         [ "git checkout #{branch}",
-          "git pull --rebase",
+          "git pull --rebase #{branch}",
           "git commit -v",
           "git push origin #{branch}"
         ].each do |cmd|

data/lib/t1k/commands/sink.rb

@@ -20,7 +20,7 @@ module T1k
         [ "git checkout master",
           "git pull --rebase origin master",
           "git checkout #{branch.strip}",
-          "git rebase master #{branch.strip}"
+          "git rebase master"
         ].each do |cmd|
           system cmd
         end
@@ -28,7 +28,7 @@ module T1k
 
       def self.commands_if_branch(branch)
         [ "git checkout #{branch}",
-          "git pull --rebase",
+          "git pull --rebase origin #{branch}",
         ].each do |cmd|
           system cmd
         end

data/lib/t1k/version.rb

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

data/spec/t1k/commands/pull_request_spec.rb

@@ -2,7 +2,14 @@ require 'spec_helper'
 
 describe T1k::Commands::PullRequest do
   subject { T1k::Commands::PullRequest }
+
   context '#run' do
+    before do
+      T1k.setup do |config|
+        config.repository.default_remote_branch = :master
+        config.repository.adapter = :bitbucket
+      end
+    end
     it 'have to sink' do
       expect(T1k::Commands::Sink).to receive(:run)
 
@@ -14,8 +21,7 @@ describe T1k::Commands::PullRequest do
           "git checkout master",
           "git pull --rebase origin master",
           "git checkout branch_name",
-          "git rebase master branch_name",
-          "git push origin branch_name"
+          "git rebase master"
         ].each do |cmd|
           allow_any_instance_of(Kernel).to receive(:system).with( cmd )
          end

data/spec/t1k/commands/ship_spec.rb

@@ -3,19 +3,45 @@ require 'spec_helper'
 describe T1k::Commands::Ship do
   describe '#self.run' do
 
-    it "should checkout to master" do
+    context "when default_remote_branch is :master" do
+      before do
+        T1k.setup do |config|
+          config.repository.default_remote_branch = :master
+        end
+      end
+
+      it "should checkout to master" do
+        [ "git checkout master",
+          "git pull --rebase master",
+          "git merge branch_name",
+          "git commit -v",
+          "git push origin master"
+        ].each do |cmd|
+          allow_any_instance_of(Kernel).to receive(:system).with( cmd )
+        end
 
-      [
-        "git checkout master",
-        "git pull --rebase",
-        "git merge branch_name",
-        "git commit -v",
-        "git push origin master"
-      ].each do |cmd|
-        allow_any_instance_of(Kernel).to receive(:system).with( cmd )
+        T1k::Commands::Ship.run
       end
+    end
 
-      T1k::Commands::Ship.run
+    context "when default_remote_branch is :branch" do
+      before do
+        T1k.setup do |config|
+          config.repository.default_remote_branch = :branch
+        end
+      end
+
+      it "should checkout to branch_name" do
+        [ "git checkout branch_name",
+          "git pull --rebase branch_name",
+          "git commit -v",
+          "git push origin branch_name"
+        ].each do |cmd|
+          allow_any_instance_of(Kernel).to receive(:system).with( cmd )
+        end
+
+        T1k::Commands::Ship.run
+      end
     end
   end
 end

data/spec/t1k_spec.rb

@@ -14,8 +14,6 @@ describe T1k do
           T1k.setup do |config|
             config.repository.adapter = :bitbucket
           end
-
-          subject.setup_credentials
         end
 
         context 'on repository' do

metadata

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