dropsonde 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b344789cd257a8cae81d53150c1ab50fe0cf20716c4fce306446a2c207c7e2
-  data.tar.gz: 563788ccfcf13c75feb8529e4870ba65a0679a1d461eda2413cd401c0c52decd
+  metadata.gz: 05a4a694cd3915ec7c3683c7c8250fd1f857d07ef8fb6cae80c832404b35e3ce
+  data.tar.gz: 95245d11a85ef50539f86182cc458246178ffb24ff409bd04fbef9a0a23342ef
 SHA512:
-  metadata.gz: 5006cf40dd17e018b6af805ae6192d5cc8b1842b981a4eba6895966a7ace7ee13365b9bae976169adaad1399ee9ca767d10b56cef56542ba5420cd04cecafdb6
-  data.tar.gz: ebda439d8baeec73d04887fb03b745acb2a11b9af8621f8992ad585b9ea9380f4c5732f88a5c17661f8123cba8125dc781d2929302a0954511bd6fae221c78f4
+  metadata.gz: a8eed2636ad7735accf3e3f6bacbcb16bae84514b3503e718eb96426ca0bbe6a39a06a9ea06727714b6e578ac4a3bd9ddd6fe76f9bebb4c1d63c084b3503c44b
+  data.tar.gz: 2d1c1cf87cef36cdcb196cab0c135970020389462b99b0ff8447dcefe3ae1f381da31a93ad29a34fedbfd6134eeba2b8c58a3ee30069021c74e3972a857f5950

data/CHANGELOG.md

@@ -1,11 +1,25 @@
 # Changelog
 
-## [0.0.7](https://github.com/puppetlabs/dropsonde/tree/0.0.7) (2022-02-10)
+## [0.0.8](https://github.com/puppetlabs/dropsonde/tree/0.0.8) (2022-08-29)
 
-[Full Changelog](https://github.com/puppetlabs/dropsonde/compare/v0.0.6...0.0.7)
+[Full Changelog](https://github.com/puppetlabs/dropsonde/compare/v0.0.7...0.0.8)
 
 **Merged pull requests:**
 
+- \[maint\] correct cache [\#29](https://github.com/puppetlabs/dropsonde/pull/29) ([binford2k](https://github.com/binford2k))
+- \[maint\] rubocop style fixes [\#28](https://github.com/puppetlabs/dropsonde/pull/28) ([binford2k](https://github.com/binford2k))
+- Fix example generation [\#27](https://github.com/puppetlabs/dropsonde/pull/27) ([binford2k](https://github.com/binford2k))
+- unused modules [\#26](https://github.com/puppetlabs/dropsonde/pull/26) ([binford2k](https://github.com/binford2k))
+- Adding changelog generation to Rakefile [\#23](https://github.com/puppetlabs/dropsonde/pull/23) ([binford2k](https://github.com/binford2k))
+
+## [v0.0.7](https://github.com/puppetlabs/dropsonde/tree/v0.0.7) (2022-02-10)
+
+[Full Changelog](https://github.com/puppetlabs/dropsonde/compare/v0.0.6...v0.0.7)
+
+**Merged pull requests:**
+
+- Releasing v00.7 [\#22](https://github.com/puppetlabs/dropsonde/pull/22) ([binford2k](https://github.com/binford2k))
+- Releasing v00.7 [\#21](https://github.com/puppetlabs/dropsonde/pull/21) ([binford2k](https://github.com/binford2k))
 - update server language [\#20](https://github.com/puppetlabs/dropsonde/pull/20) ([binford2k](https://github.com/binford2k))
 - Updates the telemetry endpoint to a stable URL [\#19](https://github.com/puppetlabs/dropsonde/pull/19) ([MikaelSmith](https://github.com/MikaelSmith))
 - docs updates now that it's shipped [\#18](https://github.com/puppetlabs/dropsonde/pull/18) ([binford2k](https://github.com/binford2k))

data/lib/dropsonde/cache.rb

@@ -7,11 +7,13 @@ require 'puppet_forge'
 
 # cache class
 class Dropsonde::Cache
+  @@cache = nil # rubocop:disable Style/ClassVars
   @autoupdate = false
 
-  def initialize(path, ttl, autoupdate)
+  def initialize(path = '~/.dropsonde', ttl = 7, autoupdate = true) # rubocop:disable Style/OptionalBooleanParameter
+    path = File.expand_path(path)
     FileUtils.mkdir_p(path)
-    @path = "#{File.expand_path(path)}/forge.json"
+    @path = "#{path}/forge.json"
     @ttl  = ttl
     @autoupdate = autoupdate
 
@@ -27,10 +29,14 @@ class Dropsonde::Cache
     PuppetForge.user_agent = 'Dropsonde Telemetry Client/0.0.1'
   end
 
-  def modules
+  def self.modules
     @@cache['modules']
   end
 
+  def modules
+    Dropsonde::Cache.modules
+  end
+
   def cache
     @@cache
   end

data/lib/dropsonde/metrics/dependencies.rb

@@ -71,12 +71,11 @@ class Dropsonde::Metrics::Dependencies
     # make it easier to write data aggregation queries without access to the
     # actual private data that users have submitted.
 
-    dropsonde_cache = Dropsonde::Cache.new('foo', 7, true)
     versions = ['>= 1.5.2', '>= 4.3.2', '>= 3.0.0 < 4.0.0', '>= 2.2.1 < 5.0.0', '>= 5.0.0 < 7.0.0', '>= 4.11.0']
     [
-      dependencies: dropsonde_cache.modules
-                                   .sample(rand(250))
-                                   .map do |item|
+      dependencies: Dropsonde::Cache.modules
+                                    .sample(rand(250))
+                                    .map do |item|
                       {
                         name: item,
                         version_requirement: versions.sample,

data/lib/dropsonde/metrics/modules.rb

@@ -5,6 +5,8 @@ class Dropsonde::Metrics::Modules
   def self.initialize_modules
     # require any libraries needed here -- no need to load puppet; it's already initialized
     # All plugins are initialized before any metrics are generated.
+    require 'puppet/info_service'
+    require 'puppet/info_service/class_information_service'
   end
 
   def self.description
@@ -64,6 +66,46 @@ class Dropsonde::Metrics::Modules
         "name": 'classes',
         "type": 'RECORD',
       },
+      {
+        "fields": [
+          {
+            "description": 'The module name',
+            "mode": 'NULLABLE',
+            "name": 'name',
+            "type": 'STRING',
+          },
+          {
+            "description": 'The module slug (author-name)',
+            "mode": 'NULLABLE',
+            "name": 'slug',
+            "type": 'STRING',
+          },
+          {
+            "description": 'The module version',
+            "mode": 'NULLABLE',
+            "name": 'version',
+            "type": 'STRING',
+          },
+        ],
+        "description": 'List of modules whose classes are not declared in any environments.',
+        "mode": 'REPEATED',
+        "name": 'unused_modules',
+        "type": 'RECORD',
+      },
+      {
+        "fields": [
+          {
+            "description": 'The class name',
+            "mode": 'NULLABLE',
+            "name": 'name',
+            "type": 'STRING',
+          },
+        ],
+        "description": 'List of unused classes in all environments.',
+        "mode": 'REPEATED',
+        "name": 'unused_classes',
+        "type": 'RECORD',
+      },
     ]
   end
 
@@ -102,13 +144,45 @@ class Dropsonde::Metrics::Modules
           count: results.count { |row| row['title'] == title },
         }
       }.compact
+
+      # now lets get a list of all classes so we can identify which are unused
+      infoservice = Puppet::InfoService::ClassInformationService.new
+      env_hash = {}
+      environments.each do |env|
+        manifests = Puppet.lookup(:environments).get(env).modules.reduce([]) do |acc, mod|
+          next acc unless mod.forge_module?
+
+          acc.concat mod.all_manifests
+        end
+        env_hash[env] = manifests
+      end
+
+      klasses_per_env = infoservice.classes_per_environment(env_hash)
+
+      installed_classes = klasses_per_env.reduce([]) do |klasses, (_key, env)|
+        names = env.reduce([]) do |acc, (_file, contents)|
+          acc.concat(contents[:classes].map { |c| c[:name] })
+        end
+
+        klasses.concat names
+      end
+
+      unused_modules = installed_classes.map { |c| c.split('::').first }.sort.uniq
+      classes.each { |c| unused_modules.delete(c[:name].split('::').first.downcase) }
+
+      unused_classes = installed_classes.dup
+      classes.each { |c| unused_classes.delete(c[:name].downcase) }
     else
       classes = []
+      unused_modules  = []
+      unused_classes  = []
     end
 
     [
       { modules: modules },
       { classes: classes },
+      { unused_modules: unused_modules },
+      { unused_classes: unused_classes },
     ]
   end
 
@@ -119,25 +193,30 @@ class Dropsonde::Metrics::Modules
 
     versions = ['1.3.2', '0.0.1', '0.1.2', '1.0.0', '3.0.2', '7.10', '6.1.0', '2.1.0', '1.4.0']
     classes = ['', '::Config', '::Service', '::Server', '::Client', '::Packages']
-    dropsonde_cache = Dropsonde::Cache.new('foo', 7, true)
     [
-      modules: dropsonde_cache.modules
-                              .sample(rand(100))
-                              .map do |item|
+      modules: Dropsonde::Cache.modules
+                               .sample(rand(100))
+                               .map do |item|
                  {
                    name: item.split('-').last,
                    slug: item,
                    version: versions.sample,
                  }
                end,
-      classes: dropsonde_cache.modules
-                              .sample(rand(500))
-                              .map do |item|
+      classes: Dropsonde::Cache.modules
+                               .sample(rand(500))
+                               .map do |item|
                  {
                    name: item.split('-').last.capitalize + classes.sample,
                    count: rand(750),
                  }
                end,
+      unused_modules: Dropsonde::Cache.modules
+                                      .sample(rand(500))
+                                      .map { |item| item.split('-').last },
+      unused_classes: Dropsonde::Cache.modules
+                                      .sample(rand(500))
+                                      .map { |item| item.split('-').last.capitalize + classes.sample },
     ]
   end
 

data/lib/dropsonde/metrics/platforms.rb

@@ -100,10 +100,9 @@ class Dropsonde::Metrics::Platforms
     platforms = %w[RedHat Debian Windows Suse FreeBSD Darwin Archlinux AIX]
     classes   = ['', '::Config', '::Service', '::Server', '::Client', '::Packages']
 
-    dropsonde_cache = Dropsonde::Cache.new('foo', 7, true)
-    data = dropsonde_cache.modules
-                          .sample(rand(35))
-                          .map { |item|
+    data = Dropsonde::Cache.modules
+                           .sample(rand(35))
+                           .map { |item|
       name = item.split('-').last.capitalize + classes.sample
 
       rand(5).times.map do

data/lib/dropsonde/metrics/puppetfiles.rb

@@ -54,7 +54,7 @@ class Dropsonde::Metrics::Puppetfiles
       next unless File.file? puppetfile
 
       tokens  = Ripper.sexp(File.read(puppetfile)).flatten
-      indices = tokens.map.with_index { |a, i| a == :command ? i : nil }.compact
+      indices = tokens.map.with_index { |a, i| (a == :command) ? i : nil }.compact
 
       indices.map { |i| tokens[i + 2] }
     }.flatten.compact

data/lib/dropsonde/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Dropsonde
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropsonde
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ben Ford
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -164,7 +164,7 @@ homepage: https://github.com/puppetlabs/dropsonde
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -179,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A simple telemetry probe for gathering usage information about Puppet infrastructures.
 test_files: []