ninny 0.1.0

data/lib/ninny/commands/output_dated_branch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+
+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)
+        output.puts Ninny.git.latest_branch_for(branch_type)
+      end
+    end
+  end
+end

data/lib/ninny/commands/pull_request_merge.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+
+module Ninny
+  module Commands
+    class PullRequestMerge < Ninny::Command
+      attr_accessor :pull_request_id, :options, :pull_request
+      attr_reader :branch_type
+
+      def initialize(pull_request_id, options)
+        @branch_type = options[:branch_type] || Ninny::Git::STAGING_PREFIX
+        self.pull_request_id = pull_request_id
+        self.options = options
+      end
+
+      def execute(input: $stdin, output: $stdout)
+        if (!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
+        merge_pull_request
+        comment_about_merge
+      end
+
+      private 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
+
+     # Public: Check out the branch
+      def check_out_branch
+        branch_to_merge_into.checkout
+      rescue Ninny::Git::NoBranchOfType
+        prompt.say "No #{branch_type} branch available. Creating one now."
+        CreateDatedBranch.new(branch: branch_type).execute
+      end
+
+      # Public: Merge the pull request's branch into the checked-out branch
+      def merge_pull_request
+        Ninny.git.merge(pull_request.branch)
+      end
+
+      # Public: Comment that the pull request was merged into the branch
+      def comment_about_merge
+        pull_request.write_comment(comment_body)
+      end
+
+      # Public: The content of the comment to post when merged
+      #
+      # Returns a String
+      def comment_body
+        "Merged into #{branch_to_merge_into}."
+      end
+
+      # Public: Find the pull request
+      #
+      # Returns a Ninny::Repository::PullRequest
+      def pull_request
+        @pull_request ||= Ninny.repo.pull_request(pull_request_id)
+      end
+
+      # Public: Find the branch
+      #
+      # Returns a String
+      def branch_to_merge_into
+        @branch_to_merge_into ||= Ninny.git.latest_branch_for(branch_type)
+      end
+    end
+  end
+end

data/lib/ninny/commands/setup.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+
+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)
+        try_reading_user_config
+
+        prompt_for_gitlab_private_token
+
+        config.write(force: true)
+        # Command logic goes here ...
+        output.puts "User config #{@result}"
+      end
+
+      def try_reading_user_config
+        begin
+          config.read
+          @result = 'updated'
+        rescue MissingUserConfig
+          @result = 'created'
+        end
+      end
+
+      def prompt_for_gitlab_private_token
+        new_token_text = config.gitlab_private_token ? ' new' : ''
+        if prompt.yes?("Do you have a#{new_token_text} gitlab private token?")
+          private_token = prompt.ask("Enter private token", required: true)
+          config.set(:gitlab_private_token, value: private_token)
+        end
+      end
+    end
+  end
+end

data/lib/ninny/commands/stage_up.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+require_relative 'pull_request_merge'
+
+module Ninny
+  module Commands
+    class StageUp < PullRequestMerge
+      def initialize(pull_request_id, options)
+        super
+        @branch_type = Ninny::Git::STAGING_PREFIX
+      end
+    end
+  end
+end

data/lib/ninny/commands/staging_branch.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+
+module Ninny
+  module Commands
+    class StagingBranch < OutputDatedBranch
+      def initialize(options)
+        super
+        @branch_type = Git::STAGING_PREFIX
+      end
+    end
+  end
+end

data/lib/ninny/git.rb

@@ -0,0 +1,148 @@
+module Ninny
+  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?"
+
+    # branch prefixes
+    DEPLOYABLE_PREFIX = "deployable"
+    STAGING_PREFIX = "staging"
+    QAREADY_PREFIX = "qaready"
+
+    def_delegators :git, :branch
+
+    attr_reader :git
+
+    def initialize
+      @git = ::Git.open(Dir.pwd)
+    end
+
+    def command(*args)
+      git.lib.send(:command, *args)
+    end
+
+    def current_branch
+      git.branch(current_branch_name)
+    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
+    end
+
+    def merge(branch_name)
+      if_clean do
+        git.fetch
+        current_branch.merge("origin/#{branch_name}")
+        raise MergeFailed unless clean?
+        push
+      end
+    end
+
+    # Public: Push the current branch to GitHub
+    def push
+      if_clean do
+        git.push('origin', current_branch_name)
+      end
+    end
+
+    # Public: Pull the latest changes for the checked-out branch
+    def pull
+      if_clean do
+        command('pull')
+      end
+    end
+
+    # Public: Create a new branch from the given source
+    #
+    # 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])
+    end
+
+    # Public: Delete the given branch
+    #
+    # branch_name - The name of the branch to delete
+    def delete_branch(branch_name)
+      branch = branch_name.is_a?(::Git::Branch) ? branch_name : git.branch(branch_name)
+      git.push('origin', ":#{branch}")
+      branch.delete
+    end
+
+    # Public: The list of branches on GitHub
+    #
+    # 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)
+    end
+
+    # Public: List of branches starting with the given string
+    #
+    # prefix - String to match branch names against
+    #
+    # Returns an Array of Branches containing the branch name
+    def branches_for(prefix)
+      remote_branches.select do |branch|
+        branch.name =~ /^#{prefix}/
+      end
+    end
+
+    # Public: Most recent branch starting with the given string
+    #
+    # prefix - String to match branch names against
+    #
+    # Returns an Array of Branches containing the branch name
+    def latest_branch_for(prefix)
+      branches_for(prefix).last || raise(NoBranchOfType, "No #{prefix} branch")
+    end
+
+
+    # Public: Whether the Git index is clean (has no uncommited changes)
+    #
+    # Returns a Boolean
+    def clean?
+      command('status', '--short').empty?
+    end
+
+    # Public: Perform the block if the Git index is clean
+    def if_clean(message=DEFAULT_DIRTY_MESSAGE)
+      if clean? || prompt.yes?(DIRTY_CONFIRM_MESSAGE)
+        yield
+      else
+        alert_dirty_index message
+        exit 1
+      end
+    end
+
+    # Public: Display the message and show the git status
+    def alert_dirty_index(message)
+      prompt.say " "
+      prompt.say message
+      prompt.say " "
+      prompt.say command('status')
+      raise DirtyIndex
+    end
+
+    def prompt(**options)
+      require 'tty-prompt'
+      TTY::Prompt.new(options)
+    end
+
+
+    # Exceptions
+    NotOnBranch = Class.new(StandardError)
+    NoBranchOfType = Class.new(StandardError)
+    DirtyIndex = Class.new(StandardError)
+  end
+end

data/lib/ninny/project_config.rb

@@ -0,0 +1,48 @@
+module Ninny
+  class ProjectConfig
+    attr_reader :config
+
+    def initialize
+      @config = TTY::Config.new
+      @config.filename = '.ninny'
+      @config.extname = '.yml'
+      @config.prepend_path Dir.pwd
+      @config.read
+    end
+
+    def write(*args)
+      config.write(*args)
+    end
+
+    def set(*args)
+      config.set(*args)
+    end
+
+    def repo_type
+      config.fetch(:repo_type)
+    end
+
+    def deploy_branch
+      config.fetch(:deploy_branch)
+    end
+
+    def gitlab_project_id
+      config.fetch(:gitlab_project_id)
+    end
+
+    def gitlab_endpoint
+      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
+    end
+
+    def self.config
+      new
+    end
+  end
+end

data/lib/ninny/repository/gitlab.rb

@@ -0,0 +1,43 @@
+module Ninny
+  module Repository
+    class Gitlab
+      attr_reader :gitlab
+      attr_reader :project_id
+      def initialize
+        @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)
+      end
+
+      def pull_request_label
+        'Merge Request'
+      end
+
+      def open_pull_requests
+        gitlab.merge_requests(project_id, { state: 'opened' }).map{ |mr| to_pr(mr) }
+      end
+
+      def pull_request(id)
+        to_pr(gitlab.merge_request(project_id, id))
+      end
+
+      def create_merge_request_note(id, body)
+        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) })
+      end
+    end
+  end
+end

data/lib/ninny/repository/pull_request.rb

@@ -0,0 +1,18 @@
+module Ninny
+  module Repository
+    class PullRequest
+      attr_accessor :number, :title, :description, :branch, :comment_lambda
+      def initialize(opts={})
+        self.number = opts[:number]
+        self.title = opts[:title]
+        self.description = opts[:description]
+        self.branch = opts[:branch]
+        self.comment_lambda = opts[:comment_lambda]
+      end
+
+      def write_comment(body)
+        self.comment_lambda.call(body)
+      end
+    end
+  end
+end

data/lib/ninny/templates/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/ninny/templates/new_staging/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/ninny/templates/setup/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/ninny/templates/stage_up/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/ninny/templates/staging_branch/.gitkeep

@@ -0,0 +1 @@
+#

data/lib/ninny/user_config.rb

@@ -0,0 +1,47 @@
+module Ninny
+  class UserConfig
+    attr_reader :config
+
+    def initialize
+      @config = TTY::Config.new
+      @config.filename = '.ninny'
+      @config.extname = '.yml'
+      @config.prepend_path Dir.home
+      @read = false
+    end
+
+    def write(*args)
+      config.write(*args)
+    end
+
+    def set(*args)
+      config.set(*args)
+    end
+
+    def gitlab_private_token
+      with_read do
+        config.fetch(:gitlab_private_token)
+      end
+    end
+
+    def read
+      config.read unless @read
+    end
+
+    def with_read
+      begin
+        read
+      rescue TTY::Config::ReadError
+        raise MissingUserConfig.new("User config not found, run `ninny setup`")
+      end
+      @read = true
+      yield
+    end
+
+    def self.config
+      new
+    end
+  end
+
+  MissingUserConfig = Class.new(StandardError)
+end

data/lib/ninny/version.rb

@@ -0,0 +1,3 @@
+module Ninny
+  VERSION = "0.1.0"
+end

data/lib/ninny.rb

@@ -0,0 +1,38 @@
+require 'forwardable'
+require 'ninny/git'
+require 'ninny/command'
+require 'ninny/commands/create_dated_branch'
+require 'ninny/commands/output_dated_branch'
+require 'ninny/commands/new_staging'
+require 'ninny/commands/staging_branch'
+require 'ninny/commands/pull_request_merge'
+require 'ninny/commands/setup'
+require 'ninny/commands/stage_up'
+require 'ninny/repository/gitlab'
+require 'ninny/repository/pull_request'
+require 'ninny/project_config'
+require 'ninny/user_config'
+
+
+require 'git'
+require 'gitlab'
+require 'tty-config'
+
+module Ninny
+  class Error < StandardError; end
+  def self.project_config
+    @config ||= ProjectConfig.config
+  end
+
+  def self.user_config
+    @user_config ||= UserConfig.config
+  end
+
+  def self.repo
+    @repo ||= project_config.repo
+  end
+
+  def self.git
+    @git ||= Git.new
+  end
+end

data/ninny.gemspec

@@ -0,0 +1,70 @@
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "ninny/version"
+
+Gem::Specification.new do |spec|
+  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."
+
+  # 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
+
+  # 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
+    `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.0"
+
+  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"
+end