Merge pull request #11 from github/update-octocatalog-diff

let's get octocatalog-diff to latest

Author: cjmartian

.github/workflows/lint-and-test.yaml

@@ -0,0 +1,33 @@
+name: Lint and Test
+on: [push, pull_request, workflow_dispatch]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Install dependencies
+        run: |
+          bundle install --jobs 4 --retry 3
+      - name: Lint with Rubocop
+        run: |
+          bundle exec rubocop --parallel
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          node-version: 2.1
+      - name: Install dependencies
+        run: |
+          bundle install --jobs 4 --retry 3
+      - name: Test octofacts
+        run: |
+          bundle exec rake octofacts:spec:octofacts
+      - name: Test octofacts_updater
+        run: |
+          bundle exec rake octofacts:spec:octofacts_updater

.gitignore

@@ -52,3 +52,6 @@ build-iPhoneSimulator/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# JetBrains
+.idea/**

.rubocop.yml

@@ -3,7 +3,10 @@ inherit_gem:
     - config/default.yml
 
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
+  TargetRubyVersion: 2.6
 
-AllCops:
-  TargetRubyVersion: 2.1
+Style/HashSyntax:
+  Exclude:
+    - spec/octofacts/util/keys_spec.rb

.ruby-version

@@ -1 +1 @@
-2.1.9
+2.6.4

Gemfile

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
+
 gemspec name: "octofacts"
 gemspec name: "octofacts-updater"
 
 group :development do
   gem "parallel", "= 1.12.0"
   gem "pry", "~> 0.10"
   gem "rake", "~> 12.3"
-  gem "rubocop-github", "~> 0.5.0"
+  gem "rubocop-github", "~> 0.20.0"
   gem "simplecov", ">= 0.14.1"
   gem "simplecov-json", "~> 0.2"
 
   # Integration test
-  gem "rspec-puppet", "~> #{ENV['RSPEC_PUPPET_VERSION'] || '2.6.2'}"
   gem "puppet", "~> #{ENV['PUPPET_VERSION'] || '4.10.4'}"
+  gem "rspec-puppet", "~> #{ENV['RSPEC_PUPPET_VERSION'] || '2.6.2'}"
 end

Gemfile.lock

@@ -5,22 +5,34 @@ PATH
     octofacts-updater (0.5.1)
       diffy (>= 3.1.0)
       net-ssh (>= 2.9)
-      octocatalog-diff (>= 1.4.1)
+      octocatalog-diff (>= 2.1.0)
       octokit (>= 4.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.3.0)
+    activesupport (6.1.7.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    base64 (0.2.0)
     coderay (1.1.1)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.3)
     diffy (3.4.2)
     docile (1.1.5)
-    faraday (0.17.4)
     facter (2.5.7)
       multipart-post (>= 1.2, < 3)
+    faraday (2.7.12)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
@@ -29,43 +41,52 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2, < 3.3.0)
       locale
-    hashdiff (0.3.6)
+    hashdiff (1.0.1)
     hiera (3.12.0)
-    httparty (0.15.6)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     json (2.5.1)
     json_pure (1.8.6)
     locale (2.1.3)
     method_source (0.8.2)
+    mini_mime (1.1.5)
+    minitest (5.20.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    net-ssh (4.2.0)
-    octocatalog-diff (1.4.1)
+    net-ssh (7.2.0)
+    octocatalog-diff (2.1.0)
       diffy (>= 3.1.0)
       hashdiff (>= 0.3.0)
       httparty (>= 0.11.0)
+      parallel (>= 1.12.0)
       rugged (>= 0.25.0b2)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
+    parser (3.2.2.4)
+      ast (~> 2.4.1)
+      racc
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (3.1.1)
+    public_suffix (5.0.4)
     puppet (4.10.12)
       facter (> 2.0, < 4)
       gettext-setup (>= 0.10, < 1)
       hiera (>= 2.0, < 4)
       json_pure (~> 1.8)
       locale (~> 2.1)
-    rainbow (2.2.2)
-      rake
+    racc (1.7.3)
+    rack (3.0.8)
+    rainbow (3.1.1)
     rake (12.3.3)
+    regexp_parser (2.8.3)
+    rexml (3.2.6)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -81,20 +102,35 @@ GEM
     rspec-puppet (2.6.2)
       rspec
     rspec-support (3.6.0)
-    rubocop (0.49.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-github (0.5.0)
-      rubocop (~> 0.49)
-    ruby-progressbar (1.8.1)
-    rugged (0.26.0)
-    sawyer (0.8.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-github (0.20.0)
+      rubocop (>= 1.37)
+      rubocop-performance (>= 1.15)
+      rubocop-rails (>= 2.17)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.19.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    rugged (1.7.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -105,7 +141,10 @@ GEM
       simplecov
     slop (3.6.0)
     text (1.3.1)
-    unicode-display_width (1.3.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -118,9 +157,9 @@ DEPENDENCIES
   puppet (~> 4.10.4)
   rake (~> 12.3)
   rspec-puppet (~> 2.6.2)
-  rubocop-github (~> 0.5.0)
+  rubocop-github (~> 0.20.0)
   simplecov (>= 0.14.1)
   simplecov-json (~> 0.2)
 
 BUNDLED WITH
-   1.15.1
+   1.17.2

Rakefile

@@ -1,9 +1,11 @@
+#frozen_string_literal: true
+
 require "rake"
 require "rspec/core/rake_task"
 require_relative "rake/gem"
 
 namespace :octofacts do
-  task :default => [:"octofacts:spec:octofacts", :"octofacts:spec:octofacts_updater", :"octofacts:spec:octofacts_integration"] do
+  task default: [":octofacts:spec:octofacts", ":octofacts:spec:octofacts_updater", ":octofacts:spec:octofacts_integration"] do
   end
 end
 

bin/octofacts-updater

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-
+# frozen_string_literal: true
+#
 require "bundler/setup"
 require "octofacts_updater"
 cli = OctofactsUpdater::CLI.new(ARGV)

lib/octofacts.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "octofacts/constructors/from_file"
 require "octofacts/constructors/from_index"
 require "octofacts/manipulators"

lib/octofacts/backends/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Octofacts
   module Backends
     # This is a template class to define the minimum API to be implemented