From 92a1fe2f07cce7a15d344bcf9b0c7348d710b47e Mon Sep 17 00:00:00 2001 From: Matthew Mallard Date: Wed, 11 Apr 2018 14:16:46 +1000 Subject: [PATCH 1/2] Updated the client paths to be compatible with the mco plugin package command --- lib/mcollective/application/shell.rb | 2 +- .../{shell/prefix_stream_buf.rb => shell_prefix_stream_buf.rb} | 0 .../application/{shell/watcher.rb => shell_watcher.rb} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/mcollective/application/{shell/prefix_stream_buf.rb => shell_prefix_stream_buf.rb} (100%) rename lib/mcollective/application/{shell/watcher.rb => shell_watcher.rb} (94%) diff --git a/lib/mcollective/application/shell.rb b/lib/mcollective/application/shell.rb index 680e58d..c5d2957 100644 --- a/lib/mcollective/application/shell.rb +++ b/lib/mcollective/application/shell.rb @@ -1,4 +1,4 @@ -require 'mcollective/application/shell/watcher' +require 'mcollective/application/shell_watcher' class MCollective::Application::Shell < MCollective::Application description 'Run shell commands' diff --git a/lib/mcollective/application/shell/prefix_stream_buf.rb b/lib/mcollective/application/shell_prefix_stream_buf.rb similarity index 100% rename from lib/mcollective/application/shell/prefix_stream_buf.rb rename to lib/mcollective/application/shell_prefix_stream_buf.rb diff --git a/lib/mcollective/application/shell/watcher.rb b/lib/mcollective/application/shell_watcher.rb similarity index 94% rename from lib/mcollective/application/shell/watcher.rb rename to lib/mcollective/application/shell_watcher.rb index 35dc575..b1da3de 100644 --- a/lib/mcollective/application/shell/watcher.rb +++ b/lib/mcollective/application/shell_watcher.rb @@ -1,4 +1,4 @@ -require 'mcollective/application/shell/prefix_stream_buf' +require 'mcollective/application/shell_prefix_stream_buf' # The Watcher class is a utility class for Application::Shell#watch_these. # It's effectively a tuple of [node, handle] to identify the command, and From 466a22f2b5ec994dc0dbacd8a27ea48798704980 Mon Sep 17 00:00:00 2001 From: Matthew Mallard Date: Wed, 11 Apr 2018 14:22:09 +1000 Subject: [PATCH 2/2] Updated the spec files with the new paths --- .../mcollective/application/shell/prefix_stream_buf_spec.rb | 2 +- spec/unit/mcollective/application/shell/watcher_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/unit/mcollective/application/shell/prefix_stream_buf_spec.rb b/spec/unit/mcollective/application/shell/prefix_stream_buf_spec.rb index 3f1ce96..4f25f5f 100644 --- a/spec/unit/mcollective/application/shell/prefix_stream_buf_spec.rb +++ b/spec/unit/mcollective/application/shell/prefix_stream_buf_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'mcollective/application/shell/prefix_stream_buf' +require 'mcollective/application/shell_prefix_stream_buf' module MCollective class Application diff --git a/spec/unit/mcollective/application/shell/watcher_spec.rb b/spec/unit/mcollective/application/shell/watcher_spec.rb index e658fb8..145c228 100644 --- a/spec/unit/mcollective/application/shell/watcher_spec.rb +++ b/spec/unit/mcollective/application/shell/watcher_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'mcollective/application/shell/watcher' +require 'mcollective/application/shell_watcher' module MCollective class Application