go-deploy 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c385399badbee84ad7c506aa7b4655d4a8dbd24cd48a430e5942162b6ff27ae
-  data.tar.gz: e564f308ced04af90337ea9c1d8cb70745bb45afc9fbcf0fdd9bb8afc9683354
+  metadata.gz: 5c9672f6908faee5f19501db53af7230be2f274e0ccb5469e407ddd71a1a47b3
+  data.tar.gz: 7f9cb32b9d55e8ec777d51bae3b90d69b6f8e9d3f3d5afacd0848712f69dcde8
 SHA512:
-  metadata.gz: 2219a8c491e77b8160b5185100c1fb9450f1f1ae8b78201fba5cc0e6811f1340c0b8cc9b957a8239d96fbb96bb120a604193e381c50dcc5968666cf95c0e616f
-  data.tar.gz: '08b60e0511abd792efb684c3c988a8137111b771153238df31dd0a9d1b9889a8dbbd93188da54d4198674d27eb9b69d6312ec6072b6561e9ee204d1658f7681f'
+  metadata.gz: ae6cfd9afe3650118edf1537f72a923631ea3bf6444c876eaf8dc033e3db8563897611c6f0450ad6eff2485d9c1f6a855149d7efa7fd46f873362912e338aaa0
+  data.tar.gz: 976a2416b7282221a11b9e6e3a73a5a67218092a7bb992aabbb77ed34fbbb6298af71100b27e4c1d98906d976b7b99df93a65e2d79e73072b52df41ca52ea003

data/lib/go_deploy/deploy.rb

@@ -64,14 +64,16 @@ module GoDeploy
       # Step 3
       git_clone
       # Step 4
-      set_env
+      git_update
       # Step 5
+      set_env
+      # Step 6
       build_go
-      # Stop 6
-      copy_files
       # Stop 7
-      remove_files
+      copy_files
       # Stop 8
+      remove_files
+      # Stop 9
       start_go_service if @is_restart
     end
 
@@ -93,31 +95,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 #{@deploy_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
@@ -125,13 +134,12 @@ module GoDeploy
         puts "\tStop #{@service_name} service".green
       end
 
-      @console.exec(ssh: ssh, command: "cd #{@service['deploy_to']}/repo && go build -o #{@service_name}")
+      @console.exec(ssh: ssh, command: "cd #{@deploy_to}/repo && go build -o #{@service_name}")
     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 +149,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 +157,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.1.0
 platform: ruby
 authors:
 - Saharak Manoo