worktree 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac156da458c44bc340de5b6f895d428958f98867abb3a88a2ec763f77a831ccd
-  data.tar.gz: a763ab93c450a14b5864cc74f6f8b2ee813359e5ee68e21adfa2e1a40661154c
+  metadata.gz: ae13288c9a0d09cf33b342bbcbd6cba9153713f5589afd88578f828d74e781f2
+  data.tar.gz: 58195a0bddf0d7c7310e8fdc01cf5a890f4006c57ea638754435cb82ad5380a0
 SHA512:
-  metadata.gz: b9a84849c822d8ba4506bf4df3332fa600f7d21faa6c03785f073a8f7809d69a289055fa309eecf2b9c5fa60b8ab6952cfd3445bf73cba7b02073e603ce3f3d9
-  data.tar.gz: fb68dd78ac65464f8eea7a1021c5618f0a33aa58af4dd378d8c14e831f6285d3cf0f681103d2ba69e333c45aa747a7f24b9dc559a1356b2f3f2625eb3eb5e4c6
+  metadata.gz: f8c31028b7da48adf4137fe78b1b66c35d708c6ec78cb10f579540bb3a358c0fa00203d7768151d81eef1e09be9fc3ac102da87f6c604f003d082f5aedf1effd
+  data.tar.gz: ba0eff802cf57b7ea745a54a08a1fe2c845bdbbd30622a0de2aaba1316c035a61796013ebe5bfe163d2e61fa5c4bfd6a446e794fc938237ff5715e9d3853ae20

data/lib/worktree.rb

@@ -2,8 +2,7 @@
 
 require 'logger'
 require 'tty-command'
-# require 'active_support/all'
-require 'active_support/core_ext'
+require 'active_support/all'
 require 'git'
 require 'zeitwerk'
 
@@ -11,9 +10,6 @@ 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)
 

data/lib/worktree/cli.rb

@@ -55,5 +55,12 @@ module Worktree
     def configure
       Worktree::Command::Configure.new.do!
     end
+
+    desc 'init URI', 'Initialize new worktree'
+    option :repo_path, required: true
+    def init(uri)
+      Worktree::Command::Init.new(uri,
+                                  repo_path: options[:repo_path]).do!
+    end
   end
 end

data/lib/worktree/command/add.rb

@@ -10,7 +10,7 @@ module Worktree
       def initialize(branch, from:, project_dir:)
         @branch = branch
         @branch_remote = from
-        @project_dir = project_dir || Project.resolve(branch).root
+        @project_dir = File.expand_path project_dir || Project.resolve(branch).root
         @worktree = "#{@project_dir}/#{@branch}"
       end
 
@@ -29,7 +29,10 @@ module Worktree
 
         copy_files
         clone_dbs
-        tmux
+        Launcher.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).launch!
       end
 
       private
@@ -50,14 +53,6 @@ module Worktree
         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

data/lib/worktree/command/cherry_pick.rb

@@ -10,7 +10,7 @@ module Worktree
         @commit = commit[0..7] # short commit
         @branch_remote = to
         @branch = "cherry-pick-#{@commit}-to-#{@branch_remote.tr('/', '-')}"
-        @project_dir = project_dir.chomp('/')
+        @project_dir = File.expand_path project_dir
       end
 
       def do!
@@ -31,7 +31,10 @@ module Worktree
 
         copy_files
         clone_dbs
-        tmux
+        Launcher.new(
+          project_dir: @project_dir,
+          branch: @branch
+        ).launch!
       end
 
       private
@@ -52,14 +55,6 @@ module Worktree
         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

data/lib/worktree/command/init.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'tty-prompt'
+
+module Worktree
+  module Command
+    class Init
+      def initialize(uri, repo_path:)
+        @uri = uri
+        @repo_path = File.expand_path repo_path
+      end
+
+      def do!
+        # clone git repo
+        @git = Git.clone(@uri, tmp_repo_name, path: @repo_path)
+
+        # rearrange repo folders
+        FileUtils.mkdir_p "#{@repo_path}/#{repo_name}"
+        git_master_path = "#{@repo_path}/#{repo_name}/master"
+        FileUtils.mv "#{@repo_path}/#{tmp_repo_name}", git_master_path
+
+        # reinit git from new path
+        @git = Worktree.git_for(git_master_path)
+
+        remote_name = TTY::Prompt.new.ask?('What is remote name?', default: 'origin')
+
+        unless remote_name == 'origin'
+          # add remote
+          @git.add_remote remote_name, @uri
+
+          # TODO: remove origin remote?
+        end
+      end
+
+      private
+
+      # example '123' * 2 = '123123'
+      def tmp_repo_name
+        repo_name * 2
+      end
+
+      def repo_name
+        @repo_name ||= begin
+                         u = URI(@uri)
+                         n = u.path.split('/')
+                         n.last[0..-5] # remove .git
+                       end
+      end
+    end
+  end
+end

data/lib/worktree/command/open.rb

@@ -7,7 +7,7 @@ module Worktree
     class Open
       def initialize(branch, project_dir:)
         @branch = branch
-        @project_dir = project_dir || Project.resolve(branch).root
+        @project_dir = File.expand_path project_dir || Project.resolve(branch).root
         @worktree = "#{@project_dir}/#{@branch}"
       end
 
@@ -15,22 +15,10 @@ module Worktree
         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(
+        Launcher.new(
           project_dir: @project_dir,
           branch: @branch
-        ).run!(tmux_session_name)
+        ).launch!
       end
     end
   end

data/lib/worktree/command/remove.rb

@@ -5,7 +5,7 @@ module Worktree
     class Remove
       def initialize(branch, project_dir:, update_refs: true)
         @branch = branch
-        @project_dir = project_dir || Project.resolve(branch).root
+        @project_dir = File.expand_path project_dir || Project.resolve(branch).root
         @worktree = "#{@project_dir}/#{@branch}"
         @update_refs = update_refs
       end

data/lib/worktree/command/remove_stale.rb

@@ -4,7 +4,7 @@ module Worktree
   module Command
     class RemoveStale
       def initialize(project_dir:)
-        @project_dir = project_dir || Dir.pwd
+        @project_dir = File.expand_path project_dir || Dir.pwd
       end
 
       def do!

data/lib/worktree/launcher.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Worktree
+  class Launcher # :nodoc:
+    def initialize(project_dir:, branch:)
+      @project_dir = project_dir
+      @branch = branch
+      @working_directory = "#{@project_dir}/#{@branch}".chomp('/')
+    end
+
+    def launch!
+      Dir.chdir(@working_directory) { Kernel.system(command) }
+    end
+
+    private
+
+    def command
+      cmd = ENV.fetch('WORKTREE_LAUNCHER') { ENV.fetch('EDITOR', 'vim') }
+      format(cmd, replace_vars)
+    end
+
+    def replace_vars
+      {
+        worktree_dir: @working_directory,
+        worktree_branch: @branch
+      }
+    end
+  end
+end

data/lib/worktree/tab_completion/branch_completion.rb

@@ -5,6 +5,9 @@ require 'jira-ruby'
 module Worktree
   module TabCompletion
     class BranchCompletion
+      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 initialize(compl)
         @compl = compl
       end
@@ -22,7 +25,7 @@ module Worktree
       private
 
       def find_jira_issue_by(comp_line)
-        (comp_line.match(Worktree::JIRA_ISSUE_ID_REGEX) || [])[0]
+        (comp_line.match(JIRA_ISSUE_ID_REGEX) || [])[0]
       end
 
       def jira_client

data/lib/worktree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Worktree
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worktree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Igor Gonchar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - igor.gonchar@gmail.com
 executables:
@@ -197,6 +197,7 @@ files:
 - lib/worktree/command/add.rb
 - lib/worktree/command/cherry_pick.rb
 - lib/worktree/command/configure.rb
+- lib/worktree/command/init.rb
 - lib/worktree/command/open.rb
 - lib/worktree/command/remove.rb
 - lib/worktree/command/remove_stale.rb
@@ -205,8 +206,7 @@ files:
 - lib/worktree/error.rb
 - lib/worktree/feature/clone_dbs.rb
 - lib/worktree/feature/copy_files.rb
-- lib/worktree/feature/jira.rb
-- lib/worktree/feature/tmux.rb
+- lib/worktree/launcher.rb
 - lib/worktree/project.rb
 - lib/worktree/tab_completion.rb
 - lib/worktree/tab_completion/branch_completion.rb
@@ -219,7 +219,7 @@ homepage: https://github.com/gigorok/worktree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,15 +227,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Manage your projects by git working tree feature
 test_files: []

data/lib/worktree/feature/jira.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require 'jira-ruby'
-
-module Worktree
-  module Feature
-    class Jira
-      def initialize(project_dir:, branch:)
-        @project_dir = project_dir
-        @branch = branch
-      end
-
-      def run!
-        if jira_issue?
-          prompt = "Jira issue #{jira_issue_id} status: #{jira_issue.status.name}. Would you like to change it?"
-          jira_process! unless TTY::Prompt.new.no?(prompt)
-        end
-
-        super
-      end
-
-      private
-
-      def jira_client
-        @jira_client ||= JIRA::Client.new(jira_client_options)
-      end
-
-      def jira_client_options
-        {
-          username: ENV['JIRA_USERNAME'],
-          password: ENV['JIRA_PASSWORD'],
-          site: ENV['JIRA_SITE'],
-          context_path: '',
-          auth_type: :basic
-        }
-      end
-
-      def jira_issue?
-        return false unless jira_issue_id
-
-        jira_issue_id =~ Worktree::JIRA_ISSUE_ID_REGEX
-      end
-
-      def jira_process!
-        transition = choose_transition
-        apply_transition!(transition) if transition != -1
-      rescue StandardError => e
-        Worktree.logger.error { e.message }
-      end
-
-      def jira_issue_id
-        (@branch.match(/^\w+\-\d+/) || [])[0]
-      end
-
-      def jira_issue
-        @jira_issue ||= jira_client.Issue.find(jira_issue_id)
-      end
-
-      def apply_transition!(transition)
-        jira_issue.transitions.build.save!(transition: { id: transition.id })
-      end
-
-      def choose_transition
-        TTY::Prompt.new.select('Choose a transition?', cycle: true) do |menu|
-          menu.enum '.'
-          menu.choice 'Skip it', -1
-          jira_issue.transitions.all.each do |s|
-            menu.choice s.name, s
-          end
-        end
-      end
-    end
-  end
-end

data/lib/worktree/feature/tmux.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module Worktree
-  module Feature
-    class Tmux
-
-      class VimEditor
-        attr_reader :window_name
-
-        def initialize(cwd:)
-          @cwd = cwd
-          @window_name = 'vim'
-        end
-
-        # open Gemfile if present
-        def cmd
-          if File.exist?("#{@cwd}/Gemfile")
-            'vim Gemfile'
-          else
-            'vim'
-          end
-        end
-      end
-
-      def initialize(project_dir:, branch:)
-        @project_dir = project_dir
-        @branch = branch
-        @working_directory = "#{@project_dir}/#{@branch}".chomp('/')
-      end
-
-      def run!(session_name)
-        if session_exist?(session_name)
-          Worktree.logger.info { "TMUX session #{session_name} already exist" }
-          # TODO: ask for attach to it
-          return
-        end
-
-        Worktree.run_command "tmux new-session -t #{session_name} -d", chdir: @working_directory
-        Worktree.run_command "tmux new-window -d -t #{session_name} -n #{editor.window_name}", chdir: @working_directory
-        Worktree.run_command "tmux send-keys -t #{session_name}:2 \"#{editor.cmd}\" C-m"
-        Worktree.run_command "tmux select-window -t #{session_name}:2" # select vim window
-        if inside_tmux?
-          Kernel.system "tmux switch -t #{session_name}"
-        else
-          Kernel.system "tmux attach-session -t #{session_name}"
-        end
-      end
-
-      private
-
-      def editor
-        return @editor if defined?(@editor)
-
-        @editor = VimEditor.new(cwd: @working_directory)
-      end
-
-      def inside_tmux?
-        Worktree.run_command('echo $TMUX').out.strip.present?
-      end
-
-      def session_exist?(name)
-        cmd = "tmux list-sessions -F '#S' | awk '/'#{name}/' {print $1}'"
-        Worktree.run_command(cmd).out.strip.present?
-      end
-    end
-  end
-end