lbhrr 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97455904c9513fd9f6a8c594c5747b85195c9c0e253e2c99d16ca2bc106304d8
-  data.tar.gz: 6b375eef27e9101c046ba628724df7a9ab467a511bc82123adedf3df7fa04881
+  metadata.gz: dd06f5b2b2c2ead4e766e8db02df61b8e698cbf9a45c96ab63724c74644114d6
+  data.tar.gz: e2c15f6103ed1a0f4a1d9f356bb08ad7fdb8e7f6ac6245d27ef1eb0ee9c912be
 SHA512:
-  metadata.gz: e07cc919f47975a307d68c1f95ccd09a41114bdbfaf9d480f80c359e66729fdae0476eab46461bb6d306ea437b09d96c0ed97ddb51120e2ba6104e83764b5059
-  data.tar.gz: 2129dee935ff5dd79bebd2e068d75d1bf440c52faf176f9fbf418c7f90e62a543e7b1db30e9d8a9ddbbbb417174e262638fe82574a836a985520e6d6edceff13
+  metadata.gz: 5ed7d928a8b43c5930aff091d063589843daf4d4975bf0f08f983e28492d4abadd5560477637747bb81cf581605125f8b426dc18d6730de7e8191a7c56c70178
+  data.tar.gz: 273804677d3c8e4bdb2916d9f5a09ea201a40ddc118c831c2942db69b81136f6fddf08c75980a818199beb5dc839f0769ddafd36ddf7f2bb8d74e973ff2d14d4

data/exe/lbhrr

@@ -5,7 +5,7 @@ class LbhrrCLI < Thor
   no_commands do
 
     def manifest?
-      File.join(Dir.pwd, "config","manifest.yml")
+      File.exist? File.join(Dir.pwd, "config","manifest.yml")
     end
 
     def package
@@ -32,8 +32,7 @@ class LbhrrCLI < Thor
       system("git add .") or raise "Failed to add changes to Git"
       system("git commit -m 'packaged #{version}'") or raise "Failed to commit changes to Git"
       puts "Packaging completed successfully."
-    rescue => e
-      puts "Packaging error: #{e.message}"
+
     end
 
     def amend_last_commit(new_message)
@@ -194,7 +193,13 @@ class LbhrrCLI < Thor
     user = config["user"]
 
     if name.nil?
-      name = File.basename(Dir.pwd)
+
+      unless manifest?
+        puts "no manifest found!"
+        return
+      end
+
+      name = config["name"]
     end
 
     puts "Destroying app: #{name}"
@@ -205,50 +210,51 @@ class LbhrrCLI < Thor
 
   desc "raise", "Deploy an application using the configuration from config/manifest.yml to staging"
   def raise
-    unless manifest?
+    if manifest?
+      
+      package
+      
+
+      config = load_configuration
+      host = config["host"]
+      user = config["user"]
+      raise "Host configuration missing" unless host
+  
+      local_manifest_path = File.join(Dir.pwd, "config", "manifest.yml")
+      raise "Local manifest file not found at #{local_manifest_path}" unless File.exist?(local_manifest_path)
+  
+      local_config = YAML.load_file(local_manifest_path) || {}
+      version = local_config["version"].to_i
+      raise "Version not specified in manifest.yml" unless version
+  
+      basename = File.basename(Dir.pwd)
+      base_directory = "/var/harbr/containers/#{basename}"
+      versions_directory = "#{base_directory}/versions"
+      data_directory = "/var/dddr/#{basename}/"
+      destination_path = "#{versions_directory}/#{version}"
+      # 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}'" : ""
+  
+  
+      # Check and create the versions directory on the server
+      `ssh #{user}@#{host} 'mkdir -p #{versions_directory}'`
+      `ssh #{user}@#{host} 'mkdir -p #{data_directory}'`
+  
+      # Rsync files to the new version directory, excluding files as per .gitignore
+      rsync_command = "rsync -avz #{exclude_option} ./ #{user}@#{host}:#{destination_path}"
+  
+      if `#{rsync_command}`
+        puts "Successfully deployed application version #{version} to #{host}"
+        deployed(local_manifest_path, version)
+      else
+        puts "Failed to deploy application version #{version} to #{host}"
+      end
+    
+    else 
       puts "no manifest found!"
-      return
     end
 
-    package
-
-    config = load_configuration
-    host = config["host"]
-    user = config["user"]
-    raise "Host configuration missing" unless host
-
-    local_manifest_path = File.join(Dir.pwd, "config", "manifest.yml")
-    raise "Local manifest file not found at #{local_manifest_path}" unless File.exist?(local_manifest_path)
-
-    local_config = YAML.load_file(local_manifest_path) || {}
-    version = local_config["version"].to_i
-    raise "Version not specified in manifest.yml" unless version
-
-    basename = File.basename(Dir.pwd)
-    base_directory = "/var/harbr/containers/#{basename}"
-    versions_directory = "#{base_directory}/versions"
-    data_directory = "/var/dddr/#{basename}/"
-    destination_path = "#{versions_directory}/#{version}"
-    # 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}'" : ""
-
-
-    # Check and create the versions directory on the server
-    `ssh #{user}@#{host} 'mkdir -p #{versions_directory}'`
-    `ssh #{user}@#{host} 'mkdir -p #{data_directory}'`
-
-    # Rsync files to the new version directory, excluding files as per .gitignore
-    rsync_command = "rsync -avz #{exclude_option} ./ #{user}@#{host}:#{destination_path}"
-
-    if `#{rsync_command}`
-      puts "Successfully deployed application version #{version} to #{host}"
-      deployed(local_manifest_path, version)
-    else
-      puts "Failed to deploy application version #{version} to #{host}"
-    end
-  rescue => e
-    puts "Deployment error: #{e.message}"
   end
 
   desc "logs", "Show logs for a container"
@@ -265,7 +271,8 @@ class LbhrrCLI < Thor
         return
       end
 
-      container_name = File.basename(Dir.pwd)
+      container_name = config["name"]
+
     else
       container_name = name
     end

data/lib/lbhrr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbhrr
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Delaney Kuldvee Burke