ninny 0.1.21 → 0.1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb254fc2d80a03a8a2fe7cd6c9eef06eebcefd7d58df1e648ef30103c7fd34a
-  data.tar.gz: 9a7822d0ceddac325c321738b5e71774cd2d190e3e7a312601159a2fca322e72
+  metadata.gz: 9be2af9c2deea5ba48bd481e6794ed11a8cef1cb536f48bcd54f1b99ecd6dac5
+  data.tar.gz: bd22be9b4a66726fb53ed6b574a866cb4d33607bd731df6c49c080aac256f590
 SHA512:
-  metadata.gz: 7e6e88099872539c132668e38994d5b4e4ddbb0533ff002cec676a8940f7763bb7f0586053364d00ba9337abc4807c2a21d6388f61baa825f47614dae21d6a54
-  data.tar.gz: ef3426925522993daaeef71280e80964177ca50280af4d27807b5cc7d96fb50d649513dd32a79880b3c2eddcdf287dc41d82c9be70ce67811f06ef83e37b96d2
+  metadata.gz: 514db127a0cd2c2ab06302367b9707a6b29423b22734bbfc2652671f2438dfe4b2bdf10c2f7e8f6b2c24920c12dbfdda8895ccf1557621e1928f2806c5f44a49
+  data.tar.gz: ac716fccea27a63fbe1d1a53c7de6856cadfd09284dbe2093d6aafe1020cb72817ddada610c4ac9cddc1c29cb8235ebdf58bd42466805ccf6401e59310cd4703

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

@@ -15,17 +15,17 @@ jobs:
       contents: read
       packages: write
     steps:
-    - uses: actions/checkout@v2
-    - uses: docker/login-action@v1
+    - uses: actions/checkout@v3
+    - 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/scheduled.yml

@@ -7,7 +7,7 @@ jobs:
   bundler-audit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - uses: ruby/setup-ruby@v1
@@ -20,7 +20,7 @@ jobs:
   bundle-outdated:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - uses: ruby/setup-ruby@v1

data/.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 
 env:
-  GITLEAKS_VERSION: v8.2.7
+  GITLEAKS_VERSION: v8.15.1
 
 jobs:
   test:
@@ -16,7 +16,7 @@ jobs:
       matrix:
         ruby: [2.6, 2.7, 3.0, 3.1]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - uses: ruby/setup-ruby@v1
@@ -28,17 +28,17 @@ jobs:
     if: github.EVENT_NAME == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: HeRoMo/pronto-action@v1.28.0
+    - uses: HeRoMo/pronto-action@v1.40.0
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
   gitleaks:
     if: github.EVENT_NAME == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - run: |
@@ -59,6 +59,7 @@ jobs:
         options: -v ${{ github.WORKSPACE }}:/app
         run: |
           cd /app
+          git config --global --add safe.directory /app
           gitleaks detect --verbose --source='./' \
             --config='.github/workflows/official.toml' \
             --log-opts=${{ env.LOG_OPTS }}

data/.ruby-version

@@ -1 +1 @@
-3.1.1
+3.1.3

data/Dockerfile

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

data/lib/ninny/git.rb

@@ -38,7 +38,7 @@ module Ninny
 
     def merge(branch_name)
       if_clean do
-        git.fetch('-p')
+        `git fetch --prune &> /dev/null`
         command 'merge', ['--no-ff', "origin/#{branch_name}"]
         raise MergeFailed unless clean?
 
@@ -65,7 +65,7 @@ module Ninny
     # 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('-p')
+      `git fetch --prune &> /dev/null`
       git.checkout(branch)
       pull if do_after_pull
       raise CheckoutFailed, "Failed to check out '#{branch}'" unless current_branch.name == branch.name
@@ -84,7 +84,7 @@ module Ninny
     # new_branch_name - The name of the branch to create
     # source_branch_name - The name of the branch to branch from
     def new_branch(new_branch_name, source_branch_name)
-      git.fetch('-p')
+      `git fetch --prune &> /dev/null`
       remote_branches = command('branch', ['--remote'])
 
       if remote_branches.include?("origin/#{new_branch_name}")
@@ -117,7 +117,7 @@ module Ninny
     #
     # Returns an Array of Strings containing the branch names
     def remote_branches
-      git.fetch('-p')
+      `git fetch --prune &> /dev/null`
       git.branches.remote.map { |branch| git.branch(branch.name) }.sort_by(&:name)
     end
 

data/lib/ninny/version.rb

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

data/ninny.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'ninny'
   spec.license       = 'MIT'
   spec.version       = Ninny::VERSION
-  spec.authors       = ['Dispatch Engineers']
+  spec.authors       = ['DispatchIt, Inc. Engineers']
   spec.email         = ['engineers@dispatchit.com']
 
   spec.summary       = 'ninny (n): an foolish person, see: git'

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.21
+  version: 0.1.22.1
 platform: ruby
 authors:
-- Dispatch Engineers
+- DispatchIt, Inc. Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-12-15 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'