lbhrr 1.0.14 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e90a2b243aace3a947a0eff39b02f2c26bba159108b901ffbbb90027cb647a
-  data.tar.gz: d2eb572f8a1310a2c23f5c7e1bc760283c21a023da56e06f879394dfb7526b3c
+  metadata.gz: 4672124c05861a59b6c7a12afbdf25563b15ecc15c698fe77e0a4c4de23f8f61
+  data.tar.gz: 6cc0597a46d143e69f870467d1003ae5986cb62d808e157fe2467e3c37a78705
 SHA512:
-  metadata.gz: 95fe5d60e5b94f0e7a08eb32543a555d24595d87f56e8ace942bb96701e6657cda2796b4ec868a50430b5b645893e9277854bff143d34074d85297c4169deb40
-  data.tar.gz: f202266c171819ae6ef96a2b12483615eb4c0a06a988f1b34770f60deacc8cb066eb629c41af0bdf232ecfb9e22c1a7336688c0d65be8dccbfab3a22593c3731
+  metadata.gz: 72c0ae593f56228adea25476e52ad041a2a6dc47eb11b1286a4507cb3d102814c7be8c34f1da3ad22f6529747d8dc080f5d95acbef242cf97eb3310a3e84eeb1
+  data.tar.gz: e535024b2126c1f5f0acdd11b676317cc5001db417875d81b5414bcbf205e5f92e534eb5679252a054a9b2196bba5689f1bb8adc3e49e6d0721d0b158176a757

data/exe/lbhrr

@@ -3,6 +3,11 @@ require_relative "../lib/lbhrr"
 
 class LbhrrCLI < Thor
   no_commands do
+
+    def manifest?
+      File.join(Dir.pwd, "config","manifest.yml")
+    end
+
     def package
       # Load configuration
       config = load_configuration
@@ -100,7 +105,7 @@ class LbhrrCLI < Thor
       run_file_path = File.join(Dir.pwd, "exe", "run")
       run_file_content = "#!/bin/sh\n HARBR_ENV=$2 bundle exec puma -p $1"
       exe_directory = File.join(Dir.pwd, "exe")
-      
+
       Dir.mkdir(exe_directory) unless Dir.exist?(exe_directory)
       File.write(run_file_path, run_file_content)
       File.chmod(0o755, run_file_path) # Set executable permission
@@ -134,14 +139,17 @@ class LbhrrCLI < Thor
 
       # Ensure local configuration exists
       unless File.exist?(local_config_path)
-        FileUtils.mkdir_p(File.dirname(local_config_path)) unless Dir.exist?(File.dirname(local_config_path))
-        File.write(local_config_path, create_example_local_config)
       end
 
       # Load and merge configurations
       global_config = YAML.load_file(global_config_path) || {}
-      local_config = YAML.load_file(local_config_path) || {}
-      global_config.merge(local_config)
+
+      if File.exist? local_config_path
+        local_config = YAML.load_file(local_config_path) || {}
+        global_config.merge(local_config)
+      end
+
+      global_config
     end
 
     def increment_version(manifest_path, current_version)
@@ -166,7 +174,7 @@ class LbhrrCLI < Thor
     local_config = YAML.load_file(local_config_path) || {}
     create_gitignore
     create_run_file
-    
+
 
     # Include other initialization tasks if necessary
   end
@@ -185,8 +193,13 @@ class LbhrrCLI < Thor
     config = load_configuration
     host = config["host"]
     user = config["user"]
+
     puts "Destroying app: #{container_name}"
     `ssh #{user}@#{host} 'harbr destroy #{container_name}'`
+    unless manifest?
+      puts "no manifest found!"
+      return
+    end
 
     current_dir = Dir.pwd
     parent_dir = File.dirname(current_dir)
@@ -228,15 +241,17 @@ class LbhrrCLI < Thor
     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}"
-    
-    # Check and create the versions directory on the server
-    `ssh #{user}@#{host} 'mkdir -p #{versions_directory}'`
-
     # 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}"
 
@@ -251,12 +266,29 @@ class LbhrrCLI < Thor
   end
 
   desc "logs", "Show logs for a container"
-  def logs
-    container_name = File.basename(Dir.pwd)
+  method_option :live, type: :boolean, aliases: "-l", desc: "Process in live mode"
+  method_option :next, type: :boolean, default: true, aliases: "-n", desc: "Process in next mode"
+  def logs(name=nil)
     config = load_configuration
     host = config["host"]
     user = config["user"]
-    exec "ssh #{user}@#{host} 'harbr peek #{container_name}'"
+
+    if name.nil?
+      unless manifest?
+        puts "no manifest found!"
+        return
+      end
+
+      container_name = File.basename(Dir.pwd)
+    else
+      container_name = name
+    end
+
+    if options[:live]
+      exec "ssh #{user}@#{host} 'harbr peek #{container_name} --live'"
+    else
+      exec "ssh #{user}@#{host} 'harbr peek #{container_name} --next'"
+    end
   end
 
 
@@ -271,22 +303,34 @@ class LbhrrCLI < Thor
 
 
   desc "hoist", "Deploy an application using the configuration from config/manifest.yml to production"
-  def hoist
-    config = load_configuration
-    host = config["host"]
-    user = config["user"]
-    name = config["name"]
+  def hoist(name=nil)
+    if name.nil?
+      unless manifest?
+        puts "no manifest found!"
+        return
+      end
 
+      config = load_configuration
+      host = config["host"]
+      user = config["user"]
+      name = config["name"]
+    end
     puts `ssh #{user}@#{host} 'harbr deploy #{name}'`
   end 
 
   desc "rollback", "rollback an application using the configuration from config/manifest.yml"
-  def rollback
-    config = load_configuration
-    host = config["host"]
-    user = config["user"]
-    name = config["name"]
+  def rollback(name=nil)
+    if name.nil?
+      unless manifest?
+        puts "no manifest found!"
+        return
+      end
 
+      config = load_configuration
+      host = config["host"]
+      user = config["user"]
+      name = config["name"]
+    end
     puts `ssh #{user}@#{host} 'harbr rollback #{name}'`
   end 
 

data/lib/lbhrr/version.rb

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

metadata

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