go-deploy 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c385399badbee84ad7c506aa7b4655d4a8dbd24cd48a430e5942162b6ff27ae
-  data.tar.gz: e564f308ced04af90337ea9c1d8cb70745bb45afc9fbcf0fdd9bb8afc9683354
+  metadata.gz: 50058ed1eb8d11ed5de965b64fe7199f393f39d92e0d727ce5a11b35846dd29f
+  data.tar.gz: 72cd1cc0ed9a164c397cceb3914da8fcf0e0200a6ced4fa195561f68adfbab2d
 SHA512:
-  metadata.gz: 2219a8c491e77b8160b5185100c1fb9450f1f1ae8b78201fba5cc0e6811f1340c0b8cc9b957a8239d96fbb96bb120a604193e381c50dcc5968666cf95c0e616f
-  data.tar.gz: '08b60e0511abd792efb684c3c988a8137111b771153238df31dd0a9d1b9889a8dbbd93188da54d4198674d27eb9b69d6312ec6072b6561e9ee204d1658f7681f'
+  metadata.gz: ca05a668523babc01f6165e53027b519ac478b441c37fdc374babf32108e993ce7df9d91926922effb265b36a1cbe50217997e1dde88d17a4f3bdfc221a4740b
+  data.tar.gz: bc63fa11fbb69a17009e4f63724d244687adf6bfdc322473278dbff8919a2fb88b9284ce6a4b29a5ca1f42b15cf1961635a35b556bd40272559c9a7c4edc537d

data/lib/go_deploy/deploy.rb

@@ -93,31 +93,38 @@ module GoDeploy
     end
 
     def git_check
+      @git_repo_url = @service['git_repo_url']
       puts 'Step 2 git:check'.green
-      @console.exec(ssh: ssh, command: "git ls-remote #{@service['git_repo_url']} HEAD")
+      @console.exec(ssh: ssh, command: "git ls-remote #{@git_repo_url} HEAD")
     end
 
     def git_clone
       @deploy_to = @service['deploy_to']
       puts 'Step 3 git:clone'.green
       @console.exec(ssh: ssh, command: "mkdir -p #{@deploy_to}")
-      @console.exec(ssh: ssh, command: "git clone #{@service['git_repo_url']} #{@deploy_to}/repo")
+      @console.exec(ssh: ssh, command: "git clone #{@git_repo_url} #{@deploy_to}/repo")
       # clean up files
       @service['copy_files'].each do |file_name|
         @console.exec(ssh: ssh, command: "rm -rf #{@deploy_to}/#{file_name}")
       end
     end
 
+    def git_update
+      puts 'Step 4 git:clone'.green
+      @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && git remote set-url origin #{git_repo_url}")
+      @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && git remote update --prune")
+    end
+
     def set_env
-      project_env_file = "#{@deploy_to}/repo/.env"
+      @deploy_env_file = "#{@deploy_to}/repo/.env"
       @env_file = @service['env_file']
-      puts 'Step 4 set:env'.green
-      @console.log(command: "Uploading #{project_env_file}") if ssh.scp.upload!(@env_file, project_env_file)
+      puts 'Step 5 set:env'.green
+      @console.log(command: "Uploading #{project_env_file}") if ssh.scp.upload!(@env_file, @deploy_env_file)
     end
 
     def build_go
       @service_name = @service['name']
-      puts 'Step 5 build:go'.green
+      puts 'Step 6 build:go'.green
       @is_restart = @service['is_restart']
 
       if @is_restart
@@ -129,9 +136,8 @@ module GoDeploy
     end
 
     def copy_files
-      puts 'Step 6 copy files'.green
-      @service_name = @service['name']
-      @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && mv .env #{@deploy_to}")
+      puts 'Step 7 copy files'.green
+      @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && mv #{@deploy_env_file} #{@deploy_to}")
 
       @service['copy_files'].each do |file_name|
         @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && mv #{file_name} #{@deploy_to}")
@@ -141,7 +147,7 @@ module GoDeploy
     end
 
     def remove_files
-      puts 'Step 7 removed:files'.green
+      puts 'Step 8 removed:files'.green
       @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && mv #{@service_name} #{@deploy_to}")
       @console.exec(ssh: ssh, command: "rm -rf #{@deploy_to}/repo")
       @console.exec(ssh: ssh, command: "rm -rf #{@git_wrapper_path}")
@@ -149,7 +155,7 @@ module GoDeploy
     end
 
     def start_go_service
-      puts "Step 8 systemctl:start:#{@service_name}".green
+      puts "Step 9 systemctl:start:#{@service_name}".green
       @console.sudo_exec(ssh: ssh, command: "sudo systemctl start #{@service_name}.service")
       puts "\tStart #{@service_name} service".green
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Saharak Manoo