lbhrr 1.0.6 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f484333308696cc1f728428f328b3c8330b466ddd7dabbcf0bfe7bf61f22fb
-  data.tar.gz: b0b574e3cc24289433bf65f312812732615f8e62045b2c31e84068a38eaeb0c3
+  metadata.gz: '008a4e46f26124d5ddb1ff4a332779770038696ed6a2cfb2b1c8a6de7dddefdc'
+  data.tar.gz: 41a0c0acd33bd7a31c361fa6f626909011e69be41933c77e688544ecc5800991
 SHA512:
-  metadata.gz: f861df26bfb215ecfa3adff8fabb2887df18dfd70dfe7f6ab5abf5dbda58419554db12ac3dfb067ae5849a49f52122504d2688afdcf7fa056b5237ee3f563c3b
-  data.tar.gz: 3eac4bdf9442f160a75c8e6a22e8e28169d7c0b14c71572a1361d1c6d6cbabaf18d96a37caa0b0f6f69c80e5e3d169036c33d6f8102ce05a133edf05f4f367dd
+  metadata.gz: 807c2b1f37b43aad26e88c195250452635107b12e32e15dd5f48894ef50c37e10b36620ec84844f1734becc133a32e970e179f774b071718b79f278d68b689dd
+  data.tar.gz: a40ef0cbf0be98afff535f95b864988cf022a8ba35d8e5909715eeaab866791eed1bdf0290dc483d17e2a333b3fbb7fb4fcb44ce88fd9714d9a0be470a1a7ada

data/config/manifest.yml

@@ -0,0 +1,5 @@
+---
+name: lbhrr
+version: '0'
+port:
+host: lbhrr.harbr.zero2one.ee

data/exe/lbhrr

@@ -1,31 +1,53 @@
 #!/usr/bin/env ruby
-require 'thor'
-require 'yaml'
-require 'tempfile'
-require 'fileutils'
+require_relative "../lib/lbhrr"
 
 class LbhrrCLI < Thor
   no_commands do
+    def package
+      # Load configuration
+      config = load_configuration
+      host = config["host"]
+      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'`
+      `bundle install` or raise "Bundle install failed"
+      # Check if the repository is clean
+      puts "Git repository is dirty, committing changes..."
+      `git add .` or raise "Failed to add changes to Git"
+      `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)
-      begin
-        # Ensure we are in a git repository
-        system("git rev-parse --git-dir > /dev/null 2>&1") or raise "Not a git repository"
+      # Ensure we are in a git repository
+      system("git rev-parse --git-dir > /dev/null 2>&1") or raise "Not a git repository"
 
-        # Amend the last commit with the new message
-        system("git commit --amend -m \"#{new_message}\"") or raise "Failed to amend the last commit"
+      # Amend the last commit with the new message
+      system("git commit --amend -m \"#{new_message}\"") or raise "Failed to amend the last commit"
 
-        puts "Successfully amended the last commit."
-      rescue => e
-        puts "Error during commit amend: #{e.message}"
-      end
+      puts "Successfully amended the last commit."
+    rescue => e
+      puts "Error during commit amend: #{e.message}"
     end
 
     def create_gitignore
-      gitignore_path = File.join(Dir.pwd, '.gitignore')
+      gitignore_path = File.join(Dir.pwd, ".gitignore")
       return if File.exist?(gitignore_path)
 
-      gitignore_content = %q{
+      gitignore_content = '
         # Ignore bundler config and installed gems.
         /.bundle
         # Ignore all logfiles and tempfiles.
@@ -42,7 +64,7 @@ class LbhrrCLI < Thor
         .DS_Store
         .idea
         .byebug_history
-        }
+        '
 
       File.write(gitignore_path, gitignore_content.strip)
       puts ".gitignore created for Rack project."
@@ -50,11 +72,10 @@ class LbhrrCLI < Thor
       puts "Error creating .gitignore: #{e.message}"
     end
 
-    def deployed(version)
+    def deployed(local_manifest_path, version)
       # Git add all changes
+      increment_version(local_manifest_path, version)
       system("git add .") or raise "Failed to add changes to Git"
-
-
       # Commit changes with a message
       commit_message = "Deployed version #{version}"
       amend_last_commit commit_message
@@ -69,26 +90,41 @@ class LbhrrCLI < Thor
 
     def create_example_global_config
       example_global_config = {
-        'user' => 'root',
-        'host' => 'harbr.zero2one.ee'
+        "user" => "root",
+        "host" => "harbr.zero2one.ee"
       }
       YAML.dump(example_global_config)
     end
 
+    def create_run_file
+      run_file_path = File.join(Dir.pwd, "exe", "run")
+      run_file_content = "#!/bin/sh\nbundle 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
+
+      puts "Created ./exe/run file."
+    rescue => e
+      puts "Error creating ./exe/run file: #{e.message}"
+    end
+
     def create_example_local_config
       example_local_config = {
-        'name' => File.basename(Dir.pwd),
-        'version' => '0',
-        'host' => "#{File.basename(Dir.pwd)}.harbr.zero2one.ee'"
+        "name" => File.basename(Dir.pwd),
+        "version" => "0",
+        "port" => "#{File.basename(Dir.pwd)}.app",
+        "host" => "#{File.basename(Dir.pwd)}.harbr.zero2one.ee"
       }
 
       YAML.dump(example_local_config)
     end
 
     def load_configuration
-      global_config_dir = File.expand_path('~/.config/harbr')
-      global_config_path = File.join(global_config_dir, 'harbr.manifest.yml')
-      local_config_path = File.join(Dir.pwd, 'config', 'manifest.yml')
+      global_config_dir = File.expand_path("~/.config/harbr")
+      global_config_path = File.join(global_config_dir, "harbr.manifest.yml")
+      local_config_path = File.join(Dir.pwd, "config", "manifest.yml")
 
       # Ensure global configuration exists
       unless File.exist?(global_config_path)
@@ -99,7 +135,7 @@ 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())
+        File.write(local_config_path, create_example_local_config)
       end
 
       # Load and merge configurations
@@ -112,108 +148,134 @@ class LbhrrCLI < Thor
       new_version = current_version + 1
 
       manifest = YAML.load_file(manifest_path)
-      manifest['version'] = new_version
-      File.open(manifest_path, 'w') { |file| file.write(manifest.to_yaml) }
+      manifest["version"] = new_version
+      File.write(manifest_path, manifest.to_yaml)
       puts "Version incremented to #{new_version}"
-
     end
-
   end
 
   desc "init", "Initialize project with .gitignore"
   def init
-
-    local_config_path = File.join(Dir.pwd, 'config', 'manifest.yml')
+    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)
     end
     # Load and merge configurations
     local_config = YAML.load_file(local_config_path) || {}
     create_gitignore
+    create_run_file
+    
 
     # Include other initialization tasks if necessary
   end
 
-  desc "package", "Prepare the application for deployment"
-  def package
-    begin
-      # Load configuration
-      config = load_configuration
-      host = config['host']
-      user = config['user']
-      version = config['version'].to_i
-      raise "Configuration error: Host, User, or Version missing" unless host && user && version > 0
+  desc "containers", "list all containers"
+  def containers
+    config = load_configuration
+    host = config["host"]
+    user = config["user"]
+    puts `ssh #{user}@#{host} 'harbr containers'`
+  end
 
-      # Check for a git repository
-      unless system("git rev-parse --is-inside-work-tree > /dev/null 2>&1")
-        raise "No Git repository found in the current directory"
-      end
+  desc "drop", "Destroy an app and remove all traces"
+  def drop
+    container_name = File.basename(Dir.pwd)
+    config = load_configuration
+    host = config["host"]
+    user = config["user"]
+    puts "Destroying app: #{container_name}"
+    `ssh #{user}@#{host} 'harbr destroy #{container_name}'`
 
-      # Delete vendor directory if it exists
-      vendor_path = File.join(Dir.pwd, 'vendor')
-      FileUtils.rm_rf(vendor_path) if Dir.exist?(vendor_path)
-      system("bundle install --path vendor/bundle") or raise "Bundle install failed"
-      # 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"
+    current_dir = Dir.pwd
+    parent_dir = File.dirname(current_dir)
+
+    # Requesting confirmation
+    if yes? "Are you sure you want to delete the directory: #{current_dir}? [y/N]"
+      # Proceeding with deletion
+      puts "Changing directory to the parent directory..."
+      Dir.chdir(parent_dir)
+
+      puts "Deleting the directory: #{current_dir}"
+      FileUtils.rm_rf(current_dir)
+
+      Dir.chdir(parent_dir)
+
+      puts "#{current_dir} has been deleted."
 
-      puts "Packaging completed successfully."
-    rescue => e
-      puts "Packaging error: #{e.message}"
     end
+
+    puts "App #{container_name} has been successfully destroyed."
   end
 
+  desc "raise", "Deploy an application using the configuration from config/manifest.yml to staging"
+  def raise
+    package
 
-  desc "deploy", "Deploy an application using the configuration from config/manifest.yml"
-  def deploy
-    begin
-      package
+    config = load_configuration
+    host = config["host"]
+    user = config["user"]
+    raise "Host configuration missing" unless host
 
-      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/#{basename}"
-      versions_directory = "#{base_directory}/versions"
-      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}'")
-
-      # 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}"
+    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"
+    destination_path = "#{versions_directory}/#{version}"
+    current_path = "#{base_directory}/current"
+
+    # 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}'" : ""
+
+    # 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}` &&
+        `ssh #{user}@#{host} 'ln -sfn #{destination_path} #{current_path}'`
+      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"
+  def logs
+    container_name = File.basename(Dir.pwd)
+    config = load_configuration
+    host = config["host"]
+    user = config["user"]
+    exec "ssh #{user}@#{host} 'harbr logs #{container_name}'"
   end
 
 
+
+  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"]
+
+    puts `ssh #{user}@#{host} 'harbr deploy #{name}'`
+  end 
+
+  def self.exit_on_failure?
+    true
+  end
 end
 
 LbhrrCLI.start(ARGV)

data/lbhrr.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/dekubu/lbhrr"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.6.0"
-  
+
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/dekubu/lbhrr"
   spec.metadata["changelog_uri"] = "https://github.com/dekubu/lbhrr/CHANGELOG.md"

data/lib/lbhrr/version.rb

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

data/lib/lbhrr.rb

@@ -1,9 +1,19 @@
 # frozen_string_literal: true
-require "yaml"
 
+require "yaml"
+require "thor"
+require "yaml"
+require "tempfile"
+require "fileutils"
 require_relative "lbhrr/version"
 
 module Lbhrr
   class Error < StandardError; end
+
+  class SelfDelete
+    def delete_current_directory
+    end
+  end
+
   # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lbhrr
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.10
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -47,6 +47,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/manifest.yml
 - exe/lbhrr
 - hero.png
 - lbhrr.gemspec