lbhrr 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d366665ce2d3cf11822b1e3307de0d9da799428ad5ba420ac9a78aa526b3886
-  data.tar.gz: 5fff131ca6d144186e5d3587c3b2cfbbe0cd35f5bbb70772f711bf50c0a6aabd
+  metadata.gz: 14f484333308696cc1f728428f328b3c8330b466ddd7dabbcf0bfe7bf61f22fb
+  data.tar.gz: b0b574e3cc24289433bf65f312812732615f8e62045b2c31e84068a38eaeb0c3
 SHA512:
-  metadata.gz: bf8db87c2979d12bcce92c3372c3e8202914a13e1d9f1a29c85d66ca593e650f222cb0df08a525eef5a1f07964049363b73d622eb2190d9d242b703e82868dde
-  data.tar.gz: 9d21b6364f353fcaae039d1e5d7cbf7fdb87eaaca68b42d66478afd91218e985ad7cf4dcaafe4db613d358afe962160fee866c2e354797c6f3ecc0e50efbda28
+  metadata.gz: f861df26bfb215ecfa3adff8fabb2887df18dfd70dfe7f6ab5abf5dbda58419554db12ac3dfb067ae5849a49f52122504d2688afdcf7fa056b5237ee3f563c3b
+  data.tar.gz: 3eac4bdf9442f160a75c8e6a22e8e28169d7c0b14c71572a1361d1c6d6cbabaf18d96a37caa0b0f6f69c80e5e3d169036c33d6f8102ce05a133edf05f4f367dd

data/exe/lbhrr

@@ -77,6 +77,7 @@ class LbhrrCLI < Thor
 
     def create_example_local_config
       example_local_config = {
+        'name' => File.basename(Dir.pwd),
         'version' => '0',
         'host' => "#{File.basename(Dir.pwd)}.harbr.zero2one.ee'"
       }
@@ -166,7 +167,6 @@ class LbhrrCLI < Thor
   end
 
 
-
   desc "deploy", "Deploy an application using the configuration from config/manifest.yml"
   def deploy
     begin
@@ -187,37 +187,32 @@ class LbhrrCLI < Thor
       basename = File.basename(Dir.pwd)
       base_directory = "/var/harbr/#{basename}"
       versions_directory = "#{base_directory}/versions"
-      previous_version_path = "#{versions_directory}/#{version - 1}"
       destination_path = "#{versions_directory}/#{version}"
       current_path = "#{base_directory}/current"
 
       # Check and create the versions directory on the server
       system("ssh #{user}@#{host} 'mkdir -p #{versions_directory}'")
 
-      # Copy the previous version to the new version directory if it exists
-      system("ssh #{user}@#{host} '[ -d #{previous_version_path} ] && cp -R #{previous_version_path} #{destination_path} || mkdir -p #{destination_path}'")
-
-      # Obtain the list of files tracked by Git and write to a temp file
-      git_tracked_files = `git ls-files`.split("\n")
-      Tempfile.create('git_files') do |tempfile|
-        git_tracked_files.each { |file| tempfile.puts(file) }
-        tempfile.close
-
-        # Rsync files to the new version directory and update the symlink
-        if system("rsync -avz --exclude=.git --files-from=#{tempfile.path} ./ #{user}@#{host}:#{destination_path}") &&
-          system("ssh #{user}@#{host} 'ln -sfn #{destination_path} #{current_path}'")
-          puts "Successfully deployed application version #{version} to #{host}"
-          increment_version(local_manifest_path, version)
-          deployed(version)
-        else
-          puts "Failed to deploy application version #{version} to #{host}"
-        end
+      # Prepare the rsync exclude option using .gitignore
+      gitignore_path = File.join(Dir.pwd, '.gitignore')
+      exclude_option = File.exist?(gitignore_path) ? "--exclude='.git' --exclude-from='#{gitignore_path}'" : ""
+
+      # Rsync files to the new version directory, excluding files as per .gitignore
+      rsync_command = "rsync -avz #{exclude_option} ./ #{user}@#{host}:#{destination_path}"
+
+      if system(rsync_command) &&
+        system("ssh #{user}@#{host} 'ln -sfn #{destination_path} #{current_path}'")
+        puts "Successfully deployed application version #{version} to #{host}"
+        increment_version(local_manifest_path, version)
+        deployed(version)
+      else
+        puts "Failed to deploy application version #{version} to #{host}"
       end
     rescue => e
       puts "Deployment error: #{e.message}"
     end
   end
-  # new method goes here
+
 
 end
 

data/lib/lbhrr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lbhrr
-  VERSION = "1.0.1"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lbhrr
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh