ninny 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 911ed6720d5cd72ff5afd2b8a12e3ef1ab98aeb325cc5ddf39db0f3c9ff2fca5
-  data.tar.gz: 9f490c34b1e2c5a090e78b4985aa5a53b02e2d788552f51512a7ed8b9ab6fe51
+  metadata.gz: ac4912e477ddf25380dd14cbf7dad07184c9b7f002d781e781917112f45cc013
+  data.tar.gz: 6a144e8bd809018812ad9f441aa39db5c7853bb3e0d9224bdc50eef1d6633f78
 SHA512:
-  metadata.gz: e0d3d5d823fd4d7856e0a3972ede2cd5c15eb1cfb60b8d95a6257d9a1c6ecee91d259289fcc71c09733b4f0220b545d0655f944934e8a41f627107a02e6c5cb8
-  data.tar.gz: c9a8bc0909bd2b2befb51fce77da37316b728bf79bb34aea68e655f3b2dbaad72faabee748b32f18df04f5420059f38d397fc41df6d415a795eb115fe28ea927
+  metadata.gz: 436dd448436ce48fe2658d08b3cc68b1aedbda86796c836131b8f9845af39507ff99c806f276edafeebe57799db7086ff667c17a509466ec83ab38df22d7796a
+  data.tar.gz: dedd4a379d28c591424f2c40e7255d1151a278f9e8d2b1df7269ee5996edeb9d26339bf4f41582907acba0d06733b16b698a12a2364295b237ea33c9e9659273

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/scheduled.yml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   bundler-audit:
-    if:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -21,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

data/.github/workflows/{main.yml → test.yml}

@@ -1,4 +1,4 @@
-name: Main
+name: Test
 on:
   push:
     branches: [ main ]

data/.ruby-version

@@ -1 +1 @@
-3.0.1
+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/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
@@ -65,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
@@ -83,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

data/lib/ninny/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Dispatch Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -271,13 +271,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/pull_request_template.md"
-- ".github/workflows/main.yml"
+- ".github/workflows/build.yml"
 - ".github/workflows/scheduled.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -326,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'