ninny 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb254fc2d80a03a8a2fe7cd6c9eef06eebcefd7d58df1e648ef30103c7fd34a
-  data.tar.gz: 9a7822d0ceddac325c321738b5e71774cd2d190e3e7a312601159a2fca322e72
+  metadata.gz: b660493847540b6a1611db7849ebe2981751779f15aeb60cd51f9c877c397ab9
+  data.tar.gz: 186d42895b074fd945d6ab77f23579e22e7a6f8be8319949f8db19ffafd257fa
 SHA512:
-  metadata.gz: 7e6e88099872539c132668e38994d5b4e4ddbb0533ff002cec676a8940f7763bb7f0586053364d00ba9337abc4807c2a21d6388f61baa825f47614dae21d6a54
-  data.tar.gz: ef3426925522993daaeef71280e80964177ca50280af4d27807b5cc7d96fb50d649513dd32a79880b3c2eddcdf287dc41d82c9be70ce67811f06ef83e37b96d2
+  metadata.gz: be51050989521c8280c922c062bfdc6a51bada35ab02bfa3e80f7aa3c1d7a79ad34e86afec150d718aee37d7c69cf25976994ae47381cf778ceea6d3a91ed10f
+  data.tar.gz: 87d8572c26c58dd23fe6bd5ebd312e556544ec8749afb76ea0a21d0c6a3e19e8569016653decce77062be121f9e27766fa5be85176b4e422dc68e650e002fa13

data/.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
       packages: write
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: docker/login-action@v1
       with:
         registry: ${{ env.REGISTRY }}

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.7.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.32.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.2

data/Dockerfile

@@ -1,3 +1,3 @@
-FROM ruby:3.1.1-alpine
+FROM ruby:3.1.2-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'
 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
-- Dispatch Engineers
+- DispatchIt, Inc. Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git