aethernal-agent 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e121aa44ebced63bde59f1a7b9522dace4bc8d3c72f203900ae8cb22fb12f3c
-  data.tar.gz: 77e7e31e5d372af0518583bb747a9f0e61e8125bb766935d44ffecb238613fcf
+  metadata.gz: 0f64b513fb0eb9a86d74289efec2c7e9434f289abbfcf64f1431c011c09b7bc3
+  data.tar.gz: 36c7972cc224a9afedd8c3e44fb3aa2f2fb7ad96d7c1572c1a57293dc67f9991
 SHA512:
-  metadata.gz: 6c38eeecfa82b00825727db492412f2f53c737b8ab69178eab9d34d4c159c1ca682ccc2850d831e993e1f17c309d91a6320bf3ce1e6aeabba3d091ca72e50392
-  data.tar.gz: e5e80f5b7dd3dbeff09be5731018e94c1b367f21fa3a815a1021603f25cd38e0791fa10cce74501f70cb81ec2bcf7fee7d0743b977b86f79241acdf5be115c91
+  metadata.gz: 268aeb60c33f57f8eab3b9fafff11ac281963aa2b02a9ac9681c5f334f4fc768a615d0be2622fc388f80152c1b382fc2d109eff5f262c40ad244e8effb154ff2
+  data.tar.gz: 1d99191e44b70103627c91979840e4784b680e4176ef6d75d5c42bb31a10f1f9e7195e77fda3502bdb5ebfa1fe26baa76046d182307795dcbdea589f79d21ae4

data/Gemfile.lock

@@ -1,18 +1,20 @@
 PATH
   remote: .
   specs:
-    aethernal-agent (0.3.6)
+    aethernal-agent (0.4.0)
       activesupport
       bcrypt
       docker-api (~> 1.34.2)
       sinatra (~> 2.0.7)
       sinatra-contrib
       sqlite3
+      terminal-table
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.3)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -26,7 +28,7 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.76.0)
+    excon (0.78.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
@@ -86,11 +88,15 @@ GEM
       net-telnet (= 0.1.1)
       sfl
     sqlite3 (1.4.2)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/aethernal-agent.gemspec

@@ -43,4 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3"
   spec.add_dependency "bcrypt"
   spec.add_dependency "docker-api", "~> 1.34.2"
+  spec.add_dependency "thor"
+  spec.add_dependency "terminal-table"
 end

data/bin/install-aa

@@ -42,14 +42,15 @@ aethernal_exists(){
   [ -e "" ]
 }
 start_aa(){
-  run service aethernal-agent enable
-  run service aethernal-agent start
+  run systemctl enable aethernal-agent
+  run systemctl start aethernal-agent
 }
 stop_aa(){
-  run service aethernal-agent stop
+  run systemctl stop aethernal-agent
 }
 restart_aa(){
-  run service aethernal-agent restart
+  stop_aa
+  start_aa
 }
 update_services(){
       if ! curl -o /lib/systemd/system/aethernal-agent.service https://storage.googleapis.com/bysh-chef-files/aethernal-agent.service;then
@@ -68,7 +69,6 @@ install_deps(){
 install_gem(){
     info "Downloading latest Aethernal Agent gem release"
     run gem install --no-doc aethernal-agent
-    restart_aa
 }
 
 install_ci(){
@@ -80,7 +80,6 @@ install_ci(){
 
    run unzip -o /tmp/aa.zip -d /tmp/
    run gem install --no-document /tmp/pkg/aethernal-agent*.gem
-   restart_aa
 }
 
 main() {
@@ -108,13 +107,15 @@ main() {
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     run apt-get install -y docker-ce
   fi
-  update_services
 
   if [[ "$1" = "from-ci" ]];then
     install_ci
   else
     install_gem
   fi
+
+  update_services
+  restart_aa
 }
 
 main $@

data/exe/aa-cli

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require "aethernal_agent"
+
+AethernalAgent::Cli::Core.start

data/lib/aethernal_agent.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'thor'
 require 'docker-api'
 require 'sqlite3'
 require 'active_support/core_ext/hash/indifferent_access'
@@ -10,6 +11,7 @@ require 'socket'
 require 'logger'
 require 'bcrypt'
 require 'net/http'
+require 'terminal-table'
 
 require 'aethernal_agent/app'
 require 'aethernal_agent/loader'
@@ -21,6 +23,7 @@ require 'aethernal_agent/template'
 require 'aethernal_agent/operation'
 require 'aethernal_agent/operation_pool'
 require 'aethernal_agent/version'
+require 'aethernal_agent/cli/core'
 
 module AethernalAgent
 

data/lib/aethernal_agent/app.rb

@@ -91,6 +91,7 @@ module AethernalAgent
           run_command("git clone #{self.manifest['package']['git']['url']} #{File.join(app_path)}")
         when 'docker'
           options = self.manifest.package['docker']
+          AethernalAgent.logger.info("Pulling Docker image #{options['image']}")
           run_command("docker pull #{options['image']}")
         end
       end
@@ -150,15 +151,9 @@ module AethernalAgent
       yield opts if block_given?
       AethernalAgent.logger.debug("Done running custom plugin code.")
 
-      # This is probably not the best way to check if we need a docker image
       if self.is_docker_install?
+        # We expect the image to be installed here by the install method
         image = self.manifest.package['docker']['image']
-        AethernalAgent.logger.debug("Docker image information found")
-
-        # Pull the image
-        AethernalAgent.logger.debug("Pulling image #{image}")
-        ::Docker::Image.create('fromImage' => image)
-
         begin
           container = self.container_settings.create_container(self.docker_container_name, image)
           AethernalAgent.logger.debug("Starting: #{container.start}")

data/lib/aethernal_agent/cli/core.rb

@@ -0,0 +1,11 @@
+require 'aethernal_agent/cli/services'
+
+module AethernalAgent
+  module Cli
+
+    class Core < Thor
+      desc "services [SUBCOMMAND]", "Get Application status"
+      subcommand "services", AethernalAgent::Cli::Services
+    end
+  end
+end

data/lib/aethernal_agent/cli/services.rb

@@ -0,0 +1,56 @@
+require 'pathname'
+
+module AethernalAgent
+  module Cli
+    class Services < Thor
+      attr_accessor :user
+      include AethernalAgent::Utils
+
+      desc "start APP", "start the supplied application via systemd"
+      def start(app)
+        run_systemd_plain("start", app)
+      end
+
+      desc "stop APP", "stop the supplied application via systemd"
+      def stop(app)
+        run_systemd_plain("stop", app)
+      end
+
+      desc "restart APP", "restart the supplied application via systemd"
+      def restart(app)
+        run_systemd_plain("restart", app)
+      end
+
+      desc "status APP", "get the status of the supplied application via systemd"
+      def status(app)
+        result = run_systemd_plain("status", app)
+        puts result
+      end
+
+      desc "start-all", "Start all systemd managed applications"
+      def start_all
+        puts "Starting all known services"
+        service_files = `ls ~/.config/systemd/user/*.service`.split("\n")
+        result = service_files.collect do |s|
+          pn = Pathname.new(s)
+          app_name = pn.basename
+          puts "Starting #{app_name}"
+          run_systemd_plain("start", app_name)
+        end
+      end
+
+      desc "list", "Lists all available user services and their status."
+      def list
+        service_files = `ls ~/.config/systemd/user/*.service`.split("\n")
+        result = service_files.collect do |s|
+          pn = Pathname.new(s)
+          app_name = pn.basename
+          status = systemd_text_for_service(app_name).split("\n")[2].strip
+          [app_name, status]
+        end
+        table = Terminal::Table.new :headings => ['Service', 'Status'], :rows => result
+        puts table
+      end
+    end
+  end
+end

data/lib/aethernal_agent/plugins/plex-docker/plex_docker.rb

@@ -8,6 +8,8 @@ class AethernalAgent::PlexDocker < AethernalAgent::App
   end
 
   def configure_app_user(options = {})
+    install_packages(options)
+
     super do |opts|
       self.container_settings.env << "ADVERTISE_IP=http://#{self.container_domain}:#{opts[:host_port]}"
 

data/lib/aethernal_agent/plugins/portainer/portainer.rb

@@ -3,12 +3,8 @@ class AethernalAgent::Portainer < AethernalAgent::App
     super(options)
   end
 
-  def install_packages(options = {})
-    super(options)
-
-  end
-
   def configure_app_user(options = {})
+    install_packages(options)
     res = super(options) do |opts|
       @opts = opts
     end
@@ -39,13 +35,4 @@ class AethernalAgent::Portainer < AethernalAgent::App
 
     return create_return_args(@opts)
   end
-
-  def uninstall_packages(options = {})
-    super(options)
-  end
-
-  def remove_app_user(options = {})
-    uninstall_packages(options)
-    super(options)
-  end
 end

data/lib/aethernal_agent/plugins/radarr/manifest.yml

@@ -51,6 +51,10 @@ actions:
 estimated_size_mb: 23
 package:
   folder_name: Radarr
+  apt:
+    "1804":
+      packages:
+        - mediainfo
   direct_download:
     url: https://radarr.servarr.com/v1/update/nightly/updatefile?os=linux&runtime=netcore&arch=x64
     target_name: Radarr.nightly.linux.tar.gz

data/lib/aethernal_agent/plugins/resilio_docker/resilio_docker.rb

@@ -8,6 +8,7 @@ class AethernalAgent::ResilioDocker < AethernalAgent::App
   end
 
   def configure_app_user(options = {})
+    install_packages(options)
     super(options) do |opts|
       write_template(template_path('resilio_docker.conf.erb'),
                    File.join(opts[:data_volume], ('sync.conf')),

data/lib/aethernal_agent/plugins/rutorrent/rutorrent.rb

@@ -8,6 +8,8 @@ class AethernalAgent::Rutorrent < AethernalAgent::App
   end
 
   def configure_app_user(options = {})
+    install_packages(options)
+
     super do |opts|
 
       # Setup rc for custom port

data/lib/aethernal_agent/plugins/sonarr/manifest.yml

@@ -64,3 +64,4 @@ package:
           key_id: "3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
       packages:
         - mono-devel
+        - mediainfo

data/lib/aethernal_agent/utils.rb

@@ -166,5 +166,21 @@ module AethernalAgent
     def container_domain
       "#{get_global_config(:container_name)}.#{get_global_config(:hostname)}"
     end
+
+    def current_xdg_runtime_dir
+      "export XDG_RUNTIME_DIR=/run/user/#{get_current_uid}"
+    end
+
+    def get_current_uid
+      `id`.split("(")[0].split("=")[1]
+    end
+
+    def systemd_text_for_service(service_name)
+      run_systemd_plain("status", service_name)
+    end
+
+    def run_systemd_plain(action, service_name)
+      `#{current_xdg_runtime_dir} && systemctl --user #{action} #{service_name}`
+    end
   end
 end

data/lib/aethernal_agent/version.rb

@@ -1,3 +1,3 @@
 module AethernalAgent
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aethernal-agent
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Maran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,10 +150,39 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.34.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Install and configure apps on the go.
 email:
 - maran@bytesized-hosting.com
 executables:
+- aa-cli
 - aa-web
 extensions: []
 extra_rdoc_files: []
@@ -174,6 +203,7 @@ files:
 - bin/install-aa
 - bin/run-aa-for-test
 - bin/setup
+- exe/aa-cli
 - exe/aa-web
 - lib/aethernal_agent.rb
 - lib/aethernal_agent/apache/apache.rb
@@ -181,6 +211,8 @@ files:
 - lib/aethernal_agent/apache/templates/aa-user.conf.erb
 - lib/aethernal_agent/app.rb
 - lib/aethernal_agent/apt.rb
+- lib/aethernal_agent/cli/core.rb
+- lib/aethernal_agent/cli/services.rb
 - lib/aethernal_agent/docker/container_settings.rb
 - lib/aethernal_agent/docker/env.rb
 - lib/aethernal_agent/docker/port_binding.rb
@@ -285,12 +317,12 @@ files:
 - lib/aethernal_agent/plugins/radarr/radarr.rb
 - lib/aethernal_agent/plugins/radarr/templates/config.xml.erb
 - lib/aethernal_agent/plugins/radarr/templates/radarr.apache.conf.erb
-- lib/aethernal_agent/plugins/resilio_docker/files/resilio_docker.service.erb
 - lib/aethernal_agent/plugins/resilio_docker/manifest.yml
 - lib/aethernal_agent/plugins/resilio_docker/meta/resilio.png
 - lib/aethernal_agent/plugins/resilio_docker/resilio_docker.rb
 - lib/aethernal_agent/plugins/resilio_docker/templates/resilio_docker.apache.conf.erb
 - lib/aethernal_agent/plugins/resilio_docker/templates/resilio_docker.conf.erb
+- lib/aethernal_agent/plugins/resilio_docker/templates/resilio_docker.service.erb
 - lib/aethernal_agent/plugins/rutorrent/manifest.yml
 - lib/aethernal_agent/plugins/rutorrent/meta/rtorrent.png
 - lib/aethernal_agent/plugins/rutorrent/rutorrent.rb