lbhrr 1.0.23 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97455904c9513fd9f6a8c594c5747b85195c9c0e253e2c99d16ca2bc106304d8
-  data.tar.gz: 6b375eef27e9101c046ba628724df7a9ab467a511bc82123adedf3df7fa04881
+  metadata.gz: 6cf67c16657d7441eb1afe1cbe45d92b091582d0909860277bba699fba9409c7
+  data.tar.gz: d3c9bed0e42a7081a639ca0e6341f8fa783e4f848a125125a35d7ed2971d6053
 SHA512:
-  metadata.gz: e07cc919f47975a307d68c1f95ccd09a41114bdbfaf9d480f80c359e66729fdae0476eab46461bb6d306ea437b09d96c0ed97ddb51120e2ba6104e83764b5059
-  data.tar.gz: 2129dee935ff5dd79bebd2e068d75d1bf440c52faf176f9fbf418c7f90e62a543e7b1db30e9d8a9ddbbbb417174e262638fe82574a836a985520e6d6edceff13
+  metadata.gz: bd05fb0380b15ba715342597d558c7477c85719da51e5f2f8b17e77b89bb900613417465d2230209b6a3c8a80702eba2c5d51e6da76d30d9427e5f3e93f9a46d
+  data.tar.gz: c20241b685a9f0a03dd859a1781a2e22053c9a529a3da52013e514e9bf0a6e0ba88eb9a792f15a6ead66827fc860cce56699a0ef53c060e9d62d0b41fb4aa387

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)
@@ -101,24 +100,64 @@ class LbhrrCLI < Thor
       YAML.dump(example_global_config)
     end
 
-    def create_run_file
-      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")
+    def create_run_file(type)
+
+      service_content = <<-RUBY
+      #!/usr/bin/env ruby
+      require 'bundler/inline'
+
+      gemfile do
+        source 'https://rubygems.org'
+        #gem 'kafkr', require: true
+      end
+
+      puts 'Gems installed and loaded!'
+
+      loop do
+        puts 'ok!' 
+        sleep 1
+      end
+
+      RUBY
+
+      if type == "web"
+        run_file_path = File.join(Dir.pwd, "exe", "run")
+        web_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, web_run_file_content)
+        File.chmod(0o755, run_file_path) # Set executable permission
+        puts "Created ./exe/run file."
+      end
+
+      if type == "service"
+        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
+        puts "Created ./exe/run file."
+
+        File.write("service", service_content)
+        File.chmod(0o755, "service") # Set executable permission
+        puts "Created ./service file."
+        
+      end
 
-      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
+      
 
-      puts "Created ./exe/run file."
     rescue => e
       puts "Error creating ./exe/run file: #{e.message}"
     end
 
-    def create_example_local_config
+    def create_example_local_config(type)
       example_local_config = {
         "name" => File.basename(Dir.pwd),
         "version" => "0",
+        "type" => type,
         "port" => "#{File.basename(Dir.pwd)}.app",
         "host" => "#{File.basename(Dir.pwd)}.harbr.zero2one.ee"
       }
@@ -163,17 +202,19 @@ class LbhrrCLI < Thor
   end
 
   desc "init", "Initialize project with .gitignore"
+  method_option :type, type: :string, enum: ['web', 'service'], default: 'web', desc: "Specify the type of process"
   def init
     local_config_path = File.join(Dir.pwd, "config", "manifest.yml")
 
     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)
+      File.write(local_config_path, create_example_local_config(options[:type]))
     end
     # Load and merge configurations
     local_config = YAML.load_file(local_config_path) || {}
     create_gitignore
-    create_run_file
+    create_run_file(options[:type])
+
 
 
     # Include other initialization tasks if necessary
@@ -194,7 +235,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 +252,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 +313,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.26"
 end

metadata

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