worktree 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: ac156da458c44bc340de5b6f895d428958f98867abb3a88a2ec763f77a831ccd
+  data.tar.gz: a763ab93c450a14b5864cc74f6f8b2ee813359e5ee68e21adfa2e1a40661154c
+SHA512:
+  metadata.gz: b9a84849c822d8ba4506bf4df3332fa600f7d21faa6c03785f073a8f7809d69a289055fa309eecf2b9c5fa60b8ab6952cfd3445bf73cba7b02073e603ce3f3d9
+  data.tar.gz: fb68dd78ac65464f8eea7a1021c5618f0a33aa58af4dd378d8c14e831f6285d3cf0f681103d2ba69e333c45aa747a7f24b9dc559a1356b2f3f2625eb3eb5e4c6

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'worktree'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bin/worktree

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'worktree/cli'
+
+Worktree::CLI.start(ARGV)

data/bin/worktree_tab_completion

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'worktree/tab_completion/cli'
+
+command_line = ENV.fetch('COMP_LINE')
+compl = Worktree::TabCompletion::CLI.new
+compl_matches = Array(compl.find_matches_for(command_line))
+puts compl_matches unless compl_matches.empty?

data/lib/worktree.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'logger'
+require 'tty-command'
+# require 'active_support/all'
+require 'active_support/core_ext'
+require 'git'
+require 'zeitwerk'
+
+loader = Zeitwerk::Loader.for_gem
+loader.setup
+
+module Worktree
+  JIRA_ISSUE_ID_REGEX_TEMPLATE = ENV.fetch('JIRA_ISSUE_ID_REGEX') { '^\w\-\d+' }
+  JIRA_ISSUE_ID_REGEX = Regexp.new(JIRA_ISSUE_ID_REGEX_TEMPLATE)
+
+  def logger
+    return @logger if defined?(@logger)
+
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+    @logger
+  end
+
+  def run_command(cmd, options = {})
+    command = TTY::Command.new(output: Worktree.logger)
+    command.run cmd, options
+  rescue TTY::Command::ExitError => e
+    raise Error, e.message
+  end
+
+  def git_for(p_dir)
+    Git.open("#{p_dir}/master", log: Worktree.logger)
+  end
+
+  module_function :logger, :run_command, :git_for
+end

data/lib/worktree/cli.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'worktree'
+require 'thor'
+
+module Worktree
+  class CLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    desc 'new BRANCH', 'Create a new branch'
+    option :from, default: Worktree::Command::Add::DEFAULT_BRANCH_REMOTE
+    option :project_dir
+    def new(branch)
+      Worktree::Command::Add.new(branch,
+                                 from: options[:from],
+                                 project_dir: options[:project_dir]).do!
+    end
+
+    desc 'open BRANCH', 'Open existing worktree'
+    option :project_dir
+    def open(branch)
+      Worktree::Command::Open.new(branch,
+                                  project_dir: options[:project_dir]).do!
+    end
+
+    desc 'remove BRANCH', 'Remove branches'
+    option :project_dir
+    def remove(*branches)
+      branches.each do |b|
+        Worktree::Command::Remove.new(b,
+                                      project_dir: options[:project_dir]).do!
+      end
+    end
+
+    desc 'remove-stale', 'Remove all stale branches'
+    option :project_dir
+    def remove_stale
+      Worktree::Command::RemoveStale.new(project_dir: options[:project_dir]).do!
+    rescue TTY::Reader::InputInterrupt
+      Worktree.logger.info { "You've interrupted removing of stale branches!" }
+    end
+
+    desc 'cherry_pick COMMIT', 'Create a new cherry pick'
+    option :to, required: true
+    option :project_dir, default: Dir.pwd
+    def cherry_pick(commit)
+      Worktree::Command::CherryPick.new(commit,
+                                        to: options[:to],
+                                        project_dir: options[:project_dir]).do!
+    end
+
+    desc 'configure', 'Configure worktree'
+    def configure
+      Worktree::Command::Configure.new.do!
+    end
+  end
+end

data/lib/worktree/command.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'active_support/all'
+
+module Worktree
+  module Command
+  end
+end

data/lib/worktree/command/add.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'tty-prompt'
+
+module Worktree
+  module Command
+    class Add
+      DEFAULT_BRANCH_REMOTE = 'upstream/master'
+
+      def initialize(branch, from:, project_dir:)
+        @branch = branch
+        @branch_remote = from
+        @project_dir = project_dir || Project.resolve(branch).root
+        @worktree = "#{@project_dir}/#{@branch}"
+      end
+
+      def do!
+        raise "Worktree #{@worktree} already exists!" if Dir.exist?(@worktree)
+        raise 'No master repo found!' unless Dir.exist?("#{@project_dir}/master/.git")
+
+        # fetch all
+        # TODO: silence log while fetching remotes
+        git.remotes.each { |remote| git.fetch(remote, prune: true) }
+
+        # update master
+        git.pull('upstream', 'master')
+
+        Worktree.run_command "git worktree add -b #{@branch} ../#{@branch} #{@branch_remote}", chdir: "#{@project_dir}/master"
+
+        copy_files
+        clone_dbs
+        tmux
+      end
+
+      private
+
+      def copy_files
+        Feature::CopyFiles.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).run!
+      end
+
+      def clone_dbs
+        if File.exist?("#{@project_dir}/master/config/database.yml")
+          Feature::CloneDbs.new(
+            project_dir: @project_dir,
+            branch: @branch
+          ).run! unless TTY::Prompt.new.no?('Clone development database?')
+        end
+      end
+
+      def tmux
+        tmux_session_name = @branch.tr('.', '-')
+        Feature::Tmux.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).run!(tmux_session_name)
+      end
+
+      def git
+        @git ||= Worktree.git_for(@project_dir)
+      end
+    end
+  end
+end

data/lib/worktree/command/cherry_pick.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'git'
+require 'tty-prompt'
+
+module Worktree
+  module Command
+    class CherryPick
+      def initialize(commit, to:, project_dir:)
+        @commit = commit[0..7] # short commit
+        @branch_remote = to
+        @branch = "cherry-pick-#{@commit}-to-#{@branch_remote.tr('/', '-')}"
+        @project_dir = project_dir.chomp('/')
+      end
+
+      def do!
+        raise "Folder #{@branch} already exists!" if Dir.exist?("#{@project_dir}/#{@branch}")
+        raise 'No master repo found!' unless Dir.exist?("#{@project_dir}/master/.git")
+
+        # fetch all
+        git.remotes.each(&:fetch)
+
+        Worktree.run_command "git worktree add -b #{@branch} ../#{@branch} #{@branch_remote}", chdir: "#{@project_dir}/master"
+
+        begin
+          Worktree.run_command "git cherry-pick #{@commit} -m 1", chdir: "#{@project_dir}/#{@branch}"
+        rescue Worktree::Error => e
+          # bypass conflicts while cherry-picking
+          Worktree.logger.warn { e.message }
+        end
+
+        copy_files
+        clone_dbs
+        tmux
+      end
+
+      private
+
+      def copy_files
+        Feature::CopyFiles.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).run!
+      end
+
+      def clone_dbs
+        if File.exist?("#{@project_dir}/master/config/database.yml")
+          Feature::CloneDbs.new(
+            project_dir: @project_dir,
+            branch: @branch
+          ).run! unless TTY::Prompt.new.no?('Clone development database?')
+        end
+      end
+
+      def tmux
+        tmux_session_name = @branch.tr('.', '-')
+        Feature::Tmux.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).run!(tmux_session_name)
+      end
+
+      def git
+        @git ||= Worktree.git_for(@project_dir)
+      end
+    end
+  end
+end

data/lib/worktree/command/configure.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Worktree
+  module Command
+    class Configure # :nodoc:
+      def do!
+        system("#{editor} #{Worktree::Config.config_file}")
+      end
+
+      private
+
+      def editor
+        ENV.fetch('EDITOR') { 'vim' }
+      end
+    end
+  end
+end

data/lib/worktree/command/open.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'tty-prompt'
+
+module Worktree
+  module Command
+    class Open
+      def initialize(branch, project_dir:)
+        @branch = branch
+        @project_dir = project_dir || Project.resolve(branch).root
+        @worktree = "#{@project_dir}/#{@branch}"
+      end
+
+      def do!
+        raise "Worktree #{@worktree} not found exists!" unless Dir.exist?(@worktree)
+        raise 'No master repo found!' unless Dir.exist?("#{@project_dir}/master/.git")
+
+        tmux
+      end
+
+      private
+
+      def tmux
+        project_dir_name = File.expand_path(@project_dir).chomp('/').split('/').last
+        tmux_session_name = if @branch == 'master'
+                              "#{project_dir_name}-#{@branch}"
+                            else
+                              @branch
+                            end
+        Feature::Tmux.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).run!(tmux_session_name)
+      end
+    end
+  end
+end

data/lib/worktree/command/remove.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Worktree
+  module Command
+    class Remove
+      def initialize(branch, project_dir:, update_refs: true)
+        @branch = branch
+        @project_dir = project_dir || Project.resolve(branch).root
+        @worktree = "#{@project_dir}/#{@branch}"
+        @update_refs = update_refs
+      end
+
+      def do!
+        return unless Dir.exist?(@worktree)
+        return unless TTY::Prompt.new.yes?("Do you want to remove #{@worktree}?")
+
+        # update refs
+        git.remotes.each { |remote| git.fetch(remote, prune: true) } if @update_refs
+
+        unless git.branch('master').contains?(@branch)
+          unless TTY::Prompt.new.yes?("The branch #{@branch} was not merged to master. Would you like to remove it anyway?")
+            Worktree.logger.warn { "You've skipped removing the worktree #{@worktree}" }
+            return
+          end
+        end
+
+        drop_db! if File.exist?("#{@worktree}/config/database.yml")
+
+        # remove stale worktree
+        Worktree.run_command "git worktree remove #{@worktree} --force", chdir: "#{@project_dir}/master"
+
+        # if remote branch exists then remove it also
+        if Git.ls_remote(git.dir)['remotes'].keys.include?("origin/#{@branch}")
+          if TTY::Prompt.new.yes?("Do you want to remove remote branch origin/#{@branch}?")
+            git.push('origin', @branch, delete: true)
+          end
+        end
+
+        # remove local branch
+        git.branch(@branch).delete
+      end
+
+      private
+
+      def drop_db!
+        db_manager_master = db_manager_for('master')
+        db_manager = db_manager_for(@branch)
+        return if db_manager.template == db_manager_master.template
+
+        if TTY::Prompt.new.yes?("Do you want to drop database #{db_manager.template}?")
+          db_manager.dropdb!
+        end
+      end
+
+      def db_manager_for(branch)
+        DbManager.new("#{@project_dir}/#{branch}/config/database.yml")
+      end
+
+      def git
+        @git ||= Worktree.git_for(@project_dir)
+      end
+    end
+  end
+end

data/lib/worktree/command/remove_stale.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Worktree
+  module Command
+    class RemoveStale
+      def initialize(project_dir:)
+        @project_dir = project_dir || Dir.pwd
+      end
+
+      def do!
+        # update refs
+        git.remotes.each { |remote| git.fetch(remote, prune: true) }
+        git.pull('upstream', 'master')
+
+        branches = Dir.entries(@project_dir).
+          reject { |d| d == '.' || d == '..' || d == 'master' }.
+          select { |f| File.directory?(f) }
+
+        stale_branches = branches.select do |branch|
+          git.branch('master').contains?(branch)
+        end
+
+        Worktree.logger.info { "You have #{stale_branches.size} stale branches!" }
+
+        stale_branches.each_with_index do |stale_branch, index|
+          Worktree.logger.info { "#{index + 1} of #{stale_branches.size}" }
+          Remove.new(stale_branch, project_dir: @project_dir, update_refs: false).do!
+        end
+      end
+
+      private
+
+      def git
+        @git ||= Worktree.git_for(@project_dir)
+      end
+    end
+  end
+end