(misc) update testing kit

this prepares to merge this code into mcorpc support

Signed-off-by: R.I.Pienaar <rip@devco.net>

.circleci/config.yml

@@ -5,6 +5,7 @@ jobs:
       - image: circleci/ruby:2.4-node
     steps:
       - checkout
+      - run: gem install bundler
       - run: bundle install
       - run: bundle exec rake
 

.rubocop.yml

@@ -1,6 +1,9 @@
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
+  SuggestExtensions: false
+  TargetRubyVersion: 2.4
+  NewCops: enable
   Exclude:
     - "module/**/*"
     - "vendor/**/*"
@@ -25,9 +28,6 @@ Style/TrailingUnderscoreVariable:
 Lint/NonLocalExitFromIterator:
   Enabled: false
 
-Style/TrailingUnderscoreVariable:
-  Enabled: false
-
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
@@ -46,6 +46,9 @@ Style/StringLiterals:
 Style/FormatString:
   EnforcedStyle: percent
 
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
 Style/SpecialGlobalVars:
   Enabled: false
 
@@ -70,9 +73,6 @@ Layout/SpaceInsideBlockBraces:
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Style/Documentation:
-  Severity: warning
-
 Style/EachWithObject:
   Enabled: false
 
@@ -87,6 +87,7 @@ Style/DoubleNegation:
 
 Style/Documentation:
   Enabled: false
+  Severity: warning
 
 Style/PerlBackrefs:
   Enabled: false
@@ -106,7 +107,7 @@ Lint/UnusedMethodArgument:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 180
 
 Metrics/PerceivedComplexity:
@@ -133,9 +134,6 @@ Metrics/ModuleLength:
 Metrics/BlockLength:
   Enabled: false
 
-Performance/Casecmp:
-  Enabled: false
-
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -145,21 +143,22 @@ Style/SymbolArray:
 Security/MarshalLoad:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
 # @todo use safe_load but its a big change
 Security/YAMLLoad:
   Enabled: false
 
-Performance/RegexpMatch:
+Style/SafeNavigation:
   Enabled: false
 
-Style/SafeNavigation:
+Style/RescueStandardError:
   Enabled: false
 
-Lint/RescueWithoutErrorClass:
+Style/OptionalBooleanParameter:
   Enabled: false
 
-Performance/StringReplacement:
+Naming/MemoizedInstanceVariableName:
   Enabled: false
+

Gemfile

@@ -7,16 +7,15 @@ group :development, :test do
   gem "coveralls"
   gem "diplomat", "~> 2"
   gem "etcdv3", "~> 0.6.0"
-  gem "guard-rspec"
-  gem "guard-shell"
   gem "jgrep", ">= 1.5.0"
+  gem "json", "2.4.1"
   gem "json-schema-rspec"
   gem "listen", "~> 3"
-  gem "mocha"
+  gem "mocha", "~> 0.12.2"
   gem "puppet", "~> 6"
-  gem "rake"
-  gem "rspec"
-  gem "rubocop", "0.51.0"
+  gem "rake", ">= 12.3.3"
+  gem "rspec", "~> 3.9.0"
+  gem "rubocop", "1.6.1"
   gem "semantic_puppet"
   gem "webmock"
   gem "yard"

Gemfile.lock

@@ -3,36 +3,35 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    choria-mcorpc-support (2.20.0)
-      json (~> 2.1, >= 2.1.0)
+    ast (2.4.1)
+    choria-mcorpc-support (2.22.1)
+      nats-pure (~> 0.6)
       systemu (~> 2.6, >= 2.6.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.4)
     deep_merge (1.2.1)
-    diff-lcs (1.3)
-    diplomat (2.2.5)
+    diff-lcs (1.4.4)
+    diplomat (2.4.2)
       deep_merge (~> 1.0, >= 1.0.1)
-      faraday (~> 0.9)
-    docile (1.3.2)
+      faraday (>= 0.9, < 1.1.0)
+    docile (1.3.3)
     etcdv3 (0.6.0)
       faraday (= 0.11.0)
       grpc (= 1.2.5)
-    facter (2.5.6)
+    facter (4.0.47)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 2.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     fast_gettext (1.8.0)
-    ffi (1.11.2)
-    formatador (0.2.5)
-    google-protobuf (3.10.1)
+    ffi (1.14.1)
+    google-protobuf (3.14.0-x86_64-linux)
     googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
@@ -41,111 +40,87 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.5)
+    grpc (1.2.5-x86_64-linux)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
-    guard (2.16.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-shell (0.7.1)
-      guard (>= 2.0.0)
-      guard-compat (~> 1.0)
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     hiera (3.6.0)
-    hocon (1.3.0)
+    hocon (1.3.1)
     httpclient (2.8.3)
     jgrep (1.5.4)
-    json (2.3.1)
+    json (2.4.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
     json-schema-rspec (0.0.4)
       json-schema (~> 2.5)
       rspec
     jwt (1.5.6)
-    listen (3.2.0)
+    listen (3.3.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
-    locale (2.1.2)
-    logging (2.2.2)
+    locale (2.1.3)
+    logging (2.3.0)
       little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    lumberjack (1.0.13)
-    memoist (0.16.1)
+      multi_json (~> 1.14)
+    memoist (0.16.2)
     metaclass (0.0.4)
-    method_source (0.9.2)
-    mocha (1.9.0)
+    mocha (0.12.10)
       metaclass (~> 0.0.1)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
     nats-pure (0.6.2)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
     os (0.9.6)
-    parallel (1.19.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
-    puppet (6.11.1)
+    puppet (6.19.1)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
-      facter (> 2.0.1, < 4)
+      facter (> 2.0.1, < 5)
       fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
       httpclient (~> 2.8)
       locale (~> 2.1)
       multi_json (~> 1.10)
       puppet-resource_api (~> 1.5)
       semantic_puppet (~> 1.0)
-    puppet-resource_api (1.8.7)
+    puppet-resource_api (1.8.13)
       hocon (>= 1.0)
-    rainbow (2.2.2)
-      rake
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (2.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.51.0)
+    rspec-support (3.9.4)
+    rubocop (1.6.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
     semantic_puppet (1.0.2)
-    shellany (0.0.1)
     signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -156,40 +131,42 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sync (0.5.0)
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
-    tins (1.22.2)
-    unicode-display_width (1.6.0)
-    webmock (3.7.6)
+    thor (1.0.1)
+    tins (1.26.0)
+      sync
+    unicode-display_width (1.7.0)
+    webmock (3.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.20)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   choria-mcorpc-support
   coveralls
   diplomat (~> 2)
   etcdv3 (~> 0.6.0)
-  guard-rspec
-  guard-shell
   jgrep (>= 1.5.0)
+  json (= 2.4.1)
   json-schema-rspec
   listen (~> 3)
-  mocha
+  mocha (~> 0.12.2)
   nats-pure (~> 0.6)
   puppet (~> 6)
-  rake
-  rspec
-  rubocop (= 0.51.0)
+  rake (>= 12.3.3)
+  rspec (~> 3.9.0)
+  rubocop (= 1.6.1)
   semantic_puppet
   webmock
   yard
 
 BUNDLED WITH
-   1.15.4
+   2.2.1