facter-statistax 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58aca4f644124b001c602e3d8b2d450fecc011d08355ee1a9cbcf73cad1ee5de
-  data.tar.gz: 90d5f084f37dc3941af26abfe0be5866e8755c92d3e5c271fe31d3d4e7b32fef
+  metadata.gz: 3b3f8d40994d9934ce13ad3822519991575fc5ebcaac1e3fe0bf3b7ec6ac9d85
+  data.tar.gz: 482282b3b1d5b675ecc5214138c0eb7f225878d43168e35d95838e962c6d2061
 SHA512:
-  metadata.gz: a9d1f7b339fe20801cca8d285aa82259c30974d454ac1aead32f303aaa45260f7aae862a5f9422e457a916928a907bedde24743075492d3225c3c06ef494018d
-  data.tar.gz: bc79487c5de542130cf1efcefb22e7d3c73a737dc4aa5610d8a3cd5979f395c2dd0b1d4399838c10a32f8fd8f903801ce51a3bc2165918178f065707b4cfa447
+  metadata.gz: 25d27374a7773f73f0ae9da571987c3e3c113230a06188bf4b70a1a0d7931a925b5f7c15bb4a69dbc43f902bbfc18141014ed7adb0d1ada9307cda33c803dfdb
+  data.tar.gz: feeaee3eb200b3359649161d53a791b9249c262edc8a96f6e503bc2f9aed0b89d815348b366c5ef391e1d2b3688a4bf4a0e047385fd8409af52e09a9a62ac19f

data/.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
   Include:
     - 'lib/**/*.rb'
+    - 'bin/*.rb'
+    - 'config/*.rb'
+    - 'scripts/*.rb'
 
 Documentation:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 120
+  Max: 150

data/.rubycritic.yml

@@ -2,3 +2,4 @@ paths: # Files to analyse.
   - 'lib'
   - 'bin'
   - 'config'
+  - 'scripts'

data/CODEOWNERS

@@ -0,0 +1,2 @@
+# Default to Ghost team
+* @puppetlabs/ghost @puppetlabs/night-s-watch

data/Gemfile

@@ -7,5 +7,5 @@ gem 'fileutils'
 gem 'rubysl-open3'
 gem 'json'
 gem 'pry'
-gem 'rubocop'
+gem 'rubocop', '~> 0.73.0'
 gem 'rubycritic'

data/README.md

@@ -1,4 +1,6 @@
 # facter-statistax
+[![Build Status](https://travis-ci.com/puppetlabs/facter-statistax.svg?branch=master)](https://travis-ci.com/puppetlabs/facter-statistax)
+
 Benchmark tool for different versions of Puppet Facter.
 
 In order to run this script you must create a 'config.json' file with the following format:

data/acceptance/.beaker.yml

@@ -0,0 +1,15 @@
+---
+ssh:
+  keys:
+    - id_rsa_acceptance
+    - ~/.ssh/id_rsa-acceptance
+xml:                         true
+timesync:                    false
+repo_proxy:                  true
+add_el_extras:               false
+forge_host:                  api-forge-aio02-petest.puppet.com
+'master-start-curl-retries': 30
+log_level:                   debug
+preserve_hosts:              onfail
+helper:                      ./lib/helper.rb
+options_file:                ./config/aio/options.rb

data/acceptance/Gemfile

@@ -0,0 +1,34 @@
+# Specifies a gem mirror; duplicated in acceptance setup
+# to ensure a similar environment on acceptance hosts.
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
+
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
+gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || ["~>1.0", ">= 1.18.4"])
+gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 1.1")
+gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || "~> 0.4")
+gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || "~> 0")
+gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || "~> 1.3")
+gem "beaker-vcloud", *location_for(ENV['BEAKER_VCLOUD_VERSION'] || "~> 1.0")
+gem "beaker-docker", *location_for(ENV['BEAKER_DOCKER_VERSION'] || "~> 0.5")
+gem "rake", "~> 10.1"
+gem "httparty", :require => false
+gem 'uuidtools', :require => false
+
+group(:test) do
+  gem "rspec", "~> 2.14.0", :require => false
+  gem "mocha", "~> 0.10.5", :require => false
+end
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end

data/acceptance/README.md

@@ -0,0 +1,17 @@
+# Steps for collecting facter statistics
+
+1. ```bundle install```
+2.  ```export SHA=6.0.9``` - puppet agent SHA/VERSION to be installed and tested (please note that this projects 
+is working with puppet agent >= 6.0.x)
+3. ```export GEM_VERSION=2.5.5``` - gem facter version you want to test (if this env variable isn't set, the latest
+version will be downloaded)
+4. Modify config.json from acceptance directory to meet your testing needs
+5. To test using vmpooler:\
+```beaker-hostgenerator redhat7-64a-debian9-64a > hosts.yaml```\
+```beaker init -h hosts.yaml --options-file config/aio/options.rb```\
+   To test using nspooler you have to require the vm from nspooler first, then:\
+```beaker-hostgenerator centos6-64a-solaris11-SPARC\{hypervisor=none\,hostname=$THE_HOST_NSPOOLER_PROVIDED\} > hosts.yaml```\
+```bundle exec beaker init --hosts hosts.yaml --options-file config/aio/options.rb```
+6. ```bundle exec beaker provision```
+7. ```bundle exec beaker exec pre-suite --pre-suite presuite/01_install_puppet_agent.rb,presuite/02_install_facter_statistax.rb,presuite/03_install_facter_gem.rb --preserve-state```
+8. ```bundle exec beaker exec run/run_statistax.rb```

data/acceptance/build_and_move_gem.sh

@@ -0,0 +1,5 @@
+pwd
+cd ../../facter-ng
+gem build facter-ng.gemspec
+mv facter-ng-*.gem ../facter-statistax/acceptance 
+cd ../facter-statistax/acceptance

data/acceptance/config.json

@@ -0,0 +1,127 @@
+[
+  {
+    "test_run":"TestRun1",
+    "runs":[
+      {
+        "fact": "aio_agent_version",
+        "repetitions": 10
+      },
+      {
+        "fact": "augeas",
+        "repetitions": 10
+      },
+      {
+        "fact": "disks",
+        "repetitions": 10
+      },
+      {
+        "fact":"dmi",
+        "repetitions":10
+      },
+      {
+        "fact": "facterversion",
+        "repetitions": 10
+      },
+      {
+        "fact":"filesystems",
+        "repetitions":10
+      },
+      {
+        "fact": "hypervisors",
+        "repetitions": 10
+      },
+      {
+        "fact":"identity",
+        "repetitions":10
+      },
+      {
+        "fact":"is_virtual",
+        "repetitions":10
+      },
+      {
+        "fact":"kernel",
+        "repetitions":10
+      },
+      {
+        "fact":"kernelmajversion",
+        "repetitions":10
+      },
+      {
+        "fact":"kernelrelease",
+        "repetitions":10
+      },
+      {
+        "fact":"kernelversion",
+        "repetitions":10
+      },
+      {
+        "fact":"load_averages",
+        "repetitions":10
+      },
+      {
+        "fact":"memory",
+        "repetitions":10
+      },
+      {
+        "fact":"networking",
+        "repetitions":10
+      },
+      {
+        "fact":"os",
+        "repetitions":10
+      },
+      {
+        "fact":"path",
+        "repetitions":10
+      },
+      {
+        "fact":"processors",
+        "repetitions":10
+      },
+      {
+        "fact":"ruby",
+        "repetitions":10
+      },
+      {
+        "fact":"solaris_zones",
+        "repetitions":10
+      },
+      {
+        "fact":"ssh",
+        "repetitions":10
+      },
+      {
+        "fact":"system_uptime",
+        "repetitions":10
+      },
+      {
+        "fact":"timezone",
+        "repetitions":10
+      },
+      {
+        "fact":"virtual",
+        "repetitions":10
+      },
+      {
+        "fact":"zfs_featurenumbers",
+        "repetitions":10
+      },
+      {
+        "fact":"zfs_version",
+        "repetitions":10
+      },
+      {
+        "fact":"zpool_featurenumbers",
+        "repetitions":10
+      },
+      {
+        "fact":"zpool_version",
+        "repetitions":10
+      },
+      {
+        "fact": "all",
+        "repetitions": 10
+      }
+    ]
+  }
+]

data/acceptance/config/aio/options.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+{
+  type: 'aio'
+}

data/acceptance/lib/helper.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << __dir__
+
+require 'beaker-puppet'

data/acceptance/presuite/011_install_facter_ng.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+test_name 'Install facter gem' do
+  agents.each do |agent|
+    current_dir = Pathname.new(File.expand_path('..', __dir__))
+    facter_ng_gem = Dir.entries(current_dir).select { |file| file =~ /facter-ng-[0-9]+.[0-9]+.[0-9]+.gem/ }
+    facter_gem = File.join(current_dir, facter_ng_gem)
+    home_dir = on(agent, 'pwd').stdout.chop
+
+    scp_to agent, facter_gem, home_dir
+
+    gem_c = gem_command(agent)
+    on agent, "#{gem_c} uninstall facter-ng"
+    on agent, "#{gem_c} install -f facter-ng-*.gem"
+    if agent['platform'] =~ /windows/
+      puppetbin_path = '"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin":"/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin"'
+      on agent, %( echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc )
+    end
+  end
+end

data/acceptance/presuite/01_install_puppet_agent.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+test_name 'Install Puppet Agent Packages' do
+  opts = {
+    nightly_builds_url: ENV['NIGHTLY_BUILDS_URL'],
+    dev_builds_url: ENV['DEV_BUILDS_URL'],
+    puppet_agent_version: ENV['SHA'],
+    puppet_collection: ENV['RELEASE_STREAM']
+  }
+
+  install_puppet_agent_on(hosts, opts)
+
+  agents.each do |agent|
+    on agent, puppet('--version')
+    ruby = ruby_command(agent)
+    on agent, "#{ruby} --version"
+
+    log_dir = File.join(Pathname.new(File.expand_path('..', __dir__)), 'log_dir')
+    FileUtils.mkdir_p(log_dir)
+    host_dir = File.join(log_dir, agent['platform'])
+    FileUtils.mkdir_p(host_dir)
+  end
+end

data/acceptance/presuite/02_install_facter_statistax.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+test_name 'Install facter statistax' do
+  agents.each do |agent|
+    gem_c = gem_command(agent)
+    on agent, "#{gem_c} install -f facter-statistax"
+  end
+end

data/acceptance/presuite/03_install_facter_gem.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+test_name 'Install facter gem' do
+  agents.each do |agent|
+    gem_c = gem_command(agent)
+    if ENV['GEM_VERSION']
+      on agent, "#{gem_c} install -f facter-ng -v #{ENV['GEM_VERSION']}"
+    else
+      on agent, "#{gem_c} install -f facter-ng"
+    end
+  end
+end

data/acceptance/run/run_statistax.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'pathname'
+test_name 'Run facter statistax' do
+  agents.each do |agent|
+    is_gem = 'false'
+    home_dir = on(agent, 'pwd').stdout.chop
+
+    step 'Run facter statistax for Cfacter' do
+      content = ::File.read(File.join(Pathname.new(File.expand_path('..', __dir__)), 'config.json'))
+      create_remote_file(agent, "#{home_dir}/config.json", content)
+      if agent['platform'] =~ /windows/
+        puppetbin_path = '"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin":"/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin"'
+        on agent, %( echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc )
+        on agent, "statistax.bat config.json #{is_gem}"
+      else
+        on agent, "statistax #{home_dir}/config.json #{is_gem}"
+      end
+    end
+
+    step 'Save output' do
+      host_dir = File.join(Pathname.new(File.expand_path('..', __dir__)), "log_dir/#{agent['platform']}")
+
+      out_dir = File.join(host_dir, 'cpp')
+
+      FileUtils.mkdir_p(out_dir)
+      scp_from agent, "#{home_dir}/log/output.json", out_dir
+    end
+
+    step 'Run facter statistax for facter-ng' do
+      is_gem = 'true'
+      content = ::File.read(File.join(Pathname.new(File.expand_path('..', __dir__)), 'config.json'))
+      create_remote_file(agent, "#{home_dir}/config.json", content)
+      if agent['platform'] =~ /windows/
+        puppetbin_path = '"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin":"/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin"'
+        on agent, %( echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc )
+        on agent, "statistax.bat config.json #{is_gem}"
+      else
+        on agent, "statistax #{home_dir}/config.json #{is_gem}"
+      end
+    end
+
+    step 'Save output' do
+      host_dir = File.join(Pathname.new(File.expand_path('..', __dir__)), "log_dir/#{agent['platform']}")
+
+      out_dir = File.join(host_dir, 'cpp')
+
+      FileUtils.mkdir_p(out_dir)
+      scp_from agent, "#{home_dir}/log/output.json", out_dir
+    end
+  end
+end

data/acceptance/run/uninstall_facter_gem.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+test_name 'Uninstall facter gem' do
+  agents.each do |agent|
+    gem_c = gem_command(agent)
+    on agent, "#{gem_c} uninstall facter-ng"
+  end
+end

data/acceptance/run/uninstall_puppet_agent.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+test_name 'Uninstall puppet' do
+  agents.each do |agent|
+    remove_puppet_on(agent)
+  end
+end

data/config/boot.rb

@@ -10,7 +10,7 @@ require_relative '../lib/logger'
 ROOT_DIR      = Pathname.new(File.expand_path('..', __dir__)) unless defined?(ROOT_DIR)
 LOG_DIR       = File.join(Dir.getwd, 'log')
 SCRIPTS_DIR   = ROOT_DIR.join('scripts')
-CONFIG_FILE   = ARGV[0] || ""
+CONFIG_FILE   = ARGV[0] || ''
 IS_GEM        = ARGV[1] || 'false'
 
 def load_files(*dirs)
@@ -18,6 +18,6 @@ def load_files(*dirs)
 end
 
 load_files(
-    'lib/common/*.rb',
-    'lib/executors/*.rb'
+  'lib/common/*.rb',
+  'lib/executors/*.rb'
 )

data/facter-statistax.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "facter-statistax"
   s.summary = "Facter-Statistax, benchmark for facter"
 
-  s.add_dependency 'logger'
+  s.add_dependency('logger', ["< 1.4.0"])
   s.add_dependency 'fileutils'
   s.add_dependency 'rubysl-open3'
   s.add_dependency 'json'

data/lib/common/output_writer.rb

@@ -18,7 +18,7 @@ module FacterStatistax
         test_run = @test_run.merge(facts: facts)
         output << test_run
         ::File.open(File.join(LOG_DIR, 'output.json'), 'w') do |file|
-          file.write(output.to_json)
+          file.write(JSON.pretty_generate(output))
         end
       end
 

data/lib/executors/test_run_executor.rb

@@ -12,7 +12,7 @@ module FacterStatistax
 
       def execute
         sum = sum_for_each_repetition do
-          time, _status = Open3.capture2("ruby #{SCRIPTS_DIR}/benchmark_script.rb #{IS_GEM} #{fact}")
+          time, _status = Open3.capture2("ruby \"#{SCRIPTS_DIR}/benchmark_script.rb\" #{IS_GEM} #{fact}")
           log_time(fact, time)
           time.to_f
         end
@@ -32,7 +32,7 @@ module FacterStatistax
 
       def log_time(fact, time)
         FacterStatistax.logger.info("For #{fact} facts it took:")
-        FacterStatistax.logger.info("#{format('%.2f', time)}s")
+        FacterStatistax.logger.info("#{format('%<time>.2f', time: time)}s")
       end
     end
   end

data/lib/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FacterStatistax
-  VERSION = '0.0.3'
+  VERSION = '0.0.8'
 end

data/scripts/benchmark_script.rb

@@ -5,21 +5,23 @@ require 'open3'
 
 if ARGV[0].to_s == 'false'
   if Gem.win_platform?
-    facter_dir = "C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/vendor_ruby/../../../"
-    ENV['PATH'] = "#{File.join(facter_dir, 'bin')}#{File::PATH_SEPARATOR}#{File.join(facter_dir, '../puppet/bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-    require "#{facter_dir}/bin/libfacter.so"
+    facter_dir = 'C:/Program Files/Puppet Labs/Puppet/puppet/bin'
+    ENV['PATH'] = "#{facter_dir}#{File::PATH_SEPARATOR}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+    require "#{facter_dir}/libfacter.so"
   else
-    require "/opt/puppetlabs/puppet/lib/libfacter.so"
+    require '/opt/puppetlabs/puppet/lib/libfacter.so'
   end
+elsif Gem.win_platform?
+  gems_path = 'C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/gems'
+  ruby_version = Dir.entries(gems_path).select { |file| file =~ /[0-9]+.[0-9]+.[0-9]+/ }
+  facter_ng_path =  File.join(gems_path, ruby_version, 'gems')
+  facter_ng_version = Dir.entries(facter_ng_path).select { |file| file =~ /facter-ng-4/ }
+  facter_ng_path = File.join(facter_ng_path, facter_ng_version, 'lib', 'facter-ng.rb')
+  require facter_ng_path
 else
-  if Gem.win_platform?
-    require 'C:\Program Files\Puppet Labs\Puppet\puppet\lib\ruby\gems\2.5.0\gems\facter-2.5.5-x64-mingw32\lib\facter.rb'
-  else
-    require 'facter'
-  end
+  require 'facter-ng'
 end
 
-
 time = Benchmark.realtime do
   if ARGV[1] == 'all'
     Facter.to_hash
@@ -29,5 +31,3 @@ time = Benchmark.realtime do
 end
 
 puts time
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter-statistax
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - ''
@@ -14,16 +14,16 @@ dependencies:
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
@@ -77,10 +77,24 @@ files:
 - ".rubocop.yml"
 - ".rubycritic.yml"
 - ".travis.yml"
+- CODEOWNERS
 - Gemfile
 - LICENSE
 - README.md
-- VERSION
+- acceptance/.beaker.yml
+- acceptance/Gemfile
+- acceptance/README.md
+- acceptance/build_and_move_gem.sh
+- acceptance/config.json
+- acceptance/config/aio/options.rb
+- acceptance/lib/helper.rb
+- acceptance/presuite/011_install_facter_ng.rb
+- acceptance/presuite/01_install_puppet_agent.rb
+- acceptance/presuite/02_install_facter_statistax.rb
+- acceptance/presuite/03_install_facter_gem.rb
+- acceptance/run/run_statistax.rb
+- acceptance/run/uninstall_facter_gem.rb
+- acceptance/run/uninstall_puppet_agent.rb
 - bin/statistax
 - config/boot.rb
 - facter-statistax.gemspec
@@ -114,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Facter-Statistax, benchmark for facter

data/VERSION

@@ -1 +0,0 @@
-0.0.3