harbr 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28f2c1235e59113b8c839c9415029ee430dd17a7f5b9faee3c7b87e702d1985c
-  data.tar.gz: 4fb3a9e958c0409d63e04e2430cfb0d5133991e4971fde94f41c9e5b79ecf0f6
+  metadata.gz: ba1c2de0c57a31b1b85b0f7140e05995404a1a013502c6d01a965f709bb8b3b3
+  data.tar.gz: 95d574f90f0c21d580a924f3e8318b8af529ff2ded73574825bda2c65aa30640
 SHA512:
-  metadata.gz: 8982a2e3d0fc1373af022ef5bace65c89fa4113539bc09606e4d58d8cb491b21c4de980638a1543747588230558013fbc1248be62fb50fbe6ece2d0d31d850cf
-  data.tar.gz: ea16bacf0c5a6f444a9cf946443bd01eeea71147cf0e7ffff751c44264c891aa9b0001de094980851d87fc6621562eed0938df2ca76f2911c121bf6a162634bd
+  metadata.gz: f5b081f4e73595bd8597fa05aa97dc2612869f9a96340df638fb6109859657e34909c3b0532d5bc2b1b76a67e07cb31d3e52c868f0740de5fbcad26ea118a37f
+  data.tar.gz: 5c99af944a71d9f31ef2412bdeb1cdbef04ed32e81df82259596a82397f90a21aac10770cffd196616e149ba4291fe10d94ed6aec3058f6c888004aaacd31a42

data/exe/harbr

@@ -1,33 +1,23 @@
 #!/usr/bin/env ruby
-require 'thor'
-require 'listen'
-require 'dddr'
-require 'harbr'
-require 'sucker_punch'
-require 'terminal-table'
+require "thor"
+require "dddr"
+require "harbr"
+require "sucker_punch"
+require "terminal-table"
 
 class HarbrCLI < Thor
-  DEFAULT_DIRECTORY = '/var/harbr'
+  DEFAULT_DIRECTORY = "/var/harbr"
   DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
-  @@listener = nil
-
   Dddr.configure do |config|
     config.data_dir = DEFAULT_DIRECTORY_DATA_DIR
   end
 
-
   no_commands do
-
-    def extract_container_name(path)
-      match = path.match(/\/var\/harbr\/(?<container_name>.*)\/versions\/\d*\/config\/manifest.yml/)
-      match ? match[:container_name] : nil
-    end
-
     def display_containers_table(containers)
       return puts "No containers available." if containers.empty?
 
       # Define headers based on Container attributes
-      headers = ['Name', 'Host Header', 'IP', 'Port']
+      headers = ["Name", "Host Header", "IP", "Port"]
 
       rows = containers.map do |container|
         [container.name, container.host_header, container.ip, container.port]
@@ -41,7 +31,6 @@ class HarbrCLI < Thor
       puts ""
     end
 
-
     def check_and_create_directory(path)
       unless Dir.exist?(path)
         puts "Creating directory: #{path}"
@@ -63,83 +52,59 @@ class HarbrCLI < Thor
       system("sudo apt install #{package}") or raise "Failed to install #{package}"
     end
 
+    def scan_for_containers
+      Dir.glob("/var/harbr/*").each_with_object({}) do |container_path, hash|
+        next unless File.directory?(container_path)
+        container_name = File.basename(container_path)
+        versions = Dir.glob("#{container_path}/versions/*").select { |path| File.directory?(path) }
+        versions.each { |version_path| hash["#{container_name}/versions/#{File.basename(version_path)}"] = true }
+      end
+    end
+
+    def place(container, version)
+      puts "Placing container: '#{container}', Version: '#{version}'"
+    end
+
   end
 
   desc "setup", "Set up Harbr environment"
   def setup
     # Check and create /var/harbr directory
-    check_and_create_directory('/var/harbr')
+    check_and_create_directory("/var/harbr")
 
     # Check for Ruby, Traefik, and runit, and install if necessary
-    install_with_snap('ruby') unless command_exists?('ruby')
-    install_with_snap('traefik') unless command_exists?('traefik')
-    install_with_apt('runit') unless command_exists?('runit')
+    install_with_snap("ruby") unless command_exists?("ruby")
+    install_with_snap("traefik") unless command_exists?("traefik")
+    install_with_apt("runit") unless command_exists?("runit")
 
     puts "Setup completed successfully."
   end
 
-  desc "start [DIRECTORY]", "Start listening to a directory for changes"
-  def start(directory = DEFAULT_DIRECTORY)
-    return if @@listener
+  desc "containers", "show all containers"
+  def containers
+    container_repo = Harbr::Container::Repository.new
+    display_containers_table(container_repo.all)
+  end
 
-    puts "Starting Harbr, listening to #{directory}"
+  desc "monitor", "Monitor /var/harbr for new container versions"
+  def monitor
+    puts "Monitoring /var/harbr for new container versions..."
+    last_known_state = {}
 
-    @@listener = Listen.to(directory) do |modified, added, removed|
-      job_created = false
+    loop do
+      current_state = scan_for_containers
+      new_versions = current_state.keys - last_known_state.keys
 
-      added.each do |path|
-        next if job_created
-        if path.match?(/\/var\/harbr\/.*\/versions\/\d*\/config\/manifest.yml/)
-          container_name = extract_container_name(path)
-          if container_name
-            Harbr::Container::Job.perform_async(container_name)
-            job_created = true
-          end
-        end
+      new_versions.each do |container_version|
+        container, version = container_version.split("/versions/")
+        place(container, version)
       end
-    end
-    @@listener.start # not blocking
-    sleep
-  end
-
-  desc "stop", "Stop Harbr"
-  def stop
-    if @@listener
-      @@listener.stop
-      @@listener = nil
-      puts "Harbr has been stopped."
-    else
-      puts "Harbr is not running."
-    end
-  end
-
-  desc "pause", "Pause Harbr"
-  def pause
-    if @@listener
-      @@listener.pause
-      puts "Harbr has been paused."
-    else
-      puts "Harbr is not running or already paused."
-    end
-  end
 
-  desc "resume", "Resume Harbr"
-  def resume
-    if @@listener
-      @@listener.start
-      puts "Harbr has been resumed."
-    else
-      puts "Harbr is not running or already active."
+      last_known_state = current_state
+      sleep 10 # Poll every 10 seconds
     end
   end
 
-  desc "containers", "show all containers"
-  def containers
-    container_repo = Harbr::Container::Repository.new
-    display_containers_table(container_repo.all)
-  end
-
 end
 
 HarbrCLI.start(ARGV)
-

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/harbr.rb

@@ -1,59 +1,55 @@
 # frozen_string_literal: true
+
 require_relative "harbr/version"
-require 'dddr'
-require 'sucker_punch'
+require "dddr"
+require "sucker_punch"
 
 module Harbr
   class Error < StandardError; end
-   class Container
+
+  class Container
     class Job
       include SuckerPunch::Job
-    
+
       def perform(config)
-  
         puts "Harbr Job!"
         puts config
-  
       end
     end
 
     include Dddr::Entity
-    attr_accessor :name, :host_header, :ip, :port  
-   end
+    attr_accessor :name, :host_header, :ip, :port
+  end
 
-   class Port
-    
+  class Port
     include Dddr::Entity
     attr_accessor :host_header, :number
 
     queries do
       def has_port_number?(number)
-        all.find {|port| port.number == number.to_i}
+        all.find { |port| port.number == number.to_i }
       end
+
       def assigned_a_port?(host_header)
-        all.find {|port| port.host_header == host_header}
+        all.find { |port| port.host_header == host_header }
       end
     end
     class Pool
-      def initialize(port_range=50000..51000)
-        
+      def initialize(port_range = 50000..51000)
         @repository = Port::Repository.new
 
         port_range.each do |number|
-          
-          port = Port.new        
+          port = Port.new
           port.number = number
-          
+
           unless @repository.has_port_number? number
-            @repository.add(port) 
+            @repository.add(port)
             puts port.number.to_s + " added!"
           end
         end
-
       end
-    
+
       def get_port(host_header)
-        
         port = @repository.assigned_a_port?(host_header)
         return port unless port.nil?
 
@@ -68,16 +64,12 @@ module Harbr
         @repository.update(port)
         port.host_header.nil?
       end
-    
+
       def ports
         @repository.all
       end
-
     end
-
-
   end
-  
-   
-   # Your code goes here...
+
+  # Your code goes here...
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harbr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Delaney Kuldvee Burke
@@ -90,6 +90,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".data/development/Harbr::Container.dir"
+- ".data/development/Harbr::Container.pag"
+- ".data/development/Harbr::Port.dir"
+- ".data/development/Harbr::Port.pag"
 - ".rspec"
 - ".standard.yml"
 - CHANGELOG.md