configmonkey_cli 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f88a813de764ee6b33978ab3acf57bd6b4d2c57e0e5352214f6044db20cd327
-  data.tar.gz: 1bcbb9340b2a616dbf22e6249ddfd6705f57ee95bc84ae0e70b7bfd421dedfb7
+  metadata.gz: 391f6c9bbafb6e640823708c4cff1f0b5955436a65b986f4254c916784ad6816
+  data.tar.gz: eec65f85b8b493b2b7230905fa374de3652f1390124ed03feca376814200f38d
 SHA512:
-  metadata.gz: 83f512210d85b8351587412ca44fe9abd4171aea9ae835ff225e238f1c1cd794ad9926962033d1745517256d121d2a629d7cb83f446c3448c426d38deeb6999e
-  data.tar.gz: ae82e4e9be85ef140e8dfa0993de9b786330a517ee6acc05e4b5138e4bb542ce654d4b213ac6e88e6b7c656921c067e9fb65f26591b7dab8b9dd60cbfd225575
+  metadata.gz: 41fae277325b89e41e69295403e6128a69a401f070a20ee4ca536a9a55bbcfd937268883b550617083aa5e21f6458213cba961fba5ddbd4dd7e26c07875be117
+  data.tar.gz: ee4cf475e8415e90ec9afe0177cc6e7ec3c2d17eacb28c681cbf389816eadd60202e5cfb23634b27c92400b6545b716ff5293021a56016bfbdd07a16be8ef0a8

data/README.md

@@ -45,7 +45,7 @@ To get a list of available options invoke Configmonkey with the `--help` or `-h`
     # Application options
             --generate-manifest          Generates an example manifest in current directory
         -a, --accept                     accept all defaults
-        -b, --no-bell                    dont ring a bell when asked
+        -b, --bell                       ring a bell when asked
         -D, --diff                       change default diff tool
         -f, --fake-host HOST             override hostname
         -i, --in DIR                     operate from this source directory instead of pwd

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.5

data/configmonkey_cli.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "httparty"
   spec.add_dependency "thor"
+  spec.add_dependency "tty-prompt"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/configmonkey_cli.rb

@@ -15,6 +15,7 @@ require "active_support/time_with_zone"
 begin ; require "pry" ; rescue LoadError ; end
 require "httparty"
 require "thor"
+require "tty-prompt"
 
 # lib
 require "configmonkey_cli/version"

data/lib/configmonkey_cli/application.rb

@@ -41,7 +41,7 @@ module ConfigmonkeyCli
         hostname: `hostname`.chomp, # -f flag
         diff_tool: nil,             # -D flag
         merge_tool: nil,            # -M flag
-        bell: true,                 # -b flag
+        bell: false,                 # -b flag
         default_accept: false,      # -a flag
         default_yes: false,         # -y flag
         dispatch: :index,           # (internal) action to dispatch
@@ -106,7 +106,7 @@ module ConfigmonkeyCli
         opts.separator(c "# Application options", :blue)
         opts.on("--generate-manifest", "Generates an example manifest in current directory") { @opts[:dispatch] = :generate_manifest }
         opts.on("-a", "--accept", "accept all defaults") { @opts[:default_accept] = true }
-        opts.on("-b", "--no-bell", "dont ring a bell when asked") { @opts[:bell] = false }
+        opts.on("-b", "--bell", "dont ring a bell when asked") { @opts[:bell] = true }
         opts.on("-D", "--diff", "change default diff tool") {|s| @opts[:diff_tool] = s }
         opts.on("-f", "--fake-host HOST", "override hostname") {|s| @opts[:hostname] = s }
         opts.on("-i", "--in DIR", "operate from this source directory instead of pwd") {|s| @opts[:working_directory] = s }

data/lib/configmonkey_cli/application/manifest.rb

@@ -112,6 +112,18 @@ module ConfigmonkeyCli
         end
       end
 
+      def run_action which, simulate = nil, *args, &block
+        simulate = app.opts[:simulation] if simulate.nil?
+        action = case which
+        when String, Symbol
+          "ConfigmonkeyCli::Application::ManifestAction::#{which.to_s.camelize}".constantize.new(app, self, *args, &block)
+        else
+          action = which
+        end
+        action.prepare
+        simulate ? action.simulate : action.destructive
+      end
+
       def _dump!
         @actions.each do |constraint, action, instance|
           begin
@@ -143,8 +155,7 @@ module ConfigmonkeyCli
             $cm_current_action_index = index
             $cm_current_action_name = action
             $cm_current_action_color = :magenta
-            instance.prepare
-            simulate ? instance.simulate : instance.destructive
+            run_action(instance, simulate)
           ensure
             $cm_current_action_index = $cm_current_action_name = $cm_current_action_color = nil
             app.haltpoint
@@ -195,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
@@ -232,6 +244,25 @@ module ConfigmonkeyCli
         thor.say((color.any? ? c(str.to_s, *color) : str.to_s))
       end
 
+      def prompt opts = {}
+        TTY::Prompt.new(opts).tap do |prompt|
+          yield(prompt) if block_given?
+        end
+      end
+
+      def status name, *args
+        case args.length
+        when 0
+          raise ArgumentError("at least name and string is required")
+        when 1 # status :fake, rel(@destination)
+          thor.say_status name, args[0], :green
+        when 2 # status :fake, :green, rel(@destination)
+          thor.say_status name, args[1], args[0]
+        when 3 # status :fake, :green, rel(@destination), :red
+          thor.say_status name, thor.set_color(args[1], *args[2..-1]), args[0]
+        end
+      end
+
       # do block no matter the `hostname`
       def all &block
         _with_constraint(:any, &block)

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

@@ -53,20 +53,7 @@ module ConfigmonkeyCli
           end
         end
 
-        def status name, *args
-          case args.length
-          when 0
-            raise ArgumentError("at least name and string is required")
-          when 1 # status :fake, rel(@destination)
-            thor.say_status name, args[0], :green
-          when 2 # status :fake, :green, rel(@destination)
-            thor.say_status name, args[1], args[0]
-          when 3 # status :fake, :green, rel(@destination), :red
-            thor.say_status name, thor.set_color(args[1], *args[2..-1]), args[0]
-          end
-        end
-
-        [:padded, :c, :say, :ask, :yes?, :no?].each do |meth|
+        ([:padded, :c, :say, :status, :prompt, :ask, :yes?, :no?, :run_action] + Manifest::MANIFEST_ACTIONS).each do |meth|
           define_method(meth) do |*args, &block|
             manifest.send(meth, *args, &block)
           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

@@ -20,10 +20,13 @@ module ConfigmonkeyCli
           code, res = exec(@args[0], @opts[:chomp])
 
           if opts[:echo]
+            lines = res.split("\n")
             if code.exitstatus.zero?
-              say padded("#{c "[OK]", :green} #{res}", :black)
+              say padded("#{c "[OK]", :green} #{lines[0]}", :black)
+              lines[1..-1].each{|l| say padded("     #{l}") } if lines.length > 1
             else
-              say padded("[#{code.exitstatus}] #{res}", :red)
+              say padded("[#{code.exitstatus}] #{lines[0]}", :red)
+              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/sync_links.rb

@@ -8,6 +8,7 @@ module ConfigmonkeyCli
             prefix: nil,
             map: "d:dp",
             hard: false,
+            exclude: [],
           })
         end
 
@@ -42,16 +43,35 @@ module ConfigmonkeyCli
         def destructive
           prefixed_sources = @sources.map do |src|
             File.join(@destination, "#{@prefix}#{File.basename(src)}")
-          end
+          end.reject{|f| excluded?(f) }
 
           if @purge
             (Dir["#{File.join(@destination, @prefix)}*"] - prefixed_sources).each do |f|
               thor.remove_file(f)
+              # @todo fix for https://github.com/erikhuda/thor/pull/720
+              ::FileUtils.rm_rf(f) if File.symlink?(f)
             end
           end
 
           @sources.each do |src|
-            thor.create_link("#{@destination}/#{@prefix}#{File.basename(src)}", src, @opts)
+            if r = excluded?(src)
+              status :excluded, :black, rel(src) << c(" #{r.inspect}", :black)
+            else
+              thor.create_link("#{@destination}/#{@prefix}#{File.basename(src)}", src, @opts)
+            end
+          end
+        end
+
+        def excluded? src
+          [*@opts[:exclude]].detect do |filter|
+            case filter
+            when Proc
+              filter.call(src)
+            when Regexp
+              src.match(filter)
+            when String
+              src.ends_with?(filter)
+            end
           end
         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.0"
+  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.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  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: pry
   requirement: !ruby/object:Gem::Requirement