ninny 0.1.3 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a17662c1c2ef0bb98f982f5c463ffd6801e92c39433f58b744384bed0d34389c
-  data.tar.gz: d4966ce3533cf81411be4433b20e3684daf31d2b610ac2073f1f564f488577ba
+  metadata.gz: 6ff0bd65af72ed9501d51694e425da8f51dd787c71a2921a697cf6670b411e4d
+  data.tar.gz: 2e354a4951b3a7171a51b740a1c48a40ab58def31d5b1d7474a9db4d2093bb54
 SHA512:
-  metadata.gz: 6b0e1e47db683db36036c7a43cc122a13ba280caf2f1bc63474c2950422b2c9ca0c873f096712b23946678e7018e3eafc71dc6218b64e0b3000b99eb841992bf
-  data.tar.gz: cb4133dedc6165482306b1a1bf30679d024448f336dfcdac697a8d9060b287b7c3b79b954ac33e5048e8097ecc25bdffbb06fafbebc2728a86c0ee0b1a7ff7f4
+  metadata.gz: fb91d7c29d7014517d1de0378eea04978a7942aac3d954e47b1caa5183face95ce8e2c215675c81f8c2090acf56185cd9235563d23d2321fe88b6f09c1799e7a
+  data.tar.gz: 290120900419245c0049375e1f1ea83573051bcb87e3a2992a81ab9e2c9638e66da60951e0068d99b263c8ef8b461332a2b681eec021caaa5e594c57f7d0934c

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ninny (0.1.3)
+    ninny (0.1.9)
       git (~> 1.5.0)
-      gitlab (~> 4.11.0)
+      gitlab (~> 4.11)
       pastel (~> 0.7.2)
-      thor (~> 0.20.0)
+      thor (< 2)
       tty-box (~> 0.3.0)
       tty-color (~> 0.4)
       tty-command (~> 0.8.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
-        Ninny.git.check_out(branch_to_merge_into)
+        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
-        command 'merge', '--no-ff', "origin/#{branch_name}"
+        command 'merge', ['--no-ff', "origin/#{branch_name}"]
         raise MergeFailed unless clean?
         push
       end
@@ -65,12 +67,21 @@ module Ninny
     def check_out(branch, do_after_pull=true)
       git.fetch
       branch.checkout
-      git.pull if do_after_pull
+      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

data/lib/ninny/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ninny
-  VERSION = "0.1.3"
+  VERSION = "0.1.9"
 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)
@@ -58,10 +60,10 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "tty-which", "~> 0.4"
 
   spec.add_dependency "pastel", "~> 0.7.2"
-  spec.add_dependency "thor", "~> 0.20.0"
+  spec.add_dependency "thor", "< 2"
 
   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.3
+  version: 0.1.9
 platform: ruby
 authors:
 - Carl Allen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -98,16 +98,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -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.4
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'
 test_files: []