ninny 0.1.22.1 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9be2af9c2deea5ba48bd481e6794ed11a8cef1cb536f48bcd54f1b99ecd6dac5
-  data.tar.gz: bd22be9b4a66726fb53ed6b574a866cb4d33607bd731df6c49c080aac256f590
+  metadata.gz: 01f0f59fc7d103c7284a6866f82ff1463f3f53f36524fcdc16a3d638ab6e3174
+  data.tar.gz: 867dfb562f0b3844e99dcbe1150784734928f2d7e04aac9d5b4c94f4c06aeadf
 SHA512:
-  metadata.gz: 514db127a0cd2c2ab06302367b9707a6b29423b22734bbfc2652671f2438dfe4b2bdf10c2f7e8f6b2c24920c12dbfdda8895ccf1557621e1928f2806c5f44a49
-  data.tar.gz: ac716fccea27a63fbe1d1a53c7de6856cadfd09284dbe2093d6aafe1020cb72817ddada610c4ac9cddc1c29cb8235ebdf58bd42466805ccf6401e59310cd4703
+  metadata.gz: f363956d9e73153283638d43521fa3978673035dc439e0137dee72e026f1a6862e30f9466df1fdc7d3c38b90f1f0adcf8ff9c1ee65efd7ab260fc3d0019dbd19
+  data.tar.gz: c5f44356f15ca4bc02651788213629016d5e94ff5a2f7a9ea82ef01c8320c7f6df90f3aa9c4f5988ee645078176dcb4e2a24190e71bfeb1c8b42df02faab5c16

data/.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, 3.0, 3.1]
+        ruby: [2.6, 2.7, 3.0, 3.1, 3.2]
     steps:
     - uses: actions/checkout@v3
       with:
@@ -31,7 +31,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: HeRoMo/pronto-action@v1.40.0
+    - uses: HeRoMo/pronto-action@1.43.1
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
   gitleaks:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   Exclude:
     - vendor/**/*
 

data/.ruby-version

@@ -1 +1 @@
-3.1.3
+3.2.0

data/Dockerfile

@@ -1,3 +1,3 @@
-FROM ruby:3.1.3-alpine
+FROM ruby:3.2.0-alpine
 RUN apk add git
 RUN gem install ninny

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-# Specify your gem's dependencies in ninny.gemspec
+gem 'rugged', github: 'libgit2/rugged', submodules: true
 gem 'tty'
+
+# Specify your gem's dependencies in ninny.gemspec
 gemspec

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

@@ -39,7 +39,7 @@ module Ninny
     def merge(branch_name)
       if_clean do
         `git fetch --prune &> /dev/null`
-        command 'merge', ['--no-ff', "origin/#{branch_name}"]
+        command('merge', '--no-ff', "origin/#{branch_name}")
         raise MergeFailed unless clean?
 
         push
@@ -75,7 +75,7 @@ module Ninny
     #
     # 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}"])
+      command('branch', '-u', "origin/#{current_branch_name}")
       pull if do_after_pull
     end
 
@@ -85,7 +85,7 @@ module Ninny
     # source_branch_name - The name of the branch to branch from
     def new_branch(new_branch_name, source_branch_name)
       `git fetch --prune &> /dev/null`
-      remote_branches = command('branch', ['--remote'])
+      remote_branches = command('branch', '--remote')
 
       if remote_branches.include?("origin/#{new_branch_name}")
         ask_to_recreate_branch(new_branch_name, source_branch_name)
@@ -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)
@@ -190,10 +191,10 @@ module Ninny
     # new_branch_name: the name of the branch in question
     # source_branch_name: the name of the branch the new branch is supposed to be based off of
     private def create_branch(new_branch_name, source_branch_name)
-      command('branch', ['--no-track', new_branch_name, "origin/#{source_branch_name}"])
+      command('branch', '--no-track', new_branch_name, "origin/#{source_branch_name}")
       new_branch = branch(new_branch_name)
       new_branch.checkout
-      command('push', ['-u', 'origin', new_branch_name])
+      command('push', '-u', 'origin', new_branch_name)
     end
 
     # Exceptions

data/lib/ninny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ninny
-  VERSION = '0.1.22.1'
+  VERSION = '0.1.24'
 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.24
 platform: ruby
 authors:
 - DispatchIt, Inc. Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'