rcm

@@ -10,17 +10,20 @@

     desired_state: installed

 - files:

-  - path: /tmp/hello_world.php

+  - path: /var/www/html/index.php

     owner: dev

     group: dev

     mode: '0664'

     local_file: /home/dev/src/rcm/resources/hello_world.php

     desired_state: present

+  - path: /var/www/html/index.html

+    desired_state: absent

+

 - services:

   - name: apache2

     dependencies:

     - packages:

       - name: libapache2-mod-php

     - files:

-      - path: /tmp/hello_world.php

+      - path: /var/www/html/index.php

@@ -19,10 +19,10 @@ module RCM

       @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)

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

       file.changed = true

-      file

+      0

     end

     def copy(file)

@@ -30,10 +30,18 @@ module RCM

       @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)

+      begin

+        ::FileUtils.copy_entry(file.src_path, file.path, remove_destination:  true)

+      rescue

+        error_msg = "Could not copy #{file.src_path} to #{file.path}."

+        @logger.fatal(error_msg)

+        return 1

+      end

+

+      file.state = ::RCM::File::PRESENT

       file.changed = true

-      file

+      0

     end

     def remove(file)

@@ -41,8 +49,9 @@ module RCM

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

       ::FileUtils.rm(file.path)

+      file.state = ::RCM::File::ABSENT

       file.changed = true

-      file

+      0

     end

     def initialize(logger)

@@ -54,7 +63,7 @@ module RCM

       uids = get_id_to_name_mapping('/etc/passwd')

       gids = get_id_to_name_mapping('/etc/group')

       wanted_files.each do |path, p|

-        f = ::RCM::File.new('', '', '', '', '')

+        f = ::RCM::File.new(path, '', '', '', '', ::RCM::File::ABSENT)

         # Put in an empty object if file does not exist

         unless ::File.exist?(path)

           got[path] = f

@@ -66,6 +75,7 @@ module RCM

         f.owner = uids[f_stat.uid.to_s]

         f.group = gids[f_stat.gid.to_s]

         f.mode = f_stat.mode.to_s(8)[-4, 4]

+        f.state = ::RCM::File::PRESENT

         got[path] = f

       end

@@ -27,8 +27,11 @@ module RCM

     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}"

+      unless status[:exit_code] == 0

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

         @logger.fatal(error_msg)

       end

+

+    end

   end

 end

@@ -2,26 +2,32 @@ require 'fileutils'

 module RCM

   class File

-    attr_accessor :path, :owner, :group, :mode, :src_path, :changed

+    attr_accessor :path, :owner, :group, :mode, :state, :src_path, :changed

+

+    PRESENT = 'present'.freeze

+    ABSENT = 'absent'.freeze

     def ==(other)

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

-      return false if @path.empty? || other.path.empty?

+      # Paths are same and status is absent for both

+      return true if @state == ABSENT && other.state == ABSENT && @path == other.path

-      ::FileUtils.compare_file(@path, other.path) &&

       @owner == other.owner &&

           @group == other.group &&

-          @mode == other.mode

+          @mode == other.mode &&

+          @state == other.state &&

+          ::FileUtils.compare_file(@path, other.path)

     end

-    def initialize(path, owner, group, mode, src_path)

+    def initialize(path, owner, group, mode, src_path, state)

       @path = path

       @owner = owner

       @group = group

       @mode = mode

       @src_path = src_path

+      @state = state

       @changed = false

     end

@@ -75,9 +75,11 @@ module RCM

   end

   def self.parse_files(markup)

+    valid_file_states = [::RCM::File::PRESENT, ::RCM::File::ABSENT]

     markup.each do |d|

-      raise "\n\n'#{d['local_file']}' is not readable.\n\n" unless ::File.readable?(d['local_file'])

-      f = RCM::File.new(d['path'], d['owner'], d['group'], d['mode'], d['local_file'])

+      raise "\n\nFile state can only be one of #{valid_file_states.join (', ')}" if (valid_file_states | [d['desired_state']]).empty?

+      raise "\n\n'#{d['local_file']}' is not readable.\n\n" if d['desired_state'] == ::RCM::File::PRESENT && !::File.readable?(d['local_file'])

+      f = RCM::File.new(d['path'], d['owner'], d['group'], d['mode'], d['local_file'], d['desired_state'])

       @@wanted[FILES][d['path']] = f

     end

   end

@@ -173,38 +175,27 @@ module RCM

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

       file_on_fs = @@got[FILES][path]

+      if file_on_fs.state == ::RCM::File::PRESENT && file_obj.state == ::RCM::File::ABSENT

+        @@logger.info("#{path} is present on disk when it should not be. Removing...")

+        @@file_mgr.remove(file_obj)

+        next

+      end

+

       if file_on_fs == file_obj

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

+        @@logger.info("#{path} is in expected state (#{file_on_fs.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

+      status = @@file_mgr.copy(file_obj)

+      @@file_mgr.apply_attributes(file_obj) if status == 0

-      # Set the version correctly

-      @@crackalackin[FILES].push(file_obj)

     end

   end

   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)

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

     end

   end