ninny 0.1.22.1 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9be2af9c2deea5ba48bd481e6794ed11a8cef1cb536f48bcd54f1b99ecd6dac5
-  data.tar.gz: bd22be9b4a66726fb53ed6b574a866cb4d33607bd731df6c49c080aac256f590
+  metadata.gz: 5a614b015ac474fd395e35795ac14c7a272c8bb434760f80279e6cdfb7605c5a
+  data.tar.gz: 2d06f802a0d90eef99918318b1b83dcdd622fd8f071b232585cad542d89345aa
 SHA512:
-  metadata.gz: 514db127a0cd2c2ab06302367b9707a6b29423b22734bbfc2652671f2438dfe4b2bdf10c2f7e8f6b2c24920c12dbfdda8895ccf1557621e1928f2806c5f44a49
-  data.tar.gz: ac716fccea27a63fbe1d1a53c7de6856cadfd09284dbe2093d6aafe1020cb72817ddada610c4ac9cddc1c29cb8235ebdf58bd42466805ccf6401e59310cd4703
+  metadata.gz: 283756965f579f7e23d23e7d0bf2cd86352ccae4423da58cb14ad6cbe42bfab3fc2499dff0bed10ad83f27ddf20947df9175236b6d9c9109e20db54d04d0165e
+  data.tar.gz: d0ed10e2d8abf24a94b7e76c92136664fcf83c00ff815f4ccb97a0b1e0b94a7478eaf10de776aea65fba4b656784f45f372c794b9f8905de4ff7a4b5f49277cd

data/lib/ninny/commands/create_dated_branch.rb

@@ -38,7 +38,7 @@ module Ninny
       def delete_old_branches
         return unless extra_branches.any?
 
-        should_delete = should_delete_old_branches || prompt.yes?(
+        should_delete = should_delete_old_branches || prompt.no?(
           "Do you want to delete the old #{branch_type} branch(es)? (#{extra_branches.join(', ')})"
         )
 

data/lib/ninny/commands/pull_request_merge.rb

@@ -46,8 +46,8 @@ module Ninny
         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
+        prompt.say "Could not find a #{branch_type} branch. Please create one or double check it exists. If it " \
+                   'exists, please do a fresh git pull or git fetch to ensure Ninny can find it.'
       end
 
       # Public: Merge the pull request's branch into the checked-out branch

data/lib/ninny/git.rb

@@ -138,7 +138,8 @@ module Ninny
     #
     # Returns an Array of Branches containing the branch name
     def latest_branch_for(prefix)
-      branches_for(prefix).last || raise(NoBranchOfType, "No #{prefix} branch")
+      # I don't really see why the first part would break, and the second would work, but you never know
+      branches_for(prefix).last || Ninny.git.branches_for(prefix).last || raise(NoBranchOfType, "No #{prefix} branch")
     end
 
     # Public: Whether the Git index is clean (has no uncommited changes)

data/lib/ninny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ninny
-  VERSION = '0.1.22.1'
+  VERSION = '0.1.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.22.1
+  version: 0.1.23
 platform: ruby
 authors:
 - DispatchIt, Inc. Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git