worktree 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae13288c9a0d09cf33b342bbcbd6cba9153713f5589afd88578f828d74e781f2
-  data.tar.gz: 58195a0bddf0d7c7310e8fdc01cf5a890f4006c57ea638754435cb82ad5380a0
+  metadata.gz: 5a21f0e1e12ffd3382234f57fc3abeff4f2816aa7f36897923ebe77e045fbb99
+  data.tar.gz: 79635e4cf96a885f5d0472887dc046e066db04427efaae495c65c97a38f00a00
 SHA512:
-  metadata.gz: f8c31028b7da48adf4137fe78b1b66c35d708c6ec78cb10f579540bb3a358c0fa00203d7768151d81eef1e09be9fc3ac102da87f6c604f003d082f5aedf1effd
-  data.tar.gz: ba0eff802cf57b7ea745a54a08a1fe2c845bdbbd30622a0de2aaba1316c035a61796013ebe5bfe163d2e61fa5c4bfd6a446e794fc938237ff5715e9d3853ae20
+  metadata.gz: 2c22b94b9bf4a33b14950574065963e5feec30ffeda94e376590dc2053f297c2fcee30cd087e227b0fcb4dc18903122a6bb92852e04b2ef5f60dd6d7df9f70fd
+  data.tar.gz: 8b988eeeb6ad543317f5bc117a6c8461a936f6b9e9ac1f84c2c9998403fefa843e78162163dfa697ee3c4c90a5ea43f659d68c89d4908511c2a24565448811ef

data/lib/worktree/command/add.rb

@@ -45,7 +45,7 @@ module Worktree
       end
 
       def clone_dbs
-        if File.exist?("#{@project_dir}/master/config/database.yml")
+        if File.exist?("#{@project_dir}/#{@branch}/config/database.yml")
           Feature::CloneDbs.new(
             project_dir: @project_dir,
             branch: @branch

data/lib/worktree/command/cherry_pick.rb

@@ -47,7 +47,7 @@ module Worktree
       end
 
       def clone_dbs
-        if File.exist?("#{@project_dir}/master/config/database.yml")
+        if File.exist?("#{@project_dir}/#{@branch}/config/database.yml")
           Feature::CloneDbs.new(
             project_dir: @project_dir,
             branch: @branch

data/lib/worktree/feature/clone_dbs.rb

@@ -12,7 +12,7 @@ module Worktree
       end
 
       def run!
-        @db_manager = DbManager.new("#{@project_dir}/master/config/database.yml")
+        @db_manager = DbManager.new("#{@project_dir}/#{@branch}/config/database.yml")
         @db_manager.createdb!(db_name)
 
         write!

data/lib/worktree/feature/copy_files.rb

@@ -12,13 +12,15 @@ module Worktree
       end
 
       def run!
-        project_key = Worktree::Project.project_key_for(@branch)
-        paths = Worktree::Config.config.dig('projects', project_key, 'copy_files') || []
-        paths.each { |path| copy_file(path) }
+        files_to_copy.each { |path| copy_file(path) }
       end
 
       private
 
+      def files_to_copy
+        Worktree::Project.resolve(@branch, project_dir: @project_dir).copy_files
+      end
+
       def copy_file(file)
         master_path = "#{@project_dir}/master/#{file}"
         if File.exist?(master_path)

data/lib/worktree/launcher.rb

@@ -22,8 +22,14 @@ module Worktree
     def replace_vars
       {
         worktree_dir: @working_directory,
-        worktree_branch: @branch
+        worktree_branch: @branch,
+        tmux_session_name: tmux_session_name
       }
     end
+
+    # tmux session name cannot contains . or :
+    def tmux_session_name
+      @branch.gsub(/\.|:/, '-')
+    end
   end
 end

data/lib/worktree/project.rb

@@ -2,22 +2,25 @@
 
 module Worktree
   class Project
-    def self.project_key_for(branch)
-      project_keys = Worktree::Config.config['projects'].keys
-      return nil if project_keys.empty?
-
-      re = Regexp.new("^(#{project_keys.join('|')})\-")
-      (branch.match(re) || [])[1]
-    end
-
-    def self.resolve(branch)
-      new(project_key_for(branch))
+    def self.resolve(branch, project_dir: nil)
+      project_key = project_key_by_branch(branch)
+      # try to find project key by dir (cherry-pick or open case)
+      project_key = project_key_by_dir(project_dir) if project_key.nil? && project_dir
+      new(project_key)
     end
 
     def initialize(key)
       @key = key
     end
 
+    def copy_files
+      if @key
+        Worktree::Config.config.dig('projects', @key, 'copy_files') || []
+      else
+        []
+      end
+    end
+
     def root
       if @key
         Worktree::Config.config.dig('projects', @key, 'root').chomp('/')
@@ -25,5 +28,29 @@ module Worktree
         Dir.pwd
       end
     end
+
+    private
+
+    def self.project_key_by_branch(branch)
+      project_keys = Worktree::Config.config['projects'].keys
+      return nil if project_keys.empty?
+
+      re = Regexp.new("^(#{project_keys.join('|')})\-")
+      (branch.match(re) || [])[1]
+    end
+
+    def self.project_key_by_dir(dir)
+      project_keys = Worktree::Config.config['projects'].keys
+      return nil if project_keys.empty?
+
+      project_key = nil
+      Worktree::Config.config['projects'].each do |key, options|
+        if options['root'].chomp('/') == dir
+          project_key = key
+          break
+        end
+      end
+      project_key
+    end
   end
 end

data/lib/worktree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worktree
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Igor Gonchar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport