ninny 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e4dd9b38aa0b80d3653029755fe498ca57ef2ba468ef326ae9082dcd00d507
-  data.tar.gz: 6ae95c628aa6343ae5c7b60cd55d4a940027ca31c51d449e578f43f07a145059
+  metadata.gz: a17662c1c2ef0bb98f982f5c463ffd6801e92c39433f58b744384bed0d34389c
+  data.tar.gz: d4966ce3533cf81411be4433b20e3684daf31d2b610ac2073f1f564f488577ba
 SHA512:
-  metadata.gz: 9afbd929c0b16fc9223757f4eba952ba938535dfc0b0997df5ee65c1627abfecf4135cdd1bb83224cefa89bf47c659cb96007c67b5b0524630ff75ef6c9782b6
-  data.tar.gz: 07ab07cd7f538f054178bb203195bfba2456b407b25bb1e771f8ad12f34655c837e46e8f8d6aa1e2cf57bc4a098b44a7dfcd318e87554dcf4ebad61135bea2d9
+  metadata.gz: 6b0e1e47db683db36036c7a43cc122a13ba280caf2f1bc63474c2950422b2c9ca0c873f096712b23946678e7018e3eafc71dc6218b64e0b3000b99eb841992bf
+  data.tar.gz: cb4133dedc6165482306b1a1bf30679d024448f336dfcdac697a8d9060b287b7c3b79b954ac33e5048e8097ecc25bdffbb06fafbebc2728a86c0ee0b1a7ff7f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ninny (0.1.2)
+    ninny (0.1.3)
       git (~> 1.5.0)
       gitlab (~> 4.11.0)
       pastel (~> 0.7.2)

data/lib/ninny/commands/pull_request_merge.rb

@@ -33,7 +33,7 @@ module Ninny
 
      # Public: Check out the branch
       def check_out_branch
-        branch_to_merge_into.checkout
+        Ninny.git.check_out(branch_to_merge_into)
       rescue Ninny::Git::NoBranchOfType
         prompt.say "No #{branch_type} branch available. Creating one now."
         CreateDatedBranch.new(branch: branch_type).execute

data/lib/ninny/git.rb

@@ -38,7 +38,7 @@ module Ninny
     def merge(branch_name)
       if_clean do
         git.fetch
-        current_branch.merge("origin/#{branch_name}")
+        command 'merge', '--no-ff', "origin/#{branch_name}"
         raise MergeFailed unless clean?
         push
       end
@@ -58,6 +58,19 @@ module Ninny
       end
     end
 
+    # Public: Check out the given branch name
+    #
+    # branch_name - The name of the branch to check out
+    # do_after_pull - Should a pull be done after checkout?
+    def check_out(branch, do_after_pull=true)
+      git.fetch
+      branch.checkout
+      git.pull if do_after_pull
+      unless current_branch.name == branch.name
+        raise CheckoutFailed, "Failed to check out '#{branch}'"
+      end
+    end
+
     # Public: Create a new branch from the given source
     #
     # new_branch_name - The name of the branch to create
@@ -141,6 +154,7 @@ module Ninny
 
 
     # Exceptions
+    CheckoutFailed = Class.new(StandardError)
     NotOnBranch = Class.new(StandardError)
     NoBranchOfType = Class.new(StandardError)
     DirtyIndex = Class.new(StandardError)

data/lib/ninny/version.rb

@@ -1,3 +1,3 @@
 module Ninny
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Carl Allen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'