lbhrr 1.0.27 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9316b3555eea12d2403c4b53f2294a09652458267b803938f725667b27b1ac4
-  data.tar.gz: aecf3fa3443f1ee16c92e59ae8936631e4e6d489194edad83fdfe316240c40ae
+  metadata.gz: d227165ee1807a1d93fa79f40934df7b04738dd33ee5d1e052e15570862218af
+  data.tar.gz: 31ff59aadaa7d98b6a8e1e6a52496f444902bb87910a9f818d713efc8b7bfda4
 SHA512:
-  metadata.gz: 032ad826d862ae97d42e9ab573ce72ff00d985c3492931513b3de411e431ed08e5a6e0ea7e63d555c85c0d338b13c78907c584835ef9e9ed961f7141682a03e3
-  data.tar.gz: 6be6169070b182d3f54d254c81aa53391f49bee00d45e3d9a0c6fca6b08e0299c84ae714635793366dbfe93b4a5703ccf78271fe1450de66cd84b84a041ded21
+  metadata.gz: d7b52bdd9bfb3b0c0c492b621119a613407c5b5266289aa06246e1a86a2cf30f12eefb15693d718e1e0ccc5654f3235cd9aadfa63a7567c33b8a23ef916fd08f
+  data.tar.gz: 942c57b8f351cadff9ff01366122c53ab30e827b6ac00847fcfac498dbffc2d43e2195491265ccd4276dbade8c9172c98c50b153723299187575551e613ce5a9

data/exe/lbhrr

@@ -15,22 +15,23 @@ class LbhrrCLI < Thor
       user = config["user"]
       port = config["port"]
       version = config["version"].to_i
-      raise "Configuration error: Host, User, or Version missing" unless host && port && user && version > 0
 
       # Check for a git repository
       unless `git rev-parse --is-inside-work-tree > /dev/null 2>&1`
         raise "No Git repository found in the current directory"
       end
 
-      # Delete vendor directory if it exists
-      vendor_path = File.join(Dir.pwd, "vendor")
-      FileUtils.rm_rf(vendor_path) if Dir.exist?(vendor_path)
-      `bundle config set --local path 'vendor/bundle'`
-      system "bundle install" or raise "Bundle install failed"
+      if File.exist? "Gemfile"
+        vendor_path = File.join(Dir.pwd, "vendor")
+        FileUtils.rm_rf(vendor_path) if Dir.exist?(vendor_path)
+        `bundle config set --local path 'vendor/bundle'`
+        system "bundle install" or raise "Bundle install failed"
+      end
+
       # Check if the repository is clean
       puts "Git repository is dirty, committing changes..."
       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"
+      system("git commit -m 'packaged #{version}'")
       puts "Packaging completed successfully."
 
     end
@@ -103,22 +104,22 @@ class LbhrrCLI < Thor
     def create_run_file(type)
 
       service_content = <<-RUBY
-      #!/usr/bin/env ruby
-      require 'bundler/inline'
+#!/usr/bin/env ruby
 
-      gemfile do
-        source 'https://rubygems.org'
-        #gem 'kafkr', require: true
-      end
+require 'bundler/inline'
 
-      puts 'Gems installed and loaded!'
+gemfile do
+  source 'https://rubygems.org'
+  #gem 'kafkr', require: true
+end
 
-      loop do
-        puts 'ok!' 
-        sleep 1
-      end
+puts 'Gems installed and loaded!'
 
-      RUBY
+loop do
+  puts 'ok!' 
+  sleep 1
+end
+RUBY
 
       if type == "web"
         run_file_path = File.join(Dir.pwd, "exe", "run")
@@ -135,7 +136,7 @@ class LbhrrCLI < Thor
         run_file_path = File.join(Dir.pwd, "exe", "run")
         service_run_file_content = "#!/bin/sh\n HARBR_ENV=$2 ruby service"
         exe_directory = File.join(Dir.pwd, "exe")
-        
+
         Dir.mkdir(exe_directory) unless Dir.exist?(exe_directory)
         File.write(run_file_path, service_run_file_content)
         File.chmod(0o755, run_file_path) # Set executable permission
@@ -144,10 +145,10 @@ class LbhrrCLI < Thor
         File.write("service", service_content)
         File.chmod(0o755, "service") # Set executable permission
         puts "Created ./service file."
-        
+
       end
 
-      
+
 
     rescue => e
       puts "Error creating ./exe/run file: #{e.message}"
@@ -159,7 +160,8 @@ class LbhrrCLI < Thor
         "version" => "0",
         "type" => type,
         "port" => "#{File.basename(Dir.pwd)}.app",
-        "host" => "#{File.basename(Dir.pwd)}.harbr.zero2one.ee"
+        "host" => "#{File.basename(Dir.pwd)}.harbr.zero2one.ee",
+        "host_aliases" => []
       }
 
       YAML.dump(example_local_config)
@@ -167,7 +169,7 @@ class LbhrrCLI < Thor
 
     def load_configuration
       global_config_dir = File.expand_path("~/.config/harbr")
-      global_config_path = File.join(global_config_dir, "harbr.manifest.yml")
+      global_config_path = File.join(global_config_dir, "manifest.yml")
       local_config_path = File.join(Dir.pwd, "config", "manifest.yml")
 
       # Ensure global configuration exists
@@ -185,7 +187,7 @@ class LbhrrCLI < Thor
 
       if File.exist? local_config_path
         local_config = YAML.load_file(local_config_path) || {}
-        global_config.merge(local_config)
+        global_config.merge!(local_config)
       end
 
       global_config
@@ -253,22 +255,22 @@ class LbhrrCLI < Thor
   desc "lift", "Deploy an application using the configuration from config/manifest.yml to next"
   def lift
     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"
@@ -277,22 +279,22 @@ class LbhrrCLI < Thor
       # 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!"
     end
@@ -355,7 +357,7 @@ class LbhrrCLI < Thor
 
   desc "rollback", "rollback an application using the configuration from config/manifest.yml"
   def rollback(name=nil)
-    
+
     config = load_configuration
     host = config["host"]
     user = config["user"]

data/lib/lbhrr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lbhrr
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.1.1
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A CLI tool for deploying and managing Rack applications.