ninny 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df20c749d0ff68d76160dd8c49af839c0d5bca44b2bc843c6869c54847d6cd2a
-  data.tar.gz: fd04479d94849368b53d539ad1f3084e024c90d4a89d879787213dc5fd5de9a9
+  metadata.gz: 911ed6720d5cd72ff5afd2b8a12e3ef1ab98aeb325cc5ddf39db0f3c9ff2fca5
+  data.tar.gz: 9f490c34b1e2c5a090e78b4985aa5a53b02e2d788552f51512a7ed8b9ab6fe51
 SHA512:
-  metadata.gz: 7882708a164cfc52316f496f26c7203458d39c996d155a67b5fc8afedb58a9b9d60a9b44badc97ba4860815c497017ac1e47cc7dcbdd4fd89b24e4d9e3e7162c
-  data.tar.gz: 954e986c09b28bc6ce678fb7a88ff04f872f212ce71c8637699342eb683229b28286ba50dc32b9523ca43dbee59cece29e9ad06546fe27f600712b479a70fd3b
+  metadata.gz: e0d3d5d823fd4d7856e0a3972ede2cd5c15eb1cfb60b8d95a6257d9a1c6ecee91d259289fcc71c09733b4f0220b545d0655f944934e8a41f627107a02e6c5cb8
+  data.tar.gz: c9a8bc0909bd2b2befb51fce77da37316b728bf79bb34aea68e655f3b2dbaad72faabee748b32f18df04f5420059f38d397fc41df6d415a795eb115fe28ea927

data/.github/workflows/main.yml

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

@@ -0,0 +1,47 @@
+name: Scheduled
+on:
+  schedule:
+    - cron: "0 4 * * 1" # 4am UTC on Mondays (10pm/11pm CT on Sundays)
+
+jobs:
+  bundler-audit:
+    if:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      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 vulnerabilities found."
+        else
+          echo "Gem vulnerabilities found!"
+          exit 1
+        fi
+  bundle-outdated:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      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

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.1

data/README.md

@@ -42,9 +42,15 @@ Then, each developer on the project should set up a file at `~/.ninny.yml` on th
 
 ```bash
 $ ninny setup
-Do you have a new GitLab private token? (Y/n) y # enter 'y'
+Do you have a new GitLab private token? (Y/n) Yes # enter 'y'
 Enter private token: abc123def456ghi789jk # enter your private token
-User config updated
+User config updated!
+```
+
+Or, you can pass the private token in as part of the command:
+```bash
+$ ninny setup --token abc123def456ghi789jk # or '-t abc123def456ghi789jk' for short
+User config updated!
 ```
 
 The private token should be a personal access token for that person's GitLab account (generated [here](https://gitlab.com/-/profile/personal_access_tokens)).

data/lib/ninny/cli.rb

@@ -54,6 +54,7 @@ module Ninny
 
     desc 'setup', 'Interactively setup configuration'
     method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
+    method_option :token, aliases: '-t', type: :string, desc: 'The GitLab token to add to the ~/.ninny.yml file'
     def setup(*)
       if options[:help]
         invoke :help, ['setup']

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

@@ -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
 

data/lib/ninny/commands/setup.rb

@@ -5,29 +5,28 @@ require_relative '../command'
 module Ninny
   module Commands
     class Setup < Ninny::Command
-      attr_reader :config
+      attr_reader :config, :private_token
 
       def initialize(options)
         @options = options
+        @private_token = options[:token]
         @config = Ninny.user_config
       end
 
       def execute(output: $stdout)
         try_reading_user_config
 
-        private_token = prompt_for_gitlab_private_token
+        unless @private_token
+          @private_token = prompt_for_gitlab_private_token
 
-        begin
-          # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
-          #   releases versions compatible with thor versions >= 1 as well.
-          config.write(force: true)
-        rescue StandardError
-          puts '  Unable to write config file via TTY... continuing anyway...'
-          File.open("#{ENV['HOME']}/.ninny.yml", 'w') do |file|
-            file.puts "gitlab_private_token: #{private_token}"
+          unless @private_token
+            output.puts "Please create a private token on GitLab and then rerun 'ninny setup'."
+            return
           end
         end
 
+        set_response = config_set_gitlab_private_token(@private_token)
+        write_gitlab_private_token(@private_token, set_response)
         output.puts "User config #{@result}!"
       end
 
@@ -38,6 +37,27 @@ module Ninny
         @result = 'created'
       end
 
+      def config_set_gitlab_private_token(private_token)
+        # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
+        #   releases versions compatible with thor versions >= 1 as well.
+        config.set(:gitlab_private_token, value: private_token)
+        :success
+      rescue ArgumentError
+        puts '  Unable to set new token via TTY... continuing anyway...'
+        :failed
+      end
+
+      def write_gitlab_private_token(private_token, set_response)
+        raise StandardError unless set_response == :success
+
+        # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
+        #   releases versions compatible with thor versions >= 1 as well.
+        config.write(force: true)
+      rescue StandardError
+        puts '  Unable to write config file via TTY... continuing anyway...'
+        File.open("#{ENV['HOME']}/.ninny.yml", 'w') { |file| file.puts "gitlab_private_token: #{private_token}" }
+      end
+
       def prompt_for_gitlab_private_token
         begin
           new_token_text = config.gitlab_private_token ? ' new' : ''
@@ -47,17 +67,7 @@ module Ninny
 
         return unless prompt.yes?("Do you have a#{new_token_text} GitLab private token?")
 
-        private_token = prompt.ask('Enter private token:', required: true)
-
-        begin
-          # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
-          #   releases versions compatible with thor versions >= 1 as well.
-          config.set(:gitlab_private_token, value: private_token)
-        rescue ArgumentError
-          puts '  Unable to set new token via TTY... continuing anyway...'
-        end
-
-        private_token
+        prompt.ask('Enter private token:', required: true)
       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,8 +65,8 @@ 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
-      branch.checkout
+      git.fetch('-p')
+      git.checkout(branch)
       pull if do_after_pull
       raise CheckoutFailed, "Failed to check out '#{branch}'" unless current_branch.name == branch.name
     end
@@ -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.12'
+  VERSION = '0.1.17'
 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.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Dispatch Engineers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-06-14 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
@@ -286,6 +272,7 @@ extra_rdoc_files: []
 files:
 - ".github/pull_request_template.md"
 - ".github/workflows/main.yml"
+- ".github/workflows/scheduled.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -324,7 +311,7 @@ homepage: https://github.com/dispatchinc/ninny
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -339,8 +326,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.15
+signing_key:
 specification_version: 4
 summary: 'ninny (n): an foolish person, see: git'
 test_files: []