ninny 0.1.15 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c01f0689e01c71df928ec993bf38c3be68321b1389ef4db7c1ca0c601d0fd02
-  data.tar.gz: 60d84b30dcfe5e8da077e12f59dac45085c94e10d6a060d5d44fa205bbd9196a
+  metadata.gz: eb06f88a85ed100c85f035dfd512eab3a653ce976e4fccfcb75972b94b62a941
+  data.tar.gz: 624b6561506f6431afbf5e0b63963c056d028ddfaa4499397a0a943d0cafe221
 SHA512:
-  metadata.gz: 051ef3ceebdc3934e5e2438c25020cc2b7ff8cb1c5428746005c0138658682c8934207fbddb605b03b7f7458ac79d018a56d380bfb8b971075e8c9229642b67a
-  data.tar.gz: 7f3cb4b1f7857bb0380de618016c3d17cd29f9dbdfec9a5d3c1ead4110adaa596a390afae4933b71ef5a9aeca8c9e464878d80c2233149b835bb2660e39d425d
+  metadata.gz: b984582630919dc9b6ae834d113e3ff3adea6402cacc0051201985021634baf6b7e7aaae0987acd5a03753d29066786fd469356ab4d77f4bdb09deada6aa684c
+  data.tar.gz: 7ca0603113e71a573636d6efe74e9960d8cabbb6cbc43ed9ad25b5bc84c18dcd658098adeee60bd99b5fd81904822049ae647677e76a266fe11bc207f1c7c6a3

data/.github/workflows/build.yml

@@ -0,0 +1,33 @@
+name: Build
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v2
+    - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      id: meta
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+    - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      with:
+        context: .
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

data/.github/workflows/gitleaks.toml

@@ -0,0 +1,8 @@
+[allowlist]
+description = 'A list of commits and secrets to skip when scanning for secrets'
+commits = [
+  'ExampleCommit'
+]
+regexes = [
+  'ExampleSecret'
+]

data/.github/workflows/scheduled.yml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   bundler-audit:
-    if:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -13,8 +12,7 @@ jobs:
         fetch-depth: 0
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
-        bundler: 1.17.3
+        ruby-version: 3.0
         bundler-cache: true
     - run: |
         gem install bundler-audit
@@ -22,7 +20,7 @@ jobs:
         bundler-audit
 
         if [ $? -eq 0 ]; then
-          echo "No vulnerabilities found."
+          echo "No gem vulnerabilities found."
         else
           echo "Gem vulnerabilities found!"
           exit 1
@@ -35,8 +33,7 @@ jobs:
         fetch-depth: 0
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
-        bundler: 1.17.3
+        ruby-version: 3.0
         bundler-cache: true
     - run: |
         bundle outdated --strict

data/.github/workflows/test.yml

@@ -0,0 +1,65 @@
+name: Test
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+env:
+  GITLEAKS_REF: f15b4e408b12fda7e2833f8a32c0d8a045bd48a0
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, 3.0]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake
+  pronto:
+    if: github.EVENT_NAME == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: HeRoMo/pronto-action@v1.13.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+  gitleaks:
+    if: github.EVENT_NAME == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      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 }}" \
+          >> ${{ 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
+        if [[ ${{ github.REF }} == 'refs/heads/main' ]]; then
+          CURRENT_COMMIT="${{ github.SHA }}"
+        else
+          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
+      with:
+        image: zricethezav/gitleaks:v8.0.4
+        options: -v ${{ github.WORKSPACE }}:/app
+        run: |
+          cd /app
+          gitleaks detect --verbose --source='./' \
+            --config='.github/workflows/official.toml' \
+            --log-opts=${{ env.LOG_OPTS }}

data/.rubocop.yml

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

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.2

data/Dockerfile

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

data/README.md

@@ -72,7 +72,6 @@ $ ninny staging_branch
 
 # To merge the current branch into the current/latest staging branch
 $ ninny stage_up
-
 ```
 
 At any point, `ninny help` will show the help screen.

data/lib/ninny/cli.rb

@@ -31,6 +31,8 @@ module Ninny
 
     desc 'stage_up [PULL_REQUEST_ID]', 'Merges PR/MR into the staging branch'
     method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
+    method_option :username, aliases: '-u', type: :string,
+                             desc: "The name of the user who is staging up; defaults to the local git config's user"
     def stage_up(pull_request_id = nil)
       if options[:help]
         invoke :help, ['stage_up']

data/lib/ninny/command.rb

@@ -83,7 +83,7 @@ module Ninny
     # @api public
     def prompt(**options)
       require 'tty-prompt'
-      TTY::Prompt.new(options)
+      TTY::Prompt.new(*options)
     end
 
     # Get terminal screen properties

data/lib/ninny/commands/pull_request_merge.rb

@@ -6,7 +6,7 @@ module Ninny
   module Commands
     class PullRequestMerge < Ninny::Command
       attr_accessor :pull_request_id, :options, :pull_request
-      attr_reader :branch_type
+      attr_reader :branch_type, :username
 
       def initialize(pull_request_id, options)
         @branch_type = options[:branch_type] || Ninny::Git::STAGING_PREFIX
@@ -22,6 +22,8 @@ module Ninny
 
         self.pull_request_id ||= select_pull_request
 
+        return nil if pull_request_id.nil?
+
         check_out_branch
         merge_pull_request
         comment_about_merge
@@ -29,7 +31,12 @@ module Ninny
 
       def select_pull_request
         choices = Ninny.repo.open_pull_requests.map { |pr| { name: pr.title, value: pr.number } }
-        prompt.select("Which #{Ninny.repo.pull_request_label}?", choices)
+
+        if choices.empty?
+          prompt.say "There don't seem to be any open merge requests."
+        else
+          prompt.select("Which #{Ninny.repo.pull_request_label}?", choices)
+        end
       end
       private :select_pull_request
 
@@ -58,7 +65,10 @@ module Ninny
       #
       # Returns a String
       def comment_body
-        "Merged into #{branch_to_merge_into}."
+        user = username || determine_local_user
+        body = "Merged into #{branch_to_merge_into}".dup
+        body << " by #{user}" if user
+        body << '.'
       end
 
       # Public: Find the pull request
@@ -76,6 +86,11 @@ module Ninny
       def branch_to_merge_into
         @branch_to_merge_into ||= Ninny.git.latest_branch_for(branch_type)
       end
+
+      def determine_local_user
+        local_user_name = `git config user.name`.strip
+        local_user_name.empty? ? nil : local_user_name
+      end
     end
   end
 end

data/lib/ninny/commands/stage_up.rb

@@ -9,6 +9,7 @@ module Ninny
       def initialize(pull_request_id, options)
         super
         @branch_type = Ninny::Git::STAGING_PREFIX
+        @username = options[:username]
       end
     end
   end

data/lib/ninny/git.rb

@@ -95,7 +95,7 @@ module Ninny
     rescue ::Git::GitExecuteError => e
       if e.message.include?(':fatal: A branch named') && e.message.include?(' already exists')
         puts "The local branch #{new_branch_name} already exists." \
-          ' Please delete it manually and then run this command again.'
+             ' Please delete it manually and then run this command again.'
         exit 1
       end
     end
@@ -169,7 +169,7 @@ module Ninny
 
     def prompt(**options)
       require 'tty-prompt'
-      TTY::Prompt.new(options)
+      TTY::Prompt.new(*options)
     end
 
     # Private: Ask the user if they wish to delete and recreate a branch

data/lib/ninny/repository/gitlab.rb

@@ -17,8 +17,12 @@ module Ninny
         to_pr(
           gitlab.merge_requests(
             project_id,
-            { source_branch: Ninny.git.current_branch.name, target_branch: Ninny.project_config.deploy_branch }
-          ).last
+            {
+              source_branch: Ninny.git.current_branch.name,
+              target_branch: Ninny.project_config.deploy_branch,
+              state: 'opened'
+            }
+          ).auto_paginate.last
         )
       end
 
@@ -27,7 +31,7 @@ module Ninny
       end
 
       def open_pull_requests
-        gitlab.merge_requests(project_id, { state: 'opened' }).map { |mr| to_pr(mr) }
+        gitlab.merge_requests(project_id, { state: 'opened' }).auto_paginate.map { |mr| to_pr(mr) }
       end
 
       def pull_request(id)

data/lib/ninny/version.rb

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

data/ninny.gemspec

@@ -25,17 +25,16 @@ Gem::Specification.new do |spec|
   spec.executables           = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths         = ['lib']
 
-  spec.add_dependency 'git', '~> 1.5.0'
+  spec.add_dependency 'git', '~> 1.5'
   spec.add_dependency 'gitlab', '~> 4.11'
-  spec.add_dependency 'pastel', '~> 0.7.2'
+  spec.add_dependency 'pastel', '~> 0.8'
   spec.add_dependency 'thor', '< 2'
-  spec.add_dependency 'tty-box', '~> 0.3.0'
+  spec.add_dependency 'tty-box', '~> 0.3'
   spec.add_dependency 'tty-color', '~> 0.4'
-  spec.add_dependency 'tty-command', '~> 0.8.0'
-  spec.add_dependency 'tty-config', '~> 0.3.0'
-  spec.add_dependency 'tty-prompt', '~> 0.18.0'
+  spec.add_dependency 'tty-command', '~> 0.10'
+  spec.add_dependency 'tty-config', '~> 0.3'
+  spec.add_dependency 'tty-prompt', '~> 0.23'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'byebug', '~> 11.1'
   spec.add_development_dependency 'guard-rspec', '~> 4.3'
   spec.add_development_dependency 'pronto', '~> 0.11'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.19
 platform: ruby
 authors:
 - Dispatch Engineers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tty-color
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: tty-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -285,13 +271,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/pull_request_template.md"
-- ".github/workflows/main.yml"
+- ".github/workflows/build.yml"
+- ".github/workflows/gitleaks.toml"
 - ".github/workflows/scheduled.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -325,7 +314,7 @@ homepage: https://github.com/dispatchinc/ninny
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -340,8 +329,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'
 test_files: []

data/.github/workflows/main.yml

@@ -1,34 +0,0 @@
-name: Main
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.6.3, 2.6.6, 2.7.0, 2.7.2]
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler: 1.17.3
-        bundler-cache: true
-    - run: bundle exec rake
-  pronto:
-    if: github.EVENT_NAME == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: HeRoMo/pronto-action@v1.13.0
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}