configmonkey_cli 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99ff31b49f67bac7cc9d0e1695fbf7fa21e33d288301994b47c8e4b7ab6742ab
-  data.tar.gz: 12aa92f2207ed7d6c748c04dedf8ce58d979e0c635e022b0aae6686f912b140b
+  metadata.gz: 391f6c9bbafb6e640823708c4cff1f0b5955436a65b986f4254c916784ad6816
+  data.tar.gz: eec65f85b8b493b2b7230905fa374de3652f1390124ed03feca376814200f38d
 SHA512:
-  metadata.gz: c500d71590fac066406dc47b6544ee0de098e881e7c6c5ac440b45d38fd48d2696ff886fa1d6da065b1e0fc6d78dd3b8ee052106149ad3e13dacb4e153a1d02e
-  data.tar.gz: 3200b1469a198e9dc067dd4d96d8fec97e2c0e4aa6bcf3ae9f6f4dc313bb788ae87f9d2fcbffa95106f67161a32fdc98756b7c7ff272d8ce23a8c65d0f12f5f6
+  metadata.gz: 41fae277325b89e41e69295403e6128a69a401f070a20ee4ca536a9a55bbcfd937268883b550617083aa5e21f6458213cba961fba5ddbd4dd7e26c07875be117
+  data.tar.gz: ee4cf475e8415e90ec9afe0177cc6e7ec3c2d17eacb28c681cbf389816eadd60202e5cfb23634b27c92400b6545b716ff5293021a56016bfbdd07a16be8ef0a8

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/configmonkey_cli/application/manifest.rb

@@ -206,7 +206,8 @@ module ConfigmonkeyCli
 
       def push_action *args
         if $cm_current_action_index
-          @actions.insert $cm_current_action_index + 1, [@host_constraint.dup] + args
+          $cm_current_action_index += 1
+          @actions.insert $cm_current_action_index, [@host_constraint.dup] + args
         else
           @actions.push [@host_constraint.dup] + args
         end

data/lib/configmonkey_cli/application/manifest_actions/copy.rb

@@ -22,15 +22,31 @@ module ConfigmonkeyCli
 
         def destructive
           absolute_source = File.join(thor.source_paths[0], @source)
+          has_changed = !File.exist?(@destination)
+
+          if @opts[:after_change] && File.exist?(@destination)
+            has_changed = File.binread(absolute_source) != File.binread(@destination)
+          end
+
           if FileTest.directory?(absolute_source)
-            thor.directory(@source, @destination, @opts)
+            _perform_directory(@source, @destination, @opts)
           else
-            thor.copy_file(@source, @destination, @opts)
+            _perform_file(@source, @destination, @opts)
             if @opts[:chmod] && File.exist?(absolute_source) && File.exist?(@destination)
               mode = @opts[:chmod] == true ? File.stat(absolute_source).mode - 0100000 : @opts[:chmod]
               thor.chmod(@destination, mode) unless mode == File.stat(@destination).mode - 0100000
             end
           end
+
+          @opts[:after_change].call if has_changed && @opts[:after_change]
+        end
+
+        def _perform_directory(source, destination, opts)
+          thor.directory(source, destination, opts)
+        end
+
+        def _perform_file(source, destination, opts)
+          thor.copy_file(source, destination, opts)
         end
       end
     end

data/lib/configmonkey_cli/application/manifest_actions/invoke.rb

@@ -23,10 +23,10 @@ module ConfigmonkeyCli
             lines = res.split("\n")
             if code.exitstatus.zero?
               say padded("#{c "[OK]", :green} #{lines[0]}", :black)
-              lines[1..-1].each{|l| say padded("     #{l}") }
+              lines[1..-1].each{|l| say padded("     #{l}") } if lines.length > 1
             else
               say padded("[#{code.exitstatus}] #{lines[0]}", :red)
-              lines[1..-1].each{|l| say padded("     #{l}") }
+              lines[1..-1].each{|l| say padded("     #{l}") } if lines.length > 1
               raise "Invoked process exited with status #{code.exitstatus}: #{res}" if opts[:fail]
             end
           end

data/lib/configmonkey_cli/application/manifest_actions/template.rb

@@ -1,7 +1,7 @@
 module ConfigmonkeyCli
   class Application
     module ManifestAction
-      class Template < Base
+      class Template < Copy
         def init hargs_and_opts = {}
           @args, @opts = args_and_opts(hargs_and_opts)
         end
@@ -20,17 +20,13 @@ module ConfigmonkeyCli
           end
         end
 
-        def destructive
-          absolute_source = File.join(thor.source_paths[0], @source)
-          if FileTest.directory?(absolute_source)
-            status :invalid, :red, "directory not allowed for template", :red
-          else
-            thor.template(@source, @destination, @opts.merge(context: binding))
-            if @opts[:chmod] && File.exist?(absolute_source) && File.exist?(@destination)
-              mode = @opts[:chmod] == true ? File.stat(absolute_source).mode - 0100000 : @opts[:chmod]
-              thor.chmod(@destination, mode) unless mode == File.stat(@destination).mode - 0100000
-            end
-          end
+        def _perform_directory(source, destination, opts)
+          status :invalid, :red, "directory not allowed for template", :red
+        end
+
+        def _perform_file(source, destination, opts)
+          hostname = app.opts[:hostname]
+          thor.template(@source, @destination, @opts.merge(context: binding))
         end
       end
     end

data/lib/configmonkey_cli/version.rb

@@ -1,4 +1,4 @@
 module ConfigmonkeyCli
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/configmonkey_cli/master/VERSION"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport