From c22f5225d69454d376893a88cd95bb3f4f321204 Mon Sep 17 00:00:00 2001 From: Stijn Seghers Date: Tue, 1 Sep 2015 20:57:41 +0200 Subject: [PATCH] No puts --- app/models/repository.rb | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 27a3979..5b6abdd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -34,17 +34,12 @@ class Repository < ActiveRecord::Base def pull_or_clone if Dir.exist? path - puts "Checking remote url of #{name}..." - remote_url = `cd #{path} && git remote -v`.split[1] - if remote_url != authenticated_clone_url - puts 'Setting new remote url...' - `cd #{path} && git remote set-url origin #{authenticated_clone_url}` - end - - puts "Fetching #{name}..." + ensure_correct_remote_url + + logger.info("Fetching #{name}...") `cd #{path} && git fetch && git reset --hard origin/master` else - puts "Cloning #{name}..." + logger.info("Cloning #{name}...") `mkdir -p #{path} && git clone #{authenticated_clone_url} #{path}` end end @@ -98,4 +93,13 @@ def authenticated_clone_url $& + Rails.application.secrets.github_token + '@' end end + + def ensure_correct_remote_url + logger.info("Checking remote url of #{name}...") + remote_url = `cd #{path} && git remote -v`.split[1] + return if remote_url == authenticated_clone_url + + logger.info('Setting new remote url...') + `cd #{path} && git remote set-url origin #{authenticated_clone_url}` + end end