ninny 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c95a75100e8d999b3c8d8797623bf50b3b27595fa1da0a496ec0821fb43d38
-  data.tar.gz: 20c4f576d8d81047a3aee49a45993f2021a35b020a78c5701d45da4bf02a2f52
+  metadata.gz: ac4912e477ddf25380dd14cbf7dad07184c9b7f002d781e781917112f45cc013
+  data.tar.gz: 6a144e8bd809018812ad9f441aa39db5c7853bb3e0d9224bdc50eef1d6633f78
 SHA512:
-  metadata.gz: 5f71dfc3a85f2cfe43f576dcbf751c5b323061e098caffa16862c2afd3ae0c7b1bfb4cd036088d40723f59a7f4faeef7329df467024d16446d11f5a8b5ecd09c
-  data.tar.gz: ae54faf5617617129f155b900cdf5491442885e654f2c731cdf38d4f8ff0f0a8ed18fb3653fadb28aba2368fe2780fda86e72b0942a7c65cad99f024b9148118
+  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
@@ -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/{main.yml → test.yml}

@@ -1,4 +1,4 @@
-name: Main
+name: Test
 on:
   push:
     branches: [ main ]
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6.3, 2.6.6, 2.7.0, 2.7.2]
+        ruby: [2.6, 2.7, 3.0]
     steps:
     - uses: actions/checkout@v2
       with:
@@ -19,7 +19,6 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 1.17.3
         bundler-cache: true
     - run: bundle exec rake
   pronto:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
     - vendor/**/*
 
@@ -11,6 +11,10 @@ Gemspec/RequiredRubyVersion:
 Style/Documentation:
   Enabled: false
 
+Layout/LineLength:
+  Exclude:
+    - spec/**/*
+
 Lint/EmptyClass:
   Enabled: false
 
@@ -20,8 +24,22 @@ Lint/EmptyBlock:
 Lint/MissingSuper:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+    - ninny.gemspec
+
 Metrics/MethodLength:
   Max: 15
 
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline
+
+Style/BlockDelimiters:
+  Enabled: true
+  Exclude:
+    - spec/**/*
+
 Style/OptionalBooleanParameter:
   Enabled: false

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/create_dated_branch.rb

@@ -13,11 +13,12 @@ module Ninny
       def execute(output: $stdout)
         create_branch
         delete_old_branches
-        output.puts "#{branch_name} created"
+        output.puts "Branch #{branch_name} successfully created."
       end
 
       # Public: Create the desired branch
       def create_branch
+        prompt.say "Attempting to create branch #{branch_name}."
         Ninny.git.new_branch(branch_name, Ninny.project_config.deploy_branch)
       end
 

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

@@ -38,7 +38,7 @@ module Ninny
 
     def merge(branch_name)
       if_clean do
-        git.fetch
+        git.fetch('-p')
         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
+      git.fetch('-p')
       git.checkout(branch)
       pull if do_after_pull
       raise CheckoutFailed, "Failed to check out '#{branch}'" unless current_branch.name == branch.name
@@ -84,11 +84,20 @@ 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
-      command('branch', ['--no-track', new_branch_name, "origin/#{source_branch_name}"])
-      new_branch = branch(new_branch_name)
-      new_branch.checkout
-      command('push', ['-u', 'origin', new_branch_name])
+      git.fetch('-p')
+      remote_branches = command('branch', ['--remote'])
+
+      if remote_branches.include?("origin/#{new_branch_name}")
+        ask_to_recreate_branch(new_branch_name, source_branch_name)
+      else
+        create_branch(new_branch_name, source_branch_name)
+      end
+    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.'
+        exit 1
+      end
     end
 
     # Public: Delete the given branch
@@ -98,13 +107,17 @@ module Ninny
       branch = branch_name.is_a?(::Git::Branch) ? branch_name : git.branch(branch_name)
       git.push('origin', ":#{branch}")
       branch.delete
+    rescue ::Git::GitExecuteError => e
+      if e.message.include?(':error: branch') && e.message.include?(' not found.')
+        puts 'Could not delete local branch, but the remote branch was deleted.'
+      end
     end
 
     # Public: The list of branches on GitHub
     #
     # Returns an Array of Strings containing the branch names
     def remote_branches
-      git.fetch
+      git.fetch('-p')
       git.branches.remote.map { |branch| git.branch(branch.name) }.sort_by(&:name)
     end
 
@@ -156,7 +169,31 @@ 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
+    #
+    # new_branch_name: the name of the branch in question
+    # source_branch_name: the name of the branch the new branch is supposed to be based off of
+    private def ask_to_recreate_branch(new_branch_name, source_branch_name)
+      if prompt.yes?("The branch #{new_branch_name} already exists. Do you wish to delete and recreate?")
+        delete_branch(new_branch_name)
+        new_branch(new_branch_name, source_branch_name)
+      else
+        exit 1
+      end
+    end
+
+    # Private: Create a branch
+    #
+    # new_branch_name: the name of the branch in question
+    # source_branch_name: the name of the branch the new branch is supposed to be based off of
+    private def create_branch(new_branch_name, source_branch_name)
+      command('branch', ['--no-track', new_branch_name, "origin/#{source_branch_name}"])
+      new_branch = branch(new_branch_name)
+      new_branch.checkout
+      command('push', ['-u', 'origin', new_branch_name])
     end
 
     # Exceptions

data/lib/ninny/repository/gitlab.rb

@@ -17,7 +17,11 @@ module Ninny
         to_pr(
           gitlab.merge_requests(
             project_id,
-            { source_branch: Ninny.git.current_branch.name, target_branch: Ninny.project_config.deploy_branch }
+            {
+              source_branch: Ninny.git.current_branch.name,
+              target_branch: Ninny.project_config.deploy_branch,
+              state: 'opened'
+            }
           ).last
         )
       end

data/lib/ninny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ninny
-  VERSION = '0.1.14'
+  VERSION = '0.1.18'
 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.14
+  version: 0.1.18
 platform: ruby
 authors:
 - Dispatch Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-08-20 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,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
@@ -340,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'