ninny 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b660493847540b6a1611db7849ebe2981751779f15aeb60cd51f9c877c397ab9
-  data.tar.gz: 186d42895b074fd945d6ab77f23579e22e7a6f8be8319949f8db19ffafd257fa
+  metadata.gz: 5a614b015ac474fd395e35795ac14c7a272c8bb434760f80279e6cdfb7605c5a
+  data.tar.gz: 2d06f802a0d90eef99918318b1b83dcdd622fd8f071b232585cad542d89345aa
 SHA512:
-  metadata.gz: be51050989521c8280c922c062bfdc6a51bada35ab02bfa3e80f7aa3c1d7a79ad34e86afec150d718aee37d7c69cf25976994ae47381cf778ceea6d3a91ed10f
-  data.tar.gz: 87d8572c26c58dd23fe6bd5ebd312e556544ec8749afb76ea0a21d0c6a3e19e8569016653decce77062be121f9e27766fa5be85176b4e422dc68e650e002fa13
+  metadata.gz: 283756965f579f7e23d23e7d0bf2cd86352ccae4423da58cb14ad6cbe42bfab3fc2499dff0bed10ad83f27ddf20947df9175236b6d9c9109e20db54d04d0165e
+  data.tar.gz: d0ed10e2d8abf24a94b7e76c92136664fcf83c00ff815f4ccb97a0b1e0b94a7478eaf10de776aea65fba4b656784f45f372c794b9f8905de4ff7a4b5f49277cd

data/.github/issue_template.md

@@ -0,0 +1,21 @@
+<!--
+Your audience for this issue description is **other engineers**. Help them understand the technical requirements, questions, etc involved.
+-->
+
+## What's the issue?
+
+<!--
+What is wrong, or what is the reason you're making this issue? Is there a bug, general question, just want a reminder note of something, etc?
+-->
+
+## Related URLs
+
+<!--
+Links to bug tickets, user stories, or other merge requests.
+-->
+
+## Anything else people should know?
+
+<!--
+What else should readers of this issue know?  If there's a bug, how do you reproduce it and what is the expected behavior? If it's a feature request, what other solutions have you considered? Do you have any suggestions for how else to fix this issue?
+-->

data/.github/workflows/build.yml

@@ -16,16 +16,16 @@ jobs:
       packages: write
     steps:
     - uses: actions/checkout@v3
-    - uses: docker/login-action@v1
+    - uses: docker/login-action@v2
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - uses: docker/metadata-action@v3
+    - uses: docker/metadata-action@v4
       id: meta
       with:
         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-    - uses: docker/build-push-action@v2
+    - uses: docker/build-push-action@v3
       with:
         context: .
         push: true

data/.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 
 env:
-  GITLEAKS_VERSION: v8.7.1
+  GITLEAKS_VERSION: v8.15.1
 
 jobs:
   test:
@@ -31,7 +31,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: HeRoMo/pronto-action@v1.32.0
+    - uses: HeRoMo/pronto-action@v1.40.0
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
   gitleaks:

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.1.3

data/Dockerfile

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

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'
+  VERSION = '0.1.23'
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - DispatchIt, Inc. Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -270,6 +270,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
 - ".github/pull_request_template.md"
 - ".github/workflows/build.yml"
 - ".github/workflows/gitleaks.toml"
@@ -310,6 +311,7 @@ files:
 - lib/ninny/user_config.rb
 - lib/ninny/version.rb
 - ninny.gemspec
+- renovate.json
 homepage: https://github.com/dispatchitinc/ninny
 licenses:
 - MIT
@@ -330,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'