ninny 0.1.2 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e4dd9b38aa0b80d3653029755fe498ca57ef2ba468ef326ae9082dcd00d507
-  data.tar.gz: 6ae95c628aa6343ae5c7b60cd55d4a940027ca31c51d449e578f43f07a145059
+  metadata.gz: 3082655bfdf20dd399f2e6c319db64d44714d533b7cc31d5c15a131ed4407189
+  data.tar.gz: 3e00456225b143715daa81b246a0f89a6b56fd6bfe76a0700b7a861fb77902e5
 SHA512:
-  metadata.gz: 9afbd929c0b16fc9223757f4eba952ba938535dfc0b0997df5ee65c1627abfecf4135cdd1bb83224cefa89bf47c659cb96007c67b5b0524630ff75ef6c9782b6
-  data.tar.gz: 07ab07cd7f538f054178bb203195bfba2456b407b25bb1e771f8ad12f34655c837e46e8f8d6aa1e2cf57bc4a098b44a7dfcd318e87554dcf4ebad61135bea2d9
+  metadata.gz: b8334b70b6e72842ed4f53a1f1b39b649bddbe2c1506aadf6a867034c4ec1f5cd8935712fa5eaa93f45390f907cee69bda45e21dcffa473d7118b2ad5b3966c7
+  data.tar.gz: fc7ebf59fd6b62ba28a94996fca060b31727244fd3764306401cfcfa4a776934aae60299c47357417602e46665b6a36024678e8fe2d0df20b2df471c99d36480

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ninny (0.1.2)
+    ninny (0.1.8)
       git (~> 1.5.0)
-      gitlab (~> 4.11.0)
+      gitlab (~> 4.11)
       pastel (~> 0.7.2)
       thor (~> 0.20.0)
       tty-box (~> 0.3.0)
@@ -19,16 +19,16 @@ GEM
     diff-lcs (1.3)
     equatable (0.5.0)
     git (1.5.0)
-    gitlab (4.11.0)
-      httparty (~> 0.14, >= 0.14.0)
+    gitlab (4.17.0)
+      httparty (~> 0.18)
       terminal-table (~> 1.5, >= 1.5.1)
-    httparty (0.17.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     kramdown (1.16.2)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.1104)
     multi_xml (0.6.0)
     necromancer (0.4.0)
     pastel (0.7.2)

data/lib/ninny/commands/pull_request_merge.rb

@@ -33,7 +33,8 @@ module Ninny
 
      # Public: Check out the branch
       def check_out_branch
-        branch_to_merge_into.checkout
+        Ninny.git.check_out(branch_to_merge_into, false)
+        Ninny.git.track_current_branch
       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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ninny
   class Git
     extend Forwardable
@@ -38,7 +40,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 +60,28 @@ 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
+      pull if do_after_pull
+      unless current_branch.name == branch.name
+        raise CheckoutFailed, "Failed to check out '#{branch}'"
+      end
+    end
+
+    # Public: Track remote branch matching current branch
+    #
+    # do_after_pull - Should a pull be done after tracking?
+    def track_current_branch(do_after_pull=true)
+      command('branch', ['-u', "origin/#{current_branch_name}"])
+      pull if do_after_pull
+    end
+
+
     # Public: Create a new branch from the given source
     #
     # new_branch_name - The name of the branch to create
@@ -141,6 +165,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,5 @@
+# frozen_string_literal: true
+
 module Ninny
-  VERSION = "0.1.2"
+  VERSION = "0.1.8"
 end

data/ninny.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -61,7 +63,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 0.20.0"
 
   spec.add_dependency "git", "~> 1.5.0"
-  spec.add_dependency "gitlab", "~> 4.11.0"
+  spec.add_dependency "gitlab", "~> 4.11"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.8
 platform: ruby
 authors:
 - Carl Allen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: '4.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -237,11 +237,11 @@ files:
 - lib/ninny/user_config.rb
 - lib/ninny/version.rb
 - ninny.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,8 +256,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'
 test_files: []