ninny 0.1.6 → 0.1.12

data/lib/ninny/commands/output_dated_branch.rb

@@ -6,12 +6,13 @@ module Ninny
   module Commands
     class OutputDatedBranch < Ninny::Command
       attr_reader :branch_type
+
       def initialize(options)
         @branch_type = options[:branch_type] || Git::STAGING_PREFIX
         @options = options
       end
 
-      def execute(input: $stdin, output: $stdout)
+      def execute(output: $stdout)
         output.puts Ninny.git.latest_branch_for(branch_type)
       end
     end

data/lib/ninny/commands/pull_request_merge.rb

@@ -14,11 +14,12 @@ module Ninny
         self.options = options
       end
 
-      def execute(input: $stdin, output: $stdout)
-        if (!pull_request_id)
+      def execute(*)
+        unless pull_request_id
           current = Ninny.repo.current_pull_request
           self.pull_request_id = current.number if current
         end
+
         self.pull_request_id ||= select_pull_request
 
         check_out_branch
@@ -26,14 +27,17 @@ module Ninny
         comment_about_merge
       end
 
-      private def select_pull_request
+      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)
       end
+      private :select_pull_request
 
-     # Public: Check out the branch
+      # Public: Check out the branch
       def check_out_branch
-        Ninny.git.check_out(branch_to_merge_into)
+        prompt.say "Checking out #{branch_to_merge_into}."
+        Ninny.git.check_out(branch_to_merge_into, false)
+        Ninny.git.track_current_branch
       rescue Ninny::Git::NoBranchOfType
         prompt.say "No #{branch_type} branch available. Creating one now."
         CreateDatedBranch.new(branch: branch_type).execute
@@ -41,6 +45,7 @@ module Ninny
 
       # Public: Merge the pull request's branch into the checked-out branch
       def merge_pull_request
+        prompt.say "Merging #{pull_request.branch} to #{branch_to_merge_into}."
         Ninny.git.merge(pull_request.branch)
       end
 
@@ -59,9 +64,11 @@ module Ninny
       # Public: Find the pull request
       #
       # Returns a Ninny::Repository::PullRequest
+      # rubocop:disable Lint/DuplicateMethods
       def pull_request
         @pull_request ||= Ninny.repo.pull_request(pull_request_id)
       end
+      # rubocop:enable Lint/DuplicateMethods
 
       # Public: Find the branch
       #

data/lib/ninny/commands/setup.rb

@@ -6,40 +6,58 @@ module Ninny
   module Commands
     class Setup < Ninny::Command
       attr_reader :config
+
       def initialize(options)
         @options = options
         @config = Ninny.user_config
       end
 
-      def execute(input: $stdin, output: $stdout)
+      def execute(output: $stdout)
         try_reading_user_config
 
-        prompt_for_gitlab_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}"
+          end
+        end
 
-        config.write(force: true)
-        # Command logic goes here ...
-        output.puts "User config #{@result}"
+        output.puts "User config #{@result}!"
       end
 
       def try_reading_user_config
-        begin
-          config.read
-          @result = 'updated'
-        rescue MissingUserConfig
-          @result = 'created'
-        end
+        config.read
+        @result = 'updated'
+      rescue MissingUserConfig
+        @result = 'created'
       end
 
       def prompt_for_gitlab_private_token
         begin
           new_token_text = config.gitlab_private_token ? ' new' : ''
         rescue MissingUserConfig
-          new_token_text = 'new'
+          new_token_text = ''
         end
-        if prompt.yes?("Do you have a#{new_token_text} gitlab private token?")
-          private_token = prompt.ask("Enter private token", required: true)
+
+        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
       end
     end
   end

data/lib/ninny/git.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 module Ninny
+  # rubocop:disable Metrics/ClassLength
   class Git
     extend Forwardable
-    NO_BRANCH = "(no branch)"
-    DEFAULT_DIRTY_MESSAGE = "Your Git index is not clean. Commit, stash, or otherwise clean up the index before continuing."
-    DIRTY_CONFIRM_MESSAGE = "Your Git index is not clean. Do you want to continue?"
+    NO_BRANCH = '(no branch)'
+    DEFAULT_DIRTY_MESSAGE = 'Your Git index is not clean. Commit, stash, or otherwise clean' \
+                            ' up the index before continuing.'
+    DIRTY_CONFIRM_MESSAGE = 'Your Git index is not clean. Do you want to continue?'
 
     # branch prefixes
-    DEPLOYABLE_PREFIX = "deployable"
-    STAGING_PREFIX = "staging"
-    QAREADY_PREFIX = "qaready"
+    DEPLOYABLE_PREFIX = 'deployable'
+    STAGING_PREFIX = 'staging'
+    QAREADY_PREFIX = 'qaready'
 
     def_delegators :git, :branch
 
@@ -29,12 +31,9 @@ module Ninny
     end
 
     def current_branch_name
-      name = git.current_branch
-      if name == NO_BRANCH
-        raise NotOnBranch, "Not currently checked out to a particular branch"
-      else
-        name
-      end
+      raise NotOnBranch, 'Not currently checked out to a particular branch' if git.current_branch == NO_BRANCH
+
+      git.current_branch
     end
 
     def merge(branch_name)
@@ -42,6 +41,7 @@ module Ninny
         git.fetch
         command 'merge', ['--no-ff', "origin/#{branch_name}"]
         raise MergeFailed unless clean?
+
         push
       end
     end
@@ -64,13 +64,19 @@ 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)
+    def check_out(branch, do_after_pull = true)
       git.fetch
       branch.checkout
       pull if do_after_pull
-      unless current_branch.name == branch.name
-        raise CheckoutFailed, "Failed to check out '#{branch}'"
-      end
+      raise CheckoutFailed, "Failed to check out '#{branch}'" unless current_branch.name == branch.name
+    end
+
+    # Public: Track remote branch matching current branch
+    #
+    # do_after_pull - Should a pull be done after tracking?
+    def track_current_branch(do_after_pull = true)
+      command('branch', ['-u', "origin/#{current_branch_name}"])
+      pull if do_after_pull
     end
 
     # Public: Create a new branch from the given source
@@ -99,7 +105,7 @@ module Ninny
     # Returns an Array of Strings containing the branch names
     def remote_branches
       git.fetch
-      git.branches.remote.map{ |branch| git.branch(branch.name) }.sort_by(&:name)
+      git.branches.remote.map { |branch| git.branch(branch.name) }.sort_by(&:name)
     end
 
     # Public: List of branches starting with the given string
@@ -122,7 +128,6 @@ module Ninny
       branches_for(prefix).last || raise(NoBranchOfType, "No #{prefix} branch")
     end
 
-
     # Public: Whether the Git index is clean (has no uncommited changes)
     #
     # Returns a Boolean
@@ -131,7 +136,7 @@ module Ninny
     end
 
     # Public: Perform the block if the Git index is clean
-    def if_clean(message=DEFAULT_DIRTY_MESSAGE)
+    def if_clean(message = DEFAULT_DIRTY_MESSAGE)
       if clean? || prompt.yes?(DIRTY_CONFIRM_MESSAGE)
         yield
       else
@@ -142,9 +147,9 @@ module Ninny
 
     # Public: Display the message and show the git status
     def alert_dirty_index(message)
-      prompt.say " "
+      prompt.say ' '
       prompt.say message
-      prompt.say " "
+      prompt.say ' '
       prompt.say command('status')
       raise DirtyIndex
     end
@@ -154,11 +159,11 @@ module Ninny
       TTY::Prompt.new(options)
     end
 
-
     # Exceptions
     CheckoutFailed = Class.new(StandardError)
     NotOnBranch = Class.new(StandardError)
     NoBranchOfType = Class.new(StandardError)
     DirtyIndex = Class.new(StandardError)
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/ninny/project_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ninny
   class ProjectConfig
     attr_reader :config
@@ -31,14 +33,14 @@ module Ninny
     end
 
     def gitlab_endpoint
-      config.fetch(:gitlab_endpoint, default: "https://gitlab.com/api/v4")
+      config.fetch(:gitlab_endpoint, default: 'https://gitlab.com/api/v4')
     end
 
     def repo
       return unless repo_type
 
       repo_class = { gitlab: Repository::Gitlab }[repo_type.to_sym]
-      repo_class && repo_class.new
+      repo_class&.new
     end
 
     def self.config

data/lib/ninny/repository/gitlab.rb

@@ -1,18 +1,25 @@
+# frozen_string_literal: true
+
 module Ninny
   module Repository
     class Gitlab
-      attr_reader :gitlab
-      attr_reader :project_id
+      attr_reader :gitlab, :project_id
+
       def initialize
-        @gitlab = ::Gitlab.client(endpoint: Ninny.project_config.gitlab_endpoint,
-                                  private_token: Ninny.user_config.gitlab_private_token)
+        @gitlab = ::Gitlab.client(
+          endpoint: Ninny.project_config.gitlab_endpoint,
+          private_token: Ninny.user_config.gitlab_private_token
+        )
         @project_id = Ninny.project_config.gitlab_project_id
       end
 
       def current_pull_request
-        to_pr(gitlab.merge_requests(project_id, { source_branch: Ninny.git.current_branch.name,
-                                                  target_branch: Ninny.project_config.deploy_branch })
-                    .last)
+        to_pr(
+          gitlab.merge_requests(
+            project_id,
+            { source_branch: Ninny.git.current_branch.name, target_branch: Ninny.project_config.deploy_branch }
+          ).last
+        )
       end
 
       def pull_request_label
@@ -20,7 +27,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' }).map { |mr| to_pr(mr) }
       end
 
       def pull_request(id)
@@ -31,13 +38,16 @@ module Ninny
         gitlab.create_merge_request_note(project_id, id, body)
       end
 
-      private def to_pr(request)
-        request && PullRequest.new(number: request.iid,
-                                   title: request.title,
-                                   branch: request.source_branch,
-                                   description: request.description,
-                                   comment_lambda: ->(body) { Ninny.repo.create_merge_request_note(request.iid, body) })
+      def to_pr(request)
+        request && PullRequest.new(
+          number: request.iid,
+          title: request.title,
+          branch: request.source_branch,
+          description: request.description,
+          comment_lambda: ->(body) { Ninny.repo.create_merge_request_note(request.iid, body) }
+        )
       end
+      private :to_pr
     end
   end
 end

data/lib/ninny/repository/pull_request.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Ninny
   module Repository
     class PullRequest
       attr_accessor :number, :title, :description, :branch, :comment_lambda
-      def initialize(opts={})
+
+      def initialize(opts = {})
         self.number = opts[:number]
         self.title = opts[:title]
         self.description = opts[:description]
@@ -11,7 +14,7 @@ module Ninny
       end
 
       def write_comment(body)
-        self.comment_lambda.call(body)
+        comment_lambda.call(body)
       end
     end
   end

data/lib/ninny/user_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ninny
   class UserConfig
     attr_reader :config
@@ -25,11 +27,9 @@ module Ninny
     end
 
     def read
-      begin
       config.read unless @read
-      rescue TTY::Config::ReadError
-        raise MissingUserConfig.new("User config not found, run `ninny setup`")
-      end
+    rescue TTY::Config::ReadError
+      raise MissingUserConfig, 'User config not found, run `ninny setup`'
     end
 
     def with_read

data/lib/ninny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ninny
-  VERSION = "0.1.6"
+  VERSION = '0.1.12'
 end

data/ninny.gemspec

@@ -1,72 +1,48 @@
 # frozen_string_literal: true
 
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ninny/version"
+require 'ninny/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ninny"
-  spec.license       = "MIT"
+  spec.name          = 'ninny'
+  spec.license       = 'MIT'
   spec.version       = Ninny::VERSION
-  spec.authors       = ["Carl Allen"]
-  spec.email         = ["carl.allen@dispatchwithus.com"]
-
-  spec.summary       = "ninny (n): an foolish person, see: git"
-  spec.description   = "Ninny is a command line workflow for git"
-  # spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  spec.authors       = ['Dispatch Engineers']
+  spec.email         = ['engineers@dispatchit.com']
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-  #   spec.metadata["homepage_uri"] = spec.homepage
-  #   spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  #   spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
+  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'
 
   # 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.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "tty-box", "~> 0.3.0"
-  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-cursor", "~> 0.6"
-  # spec.add_dependency "tty-editor", "~> 0.5.0"
-  # spec.add_dependency "tty-file", "~> 0.7.0"
-  # spec.add_dependency "tty-font", "~> 0.2.0"
-  # spec.add_dependency "tty-markdown", "~> 0.5.0"
-  # spec.add_dependency "tty-pager", "~> 0.12.0"
-  # spec.add_dependency "tty-pie", "~> 0.1.0"
-  # spec.add_dependency "tty-platform", "~> 0.2.0"
-  # spec.add_dependency "tty-progressbar", "~> 0.16.0"
-  # spec.add_dependency "tty-screen", "~> 0.6"
-  # spec.add_dependency "tty-spinner", "~> 0.9.0"
-  # spec.add_dependency "tty-table", "~> 0.10.0"
-  # spec.add_dependency "tty-tree", "~> 0.2.0"
-  # spec.add_dependency "tty-which", "~> 0.4"
-
-  spec.add_dependency "pastel", "~> 0.7.2"
-  spec.add_dependency "thor", "~> 0.20.0"
-
-  spec.add_dependency "git", "~> 1.5.0"
-  spec.add_dependency "gitlab", "~> 4.11"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "byebug"
+  spec.bindir                = 'exe'
+  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 'gitlab', '~> 4.11'
+  spec.add_dependency 'pastel', '~> 0.7.2'
+  spec.add_dependency 'thor', '< 2'
+  spec.add_dependency 'tty-box', '~> 0.3.0'
+  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_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'
+  spec.add_development_dependency 'pronto-rubocop', '~> 0.11'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 1.11'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.9'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
 end