ninny 0.1.19 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb06f88a85ed100c85f035dfd512eab3a653ce976e4fccfcb75972b94b62a941
-  data.tar.gz: 624b6561506f6431afbf5e0b63963c056d028ddfaa4499397a0a943d0cafe221
+  metadata.gz: b660493847540b6a1611db7849ebe2981751779f15aeb60cd51f9c877c397ab9
+  data.tar.gz: 186d42895b074fd945d6ab77f23579e22e7a6f8be8319949f8db19ffafd257fa
 SHA512:
-  metadata.gz: b984582630919dc9b6ae834d113e3ff3adea6402cacc0051201985021634baf6b7e7aaae0987acd5a03753d29066786fd469356ab4d77f4bdb09deada6aa684c
-  data.tar.gz: 7ca0603113e71a573636d6efe74e9960d8cabbb6cbc43ed9ad25b5bc84c18dcd658098adeee60bd99b5fd81904822049ae647677e76a266fe11bc207f1c7c6a3
+  metadata.gz: be51050989521c8280c922c062bfdc6a51bada35ab02bfa3e80f7aa3c1d7a79ad34e86afec150d718aee37d7c69cf25976994ae47381cf778ceea6d3a91ed10f
+  data.tar.gz: 87d8572c26c58dd23fe6bd5ebd312e556544ec8749afb76ea0a21d0c6a3e19e8569016653decce77062be121f9e27766fa5be85176b4e422dc68e650e002fa13

data/.github/workflows/build.yml

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

data/.github/workflows/scheduled.yml

@@ -7,40 +7,23 @@ 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
       with:
-        ruby-version: 3.0
         bundler-cache: true
     - run: |
         gem install bundler-audit
         bundler-audit update
         bundler-audit
-
-        if [ $? -eq 0 ]; then
-          echo "No gem vulnerabilities found."
-        else
-          echo "Gem vulnerabilities found!"
-          exit 1
-        fi
   bundle-outdated:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
         bundler-cache: true
-    - run: |
-        bundle outdated --strict
-
-        if [ $? -eq 0 ]; then
-          echo "No outdated gems found."
-        else
-          echo "Outdated gems found!"
-          exit 1
-        fi
+    - run: bundle outdated --strict

data/.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 
 env:
-  GITLEAKS_REF: f15b4e408b12fda7e2833f8a32c0d8a045bd48a0
+  GITLEAKS_VERSION: v8.7.1
 
 jobs:
   test:
@@ -14,9 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, 3.0]
+        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,22 +28,22 @@ 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.13.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: |
         curl -H "Accept: application/vnd.github.v3.raw" \
-          -L "https://api.github.com/repos/zricethezav/gitleaks/contents/config/gitleaks.toml?ref=${{ env.GITLEAKS_REF }}" \
+          -L "https://api.github.com/repos/zricethezav/gitleaks/contents/config/gitleaks.toml?ref=${{ env.GITLEAKS_VERSION }}" \
           >> ${{ github.WORKSPACE }}/.github/workflows/original.toml
         sed "/\[allowlist\]/,/^$/d" ${{ github.WORKSPACE }}/.github/workflows/original.toml >> ${{ github.WORKSPACE }}/.github/workflows/official.toml
         cat .github/workflows/gitleaks.toml >> .github/workflows/official.toml
@@ -53,13 +53,13 @@ jobs:
           CURRENT_COMMIT="${{ github.EVENT.PULL_REQUEST.HEAD.SHA }}"
         fi
         echo "LOG_OPTS='^origin/main $CURRENT_COMMIT'" >> $GITHUB_ENV
-    - name: GitLeaks
-      uses: addnab/docker-run-action@v3
+    - uses: addnab/docker-run-action@v3
       with:
-        image: zricethezav/gitleaks:v8.0.4
+        image: zricethezav/gitleaks:${{ env.GITLEAKS_VERSION }}
         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/.rubocop.yml

@@ -1,13 +1,16 @@
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   Exclude:
     - vendor/**/*
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

data/Dockerfile

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

data/README.md

@@ -103,7 +103,7 @@ To set up your local machine to push to RubyGems via the API, see the [RubyGems
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/dispatchinc/ninny. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/dispatchitinc/ninny. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## Code of Conduct
 

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.19'
+  VERSION = '0.1.22'
 end

data/ninny.gemspec

@@ -8,12 +8,13 @@ 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'
   spec.description   = 'Ninny is a command line workflow for git with GitLab'
-  spec.homepage      = 'https://github.com/dispatchinc/ninny'
+  spec.homepage      = 'https://github.com/dispatchitinc/ninny'
+  spec.metadata      = { 'rubygems_mfa_required' => 'false' }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.22
 platform: ruby
 authors:
-- Dispatch Engineers
+- DispatchIt, Inc. Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -310,10 +310,11 @@ files:
 - lib/ninny/user_config.rb
 - lib/ninny/version.rb
 - ninny.gemspec
-homepage: https://github.com/dispatchinc/ninny
+homepage: https://github.com/dispatchitinc/ninny
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -329,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'