motoko 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b655f710fff5c1442d40c441172a62aed7ab6431e094fa6b107e2808e4b19d81
-  data.tar.gz: 3e3c338bf5e18961f12e88531d7b2a110fbd5a961ec205592c250e9f40a3abc1
+  metadata.gz: e6be65ad423aac0052f8160fbb19d6d9b5ee9aa3a37ef278e3bd44fa1492a7c9
+  data.tar.gz: 0b0616ec9d299f282030e41b0889896be9434f9b3880356fd2302bd937551e65
 SHA512:
-  metadata.gz: aafac19ff2e1602fc0efc2ad2137065493d39d1320044afc84a349a9366c642dda8eedb0b93395cb6f016a81fab59fcf2e08f996c09845eace00d73c72727dce
-  data.tar.gz: 108d41d8043d3cc3a92cf2f46b666f19a011e305075f6674c67613b45fde176f8bd07e065fa0caed8a640ceb281b3dd2f3fc3df2189d3071b7b35cfc70059405
+  metadata.gz: f693d4a925a24a0bab02b8b8ea87e43d11b716d0e36c108f1bd03854fec02a8db4bc2ae264fb97f2dded66083da7bd3779f68d4bed242538d13b53e158ee2eab
+  data.tar.gz: 393ab67b914a86df259971e1193040d95fa94723a304a8f6402635bdd6cf99b73bdf4d047eedabd8071df4a62af9640e6c4c185633d92e13a6ceffc979cdfd6e

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "13:00"
+    open-pull-requests-limit: 10

data/.github/workflows/ci.yaml

@@ -1,41 +1,54 @@
 ---
-name: "CI"
+name: CI
 
 on:
   push:
     branches:
-      - "main"
+      - main
   pull_request:
     branches:
-      - "main"
+      - main
 
 jobs:
   rubocop:
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-latest
     steps:
-      - uses: "actions/checkout@v2"
-      - name: "Setup Ruby"
-        uses: "ruby/setup-ruby@v1"
+      - uses: actions/checkout@v4
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: 3.0
           bundler-cache: true
-      - name: "Run rubocop"
-        run: "bundle exec rubocop"
-  test:
-    runs-on: "ubuntu-latest"
+      - name: Run static code analysis
+        run: bundle exec rubocop
+  unit:
+    runs-on: ubuntu-latest
+    needs: rubocop
     strategy:
       matrix:
-        ruby-version:
+        ruby:
           - "2.5"
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+    name: Ruby ${{ matrix.ruby }}
     steps:
-      - uses: "actions/checkout@v2"
-      - name: "Setup Ruby"
-        uses: "ruby/setup-ruby@v1"
+      - uses: actions/checkout@v4
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: "Run the test suite"
-        run: "bundle exec rake"
+      - name: Run tests without uploading code coverage
+        if: ${{ matrix.ruby != '3.0' }}
+        run: bundle exec rake
+      - name: Run tests and upload coverage to Code Climate
+        if: ${{ matrix.ruby == '3.0' }}
+        uses: paambaati/codeclimate-action@v9.0.0
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
+        with:
+          coverageCommand: bundle exec rake

data/CHANGELOG.md

@@ -5,13 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.1.0](https://github.com/smortex/motoko/tree/1.1.0) (2021-07-26)
+## [1.2.1](https://github.com/opus-codium/motoko/tree/1.2.1) (2024-09-19)
 
-[Full Changelog](https://github.com/smortex/motoko/compare/v1.0.0...1.1.0)
+[Full Changelog](https://github.com/opus-codium/motoko/compare/v1.2.0...1.2.1)
+
+**Fixed bugs:**
+
+- Various bug fixes [\#8](https://github.com/opus-codium/motoko/pull/8) ([smortex](https://github.com/smortex))
+
+## [v1.2.0](https://github.com/opus-codium/motoko/tree/v1.2.0) (2021-12-07)
+
+[Full Changelog](https://github.com/opus-codium/motoko/compare/v1.1.0...v1.2.0)
+
+**Implemented enhancements:**
+
+- Add support for project configuration files [\#3](https://github.com/opus-codium/motoko/pull/3) ([smortex](https://github.com/smortex))
+
+**Merged pull requests:**
+
+- Relocate the project [\#4](https://github.com/opus-codium/motoko/pull/4) ([smortex](https://github.com/smortex))
+
+## [v1.1.0](https://github.com/opus-codium/motoko/tree/v1.1.0) (2021-07-26)
+
+[Full Changelog](https://github.com/opus-codium/motoko/compare/v1.0.0...v1.1.0)
 
 **Implemented enhancements:**
 
-- Allow shortcuts to replace the list of columns [\#2](https://github.com/smortex/motoko/pull/2) ([smortex](https://github.com/smortex))
+- Allow shortcuts to replace the list of columns [\#2](https://github.com/opus-codium/motoko/pull/2) ([smortex](https://github.com/smortex))
 
 
 

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in inventory.gemspec
 gemspec
 
+gem 'github_changelog_generator'
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'
 gem 'rubocop'

data/README.md

@@ -95,7 +95,7 @@ romain@zappy ~ % pdb-inventory -F datacenter=/sbg/
 ```
 ## Configuration
 
-At startup, Motoko will load system-wide configuration from `/etc/motoko/config.yaml`, and then user configuration from `~/.config/motoko/config.yaml`.
+At startup, Motoko will try to load a system-wide configuration from `/etc/motoko/config.yaml`, a user configuration from `~/.config/motoko/config.yaml` and a project configuration from `.motoko.yaml` in the current working directory.
 
 ### Columns
 
@@ -211,7 +211,7 @@ sudo /opt/puppetlabs/puppet/bin/gem install --bindir /opt/puppetlabs/bin motoko-
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/smortex/motoko. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/smortex/motoko/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/opus-codium/motoko. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/opus-codium/motoko/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -220,4 +220,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Motoko project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/smortex/motoko/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Motoko project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/opus-codium/motoko/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -13,8 +13,8 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
     and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   HEADER
-  config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog ignore]
-  config.user = 'smortex'
+  config.exclude_labels = %w[dependencies duplicate ignore invalid question skip-changelog wont-fix wontfix]
+  config.user = 'opus-codium'
   config.project = 'motoko'
   config.since_tag = 'v1.0.0'
 end

data/exe/inventory

@@ -41,6 +41,6 @@ util.inventory do |_, resp|
   formatter.nodes << Motoko::Node::Choria.new(resp)
 end
 
-puts formatter.to_s
+puts formatter
 
 printrpcstats if options[:stats]

data/exe/pdb-inventory

@@ -55,4 +55,4 @@ nodes.each do |sender, facts|
   oparser.formatter.nodes << Motoko::Node.new(sender, facts)
 end
 
-puts oparser.formatter.to_s
+puts oparser.formatter

data/lib/motoko/config.rb

@@ -14,6 +14,7 @@ module Motoko
 
       load_system_config
       load_user_config
+      load_project_config
     end
 
     def load_system_config
@@ -33,11 +34,16 @@ module Motoko
       load_config(d) if File.directory?(d)
     end
 
+    def load_project_config
+      load_only_config('.motoko.yaml')
+    end
+
     def load_config(directory)
       load_classes(directory)
+      load_only_config(File.join(directory, 'config.yaml'))
+    end
 
-      filename = File.join(directory, 'config.yaml')
-
+    def load_only_config(filename)
       return unless File.readable?(filename)
 
       config = YAML.safe_load(File.read(filename))
@@ -65,6 +71,9 @@ module Motoko
           max_length: 20
         cpu:
           resolver: cpu
+        memory:
+          fact: memory.system.total
+          align: right
         os:
           resolver: os
           human_name: Operating System

data/lib/motoko/formatters/base_formatter.rb

@@ -3,7 +3,9 @@
 module Motoko
   module Formatters
     class BaseFormatter
-      def initialize(options = {}) end
+      def initialize(options = {})
+        # noop
+      end
 
       def format(value)
         case value

data/lib/motoko/option_parser.rb

@@ -33,15 +33,15 @@ module Motoko
       end
 
       parser.on('--hw', 'Display hardware information') do
-        formatter.columns += %i[is_virtual cpu memory]
+        formatter.columns += %w[is_virtual cpu memory]
       end
 
       parser.on('--puppet', 'Display Puppet information') do
-        formatter.columns += %i[puppet]
+        formatter.columns += %w[aio_agent_version puppetversion]
       end
 
       parser.on('--sw', 'Display sodtware information') do
-        formatter.columns += %i[os kernel]
+        formatter.columns += %w[os kernel]
       end
 
       parser.on('--mono', 'Do not display a colored output') do
@@ -56,7 +56,7 @@ module Motoko
         formatter.count = count
       end
 
-      parser.on('--sort-by=COLUMNS', 'Sort lines by COLUMS', Array) do |columns|
+      parser.on('--sort-by=COLUMNS', 'Sort lines by COLUMNS', Array) do |columns|
         formatter.sort_by = columns
       end
     end

data/lib/motoko/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motoko
-  VERSION = '1.1.0'
+  VERSION = '1.2.1'
 end

data/motoko.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['romain@blogreen.org']
 
   spec.summary       = 'Inventory tools for Puppet / Choria infrastructures'
-  spec.homepage      = 'https://github.com/smortex/motoko'
+  spec.homepage      = 'https://github.com/opus-codium/motoko'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
@@ -32,5 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'skittlize', '~> 1.2'
   spec.add_dependency 'terminal-table'
 
-  spec.add_development_dependency 'github_changelog_generator'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motoko
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Romain Tartière
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: choria-mcorpc-support
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 - romain@blogreen.org
@@ -75,6 +61,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
@@ -114,14 +101,11 @@ files:
 - lib/motoko/utils/time_ago.rb
 - lib/motoko/version.rb
 - motoko.gemspec
-homepage: https://github.com/smortex/motoko
+homepage: https://github.com/opus-codium/motoko
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org/
-  homepage_uri: https://github.com/smortex/motoko
-  source_code_uri: https://github.com/smortex/motoko
-  changelog_uri: https://github.com/smortex/motoko
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -137,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Inventory tools for Puppet / Choria infrastructures