dependency_service.rb in fulmar-1.8.1

- old
+ new

@@ -12,32 +12,31 @@
         def setup(env = @config.environment)
           shell = Fulmar::Infrastructure::Service::ShellService.new(@config[:local_path])
           @config.dependencies(env).each_pair do |_key, data|
             next unless data[:type].blank? || data[:type] == 'git'
             shell.quiet = true
-            shell.run "git clone #{data[:source]} #{data[:path]} -q"
-            shell.last_error.each do |line|
-              puts line unless line.include? 'already exists and is not an empty directory'
+
+            if Dir.exist? "#{data[:path]}/.git"
+              shell.run 'git fetch -q', in: data[:path]
+            else
+              shell.run "git clone #{data[:source]} #{data[:path]} -q"
+              shell.last_error.each do |line|
+                puts line unless line.include? 'already exists and is not an empty directory'
+              end
             end
+
+            git = Rugged::Repository.new(data[:path])
+            checkout(git, data)
           end
         end
 
         def update(env = @config.environment)
           @config.dependencies(env).each_pair do |_key, data|
             next unless data[:type].blank? || data[:type] == 'git'
             git = Rugged::Repository.new(data[:path])
 
-            # Switch to the configured branch/tag/commit
-            if git.branches.select { |b| b.name.split('/').last == data[:ref] }.any?
-              checkout_branch(git, data[:ref])
-            elsif git.tags.map(&:name).include?(data[:ref])
-              git.checkout("refs/tags/#{data[:ref]}")
-            elsif data[:ref].match(/^[a-zA-Z0-9]{40}$/) && git.exists?(data[:ref])
-              git.checkout(data[:ref])
-            else
-              fail "Cannot find ref #{data[:ref]} in repo #{data[:path]}"
-            end
+            checkout(git, data)
 
             # Pull
             shell = Fulmar::Infrastructure::Service::ShellService.new data[:path]
             unless shell.run 'git pull --rebase -q'
               fail "Cannot update repository #{data[:path]}. Please update manually."
@@ -45,14 +44,33 @@
           end
         end
 
         protected
 
-        def checkout_branch(git, branch)
+        def checkout(git, dependency)
+          # Switch to the configured branch/tag/commit
+          if git.branches.select { |b| b.name.split('/').last == dependency[:ref] }.any?
+            checkout_branch(git, dependency[:ref])
+          elsif git.tags.map(&:name).include?(dependency[:ref])
+            git.checkout("refs/tags/#{dependency[:ref]}")
+          elsif dependency[:ref].match(/^[a-zA-Z0-9]{40}$/) && git.exists?(dependency[:ref])
+            git.checkout(dependency[:ref])
+          else
+            fail "Cannot find ref #{dependency[:ref]} in repo #{dependency[:path]}"
+          end
+        end
+
+        def checkout_branch(git, branch, remote = 'origin')
           if git.branches.collect(&:name).include? branch
             git.checkout(branch)
           else
-            new_branch = git.branches.create(branch.split('/').last, branch)
+            remote_branch = git.branches.find do |b|
+              b.name == "#{remote}/#{branch}"
+            end
+
+            new_branch = git.branches.create(branch, remote_branch.name)
+            new_branch.upstream=(remote_branch)
+
             git.checkout(new_branch)
           end
         end
       end
     end