rcm

@@ -1,7 +1,3 @@

-- log:

-  level: info

-  device: STDOUT

-

 - packages:

   - name: apache2

     version: 2.4.7-1ubuntu4.20

@@ -21,6 +21,6 @@

   - name: apache2

     dependencies:

     - packages:

-      - name: libapache2-mod-php5

+      - name: libapache2-mod-php

     - files:

       - path: /tmp/hello_world.php

@@ -16,6 +16,7 @@ module RCM

     def apply_attributes(file)

       raise 'apply_attributes only works with ::RCM::File' unless file.is_a?(::RCM::File)

+      @logger.debug("Setting owner as #{file.owner}:#{file.group} and mode as #{file.mode} on #{file.path}")

       # Will throw exception if something poopy happens

       ::FileUtils.chown(file.owner, file.group, file.path)

       ::FileUtils.chmod(file.mode, file.path)

@@ -26,7 +27,9 @@ module RCM

     def copy(file)

       dir = ::File.dirname(file.path)

+      @logger.debug("Ensuring #{dir} exsits.")

       ::FileUtils.mkdir_p(dir)

+      @logger.debug("Copying #{file.src_path} to #{file.path}.")

       ::FileUtils.copy(file.src_path, file.path, remove_destination: true)

       file.changed = true

@@ -34,9 +37,11 @@ module RCM

     end

     def remove(file)

-      file_existed = ::File.file?(file.path)

+      return unless ::File.file?(file.path)

+

+      @logger.debug("Removing #{file.path}.")

       ::FileUtils.rm(file.path)

-      file.changed = true if file_existed

+      file.changed = true

       file

     end

@@ -11,7 +11,7 @@ module RCM

       @logger = logger

     end

-    def update()

+    def update

       @logger.info('Updating apt cache.')

       unless ::File.readable?(APT_PARTIAL_DIR)

         @logger.warn('Skipping apt cache update as we are not running with right privilege.')

@@ -27,36 +27,30 @@ module RCM

       ::RCM.cmd("#{DPKG_QUERY} --status #{pkg_name}")

     end

-    def install(pkg_name, version = '')

-      raise "\n\nPlease ensure you are running with root privileges" unless ::File.readable?(APT_PARTIAL_DIR)

-

-      name = ''

-      version_string = "=#{version}" unless version.empty?

-      if pkg_name.is_a?(String)

-        name = pkg_name

-        version_string = "=#{version}" unless version.empty?

-      elsif pkg_name.is_a?(::RCM::Package)

-        name = pkg_name.name

-        v = pkg_name.version

-        version_string = "=#{v}" unless v.empty?

-      end

-

-      ::RCM.cmd("#{APT_GET} install --yes #{name}#{version_string}")

-    end

-

-    def multi_install(pkgs)

+    def install(pkgs)

       raise "\n\nPlease ensure you are running with root privileges\n\n" unless ::File.readable?(APT_PARTIAL_DIR)

-      raise 'multi_install expects array of ::RCM.Package' unless pkgs.is_a?(Array)

+      # If we only get one obejct, add to it an array and process it like that

+      packages = pkgs.is_a?(::RCM::Package) ? [pkgs] : pkgs

+      @logger.info("Installing #{packages.join(', ')}")

       # Construct string of packages to install in one go.

       pkgs_string = ''

-      pkgs.each do |pkg|

-        version_string = "=#{pkg.version}" unless pkg.version.empty?

+      packages.each do |pkg|

+        version_string = pkg.version.empty? ? '' : "=#{pkg.version}"

         pkgs_string += "#{pkg.name}#{version_string} "

       end

-      ::RCM.cmd("#{APT_GET} install --yes #{pkgs_string}")

+      cmd_string = "#{APT_GET} install --yes #{pkgs_string}"

+      status = ::RCM.cmd(cmd_string)

+      if status[:exit_code] == 0

+        @logger.info("Success: #{cmd_string}.")

+        # Update state

+        packages.each { |pkg| pkg.changed = true; pkg.state = ::RCM::Package::INSTALLED }

+      else

+        @logger.error("Failed: #{cmd_string}\n\nstderr:\n#{status[:error]}\n\nstdout:\n#{status[:output]}")

+      end

+

     end

     def get_versions(pkg_name)

@@ -75,13 +69,16 @@ module RCM

       available_versions.uniq

     end

-    def remove(pkg_name)

+    def remove(pkg)

       raise "\n\nPlease ensure you are running with root privileges\n\n" unless ::File.readable?(APT_PARTIAL_DIR)

+      @logger.info("Uninstalling #{pkg.name}.")

       # Remove is idempotent and returns with success even if package is not installed.

-      status = ::RCM.cmd("#{APT_GET} remove --yes #{pkg_name}")

-      error_message = "Removing #{pkg_name} failed!\n\nstderr:\n#{status[:error]}\n\nstdout:\n#{status[:output]}"

-      raise error_message unless status[:exit_code] == 0

+      status = ::RCM.cmd("#{APT_GET} remove --yes #{pkg.name}")

+      @logger.debug("\nstderr:\n#{status[:error]}\n\nstdout:\n#{status[:output]}")

+      raise "Removing #{pkg.name} failed!" unless status[:exit_code] == 0

+      pkg.changed = true

+      pkg.state = ::RCM::Package::REMOVED

     end

     def get_current_state(wanted_packages)

@@ -92,7 +89,7 @@ module RCM

         status = status(p.name)

         if status[:exit_code] == 0

-          state = ::RCM::Package::INSTALLED if status[:output] =~ 'ok installed'

+          state = ::RCM::Package::INSTALLED if status[:output] =~ /.+ok installed/

           version = /Version: (?<version>\d+.+)/.match(status[:output])[:version]

         end

@@ -1,13 +1,34 @@

-require 'logger'

-

 module RCM

   class ServiceManager

+    SYS_SERVICE_MGR = '/usr/sbin/service'.freeze

     def initialize(logger)

       @logger = logger

     end

-    def self.dependencies_changed?(service)

-      # service.depn

+    def dependencies_changed?(service)

+      service.depends_file.values.each do |f|

+        if f.changed

+          @logger.debug("Dependencies for service '#{service.name}' changed because #{f.path} changed.")

+          return true

+        end

+      end

+

+      service.depends_package.values.each do |p|

+        if p.changed

+          @logger.debug("Dependencies for service '#{service.name}' changed because #{p.name} changed.")

+          return true

+        end

+      end

+

+      @logger.info("Dependencies for service '#{service.name}' have not changed.")

+      false

+    end

+

+    def restart(service)

+      @logger.debug("Restarting #{service.name}")

+      status = ::RCM.cmd("#{SYS_SERVICE_MGR} #{service.name} restart")

+      error_msg = "Failed to restart #{service.name}.\n\nstderr:\n#{status.error}\n\nstdout:\n#{status.output}"

+      @logger.fatal(error_msg)

     end

   end

 end

@@ -1,11 +1,10 @@

 module RCM

   class Package

-    attr_accessor :name, :version, :state

+    attr_accessor :name, :version, :state, :changed

     # Public state constants

     INSTALLED = 'installed'.freeze

     REMOVED = 'removed'.freeze

-    CHANGED = 'changed'.freeze

     def ==(other)

       return false unless other.is_a?(RCM::Package)

@@ -19,12 +18,14 @@ module RCM

       @name = name

       @version = version

       @state = state

+      @changed = false

     end

     def to_s

       "Name = #{@name}\n" +

       "Version = #{@version}\n" +

-      "State = #{@state}\n"

+      "State = #{@state}\n" +

+      "Changed = #{changed}"

     end

   end

 end

@@ -13,8 +13,7 @@ module RCM

         return false unless other_depends.key?(dep_name)

         # Return false if any of the attributes does not match

-        unless  other_depends[dep_name].checksum == dep_object.checksum &&

-                other_depends[dep_name].mode == dep_object.mode &&

+        unless  other_depends[dep_name].mode == dep_object.mode &&

                 other_depends[dep_name].owner == dep_object.owner &&

                 other_depends[dep_name].group == dep_object.group &&

                 other_depends[dep_name].path == dep_object.path

@@ -41,7 +40,26 @@ module RCM

     def to_s

       "Name = #{@name}\n" +

-      "Depends = #{@depends}\n"

+      "Depends on Files = #{@depends_file.values.join("\n")}" +

+      "Depends on Packages = #{@depends_package.values.join("\n")}"

+    end

+

+    def dependencies_changed?

+      return false if @depends_file.empty? && @depends_package.empty?

+

+      # Check file dependencies only if there are some.

+      if @depends_file && !@depends_file.empty?

+        @depends_file.values.each do |f|

+          return true if f.changed

+        end

+      end

+

+      if @depends_package && !@depends_package.empty?

+        @depends_package.values.each do |p|

+          return true if p.changed

+        end

+      end

+

     end

   end

 end

@@ -89,25 +89,34 @@ module RCM

     package_dependencies = {}

     markup.each do |d|

       dependencies = d.fetch('dependencies', {})

-      dependencies.each do |dep|

-        case dep

+      dependencies.each do |values|

+        values.each do |dep_type, dep|

+          case dep_type

           when PACKAGES

-          raise "\n\nPlease ensure #{dep['name']} is managed by this program before adding it as a dependency.\n\n" unless pkgs.key?(dep['name'])

-          p = pkgs[dep['name']]

-          package_dependencies[p.name] = p

+            dep.each do |pkg_definition|

+              pkg_name = pkg_definition['name']

+              raise "\n\nPlease ensure #{pkg_name} is managed by this program before adding it as a dependency.\n\n" unless pkgs.key?(pkg_name)

+              p = pkgs[pkg_name]

+              package_dependencies[pkg_name] = p

+            end

           when FILES

-          raise "\n\nPlease ensure #{dep['path']} is managed by this program before adding it as a dependency.\n\n" unless files.key?(dep['path'])

+            dep.each do |file_defnition|

+              path = file_defnition['path']

+              raise "\n\nPlease ensure #{path} is managed by this program before adding it as a dependency.\n\n" unless files.key?(path)

-          f = files[dep['path']]

-          file_dependencies[f.path] = f

+              f = files[path]

+              file_dependencies[path] = f

+            end

+          end

         end

+

       end

       s = RCM::Service.new(d['name'], file_dependencies, package_dependencies)

       @@wanted[SERVICES][d['name']] = s

     end

   end

-  def whachuwant # or parse_config

+  def self.whachuwant # or parse_config

     # Consume config from YAML, and convert it to usable objects in @@wanted.

     config_file = RCM_ENV.empty? ? 'config.yaml' : "config_#{RCM_ENV}.yaml"

@@ -131,52 +140,85 @@ module RCM

   end

-  def whachugot # or get_current_state

+  def self.whachugot # or get_current_state

     @@got[PACKAGES] = @@pkg_mgr.get_current_state(@@wanted[PACKAGES])

     @@got[FILES] = @@file_mgr.get_current_state(@@wanted[FILES])

     # @@got[SERVICES] = @@svc_mgr.get_current_state(@@wanted[SERVICES])

   end

-  def crackalackin_packages

+  def self.converge_packages

     @@wanted[PACKAGES].each do |pkg_name, pkg_obj|

       current_pkg = @@got[PACKAGES][pkg_name]

-      next if current_pkg == pkg_obj

+      if current_pkg == pkg_obj

+        @@logger.info("#{pkg_name} is in expected state.")

+        next

+      end

-      # Set the version correctly

-      current_pkg.version = pkg_obj.version

-      @@crackalackin[PACKAGES].push(current_pkg)

+      @@logger.debug('Missing package:' + pkg_name)

+      if current_pkg.version != pkg_obj.version && current_pkg.state == ::RCM::Package::INSTALLED

+        # Wrong version is installed. Remove current version and install the correct one.

+        # Not the best way to go about it... but we are not implementing a legit solution.

+        @logger.debug("#{current_pkg.name}=#{current_pkg.version} is installed. Uninstalling first.")

+        @@pkg_mgr.remove(pkg_obj)

+        @@pkg_mgr.install(pkg_obj)

+      elsif current_pkg.state == ::RCM::Package::REMOVED

+        @@pkg_mgr.install(pkg_obj)

       end

-    @@logger.debug('Missing packages:' + @@crackalackin[PACKAGES].join("\n"))

     end

-  def crackalackin_files

+  end

+

+  def self.converge_files

     @@wanted[FILES].each do |path, file_obj|

       file_on_fs = @@got[FILES][path]

-      next if file_on_fs == file_obj

+      if file_on_fs == file_obj

+        @@logger.info("#{path} is in expected state.")

+        next

+      end

+

+      # try to do minimal changes by finding what is different

+      if file_on_fs.path.empty?

+        # for files, we're not doing explicit state maintenance like we are doing for packages

+        # If file is on disk, file obj will contain the path.

+        @@logger.info("#{path} is not present on disk.")

+        @@file_mgr.copy(file_obj)

+        @@file_mgr.apply_attributes(file_obj)

+      elsif file_on_fs.mode != file_obj.mode ||

+          file_on_fs.owner != file_obj.owner ||

+          file_on_fs.group != file_obj.group

+        @@logger.debug("Attributes on #{path} are not in expected state.")

+        @@file_mgr.apply_attributes(file_obj)

+      elsif !::File.cmp(file_obj.src_path, path)

+        @@logger.debug("File contents don't match, even though #{path} is on disk.")

+        @@file_mgr.remove(file_obj)

+        @@file_mgr.copy(file_obj)

+        @@file_mgr.apply_attributes(file_obj)

+      end

       # Set the version correctly

       @@crackalackin[FILES].push(file_obj)

     end

-    @@logger.debug('Missing files:' + @@crackalackin[FILES].join("\n"))

-    puts @@crackalackin[FILES]

   end

-  def cracka_stop_lackin()

-    puts 'not implemented'

+  def self.restart_services_if_needed

+    @@wanted[SERVICES].values.each do |svc_obj|

+      @@svc_manager.restart(svc_obj) if @@svc_mgr.dependencies_changed?(svc_obj)

+    end

   end

   def main

-    self.configure_logger

+    configure_logger

+    whachuwant

+    whachugot

+    converge_packages

+    converge_files

+    restart_services_if_needed

   end

-  module_function :whachuwant, :whachugot, :crackalackin_packages, :crackalackin_files,

-                  :cracka_stop_lackin, :main

+  module_function :main

 end

 RCM.main

-RCM.whachuwant

-RCM.whachugot

-RCM.crackalackin_packages

-RCM.crackalackin_files

+