everyday-cli-utils 1.8.7.1 → 1.8.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e108393ed60d47c7d3694f022f4c1fc6b846a13e
-  data.tar.gz: b3f96c931eaa739e99d780079cd6db679f4ff74b
+SHA256:
+  metadata.gz: ca7bef9b73263ea19216f8772976432428c2d3c95149515d788e85ae96e16e2b
+  data.tar.gz: ae02ca9bbc51dd7d0f096402ae8212ab36142edefce8dd382410c92b8440a716
 SHA512:
-  metadata.gz: ac1cada0d96cfd60d3fe8cf13ac9aa710a578569a4b89596d8a93ad5bffefa52d0a0f2d3523522632240b7cac8c9a14a5f036307bec423fda03470990e69fb30
-  data.tar.gz: 09b46875f35d744b000be73ba63d7692ccfaa352e1c8af54ce2113d66f0c8d056ecc07da32817be6bc420ea412002ed4b0bd39b5e8d07ebbf8f84a27f560e199
+  metadata.gz: b480868b9c8cc442f2011cdf89fc16f71f32e6ce97b89174b6c3de82faf8642d32ae28feb30c02b6721ed5f8ad672eb910dd1035e0cd70abc73f925b978de453
+  data.tar.gz: a4267353f95609caa80f6e89bc0038365b6eb429e4510b249d99e17d7ab82f0023b1a63d36f24d4d1c8b68d4ee807c6d53c521b2f3fc2cf6cdd10f6c31984fff

data/.travis.yml

@@ -1,2 +1,8 @@
 language: ruby
-gemfile: Gemfile.ci
+gemfile: Gemfile.ci
+addons:
+  code_climate:
+    repo_token: 9c7db3420cd3e03bfdecf3768a39759d6047ca1a1222cc14d57c9a63803eaa35
+# regular test configuration
+after_success:
+  - bundle exec codeclimate-test-reporter

data/Gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    everyday-cli-utils (1.8.6)
+    everyday-cli-utils (1.8.7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    codeclimate-test-reporter (0.5.0)
+    codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    json (1.8.3)
-    rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    json (2.2.0)
+    rake (12.3.3)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    simplecov (0.17.0)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.10)
+  bundler (~> 2.0)
   codeclimate-test-reporter (~> 0.4, >= 0.4.7)
   everyday-cli-utils!
-  rake (~> 10.4)
-  rspec (~> 3.3)
+  rake (~> 12.3)
+  rspec (~> 3.8)
 
 BUNDLED WITH
-   1.11.2
+   2.0.2

data/everyday-cli-utils.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency 'rspec', '~> 3.3'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.8'
 end

data/lib/everyday-cli-utils/maputil.rb

@@ -9,7 +9,7 @@ module Enumerable
     EverydayCliUtils::MapUtil.filtermap(self, &block)
   end
 
-  def sum
+  def epg_sum
     EverydayCliUtils::MapUtil.sum(self)
   end
 

data/lib/everyday-cli-utils/option.rb

@@ -416,14 +416,17 @@ module EverydayCliUtils
     end
 
     def opts
+      @options ||= OptionList.new
       @options.opts
     end
 
     def options
+      @options ||= OptionList.new
       @options.composite(:global, :local, :arg)
     end
 
     def option_list
+      @options ||= OptionList.new
       @options
     end
 
@@ -438,6 +441,7 @@ module EverydayCliUtils
     end
 
     def help_str=(str)
+      @options ||= OptionList.new
       @options.help_str = str
     end
 

data/lib/everyday-cli-utils/override.rb

@@ -94,6 +94,10 @@ class Object
     MethodOverrides.register_override(s, self, method_name, &block)
   end
 
+  def has_override?(method_name)
+    !self.true_overrides.empty?(method_name)
+  end
+
   class << self
     def class_overrides(s)
       @overrides && @overrides.get(s)
@@ -110,5 +114,9 @@ class Object
     def override(method_name, &block)
       MethodOverrides.register_override(self, self, method_name, &block)
     end
+
+    def has_override?(method_name)
+      !self.true_overrides.empty?(method_name)
+    end
   end
 end

data/lib/everyday-cli-utils/safe/kmeans.rb

@@ -111,7 +111,7 @@ module EverydayCliUtils
       kso      = ks
       clusters = EverydayCliUtils::KmeansUtil.get_clusters(collection, kso)
       ks       = []
-      clusters.each_with_index { |val, key| ks[key] = (val.count <= 0) ? false : (val.sum / val.count) }
+      clusters.each_with_index { |val, key| ks[key] = (val.count <= 0) ? false : (EverydayCliUtils::MapUtil.sum(val) / val.count) }
       min = collection.min
       max = collection.max
       ks = ks.map { |k| k || ((Random.rand * (max-min)) + min) }
@@ -149,5 +149,9 @@ module EverydayCliUtils
       ks.each_with_index { |avg, i| outliers += EverydayCliUtils::KmeansUtil.find_outliers(avg, cs, i, sensitivity) }
       outliers
     end
+
+    def self.get_clusters(collection, means)
+      EverydayCliUtils::KmeansUtil.get_clusters(collection, means)
+    end
   end
 end

data/lib/everyday-cli-utils/version.rb

@@ -1,3 +1,3 @@
 module EverydayCliUtils
-  VERSION = '1.8.7.1'
+  VERSION = '1.8.7.2'
 end

data/spec/everyday-cli-utils/base_spec.rb

@@ -0,0 +1,7 @@
+require_relative '../../lib/everyday-cli-utils'
+
+describe 'everyday-cli-utils' do
+  it 'raises an exception when an unknown module name is passed to import' do
+    expect { EverydayCliUtils.import(:unknown_module) }.to raise_exception('unknown_module not found!')
+  end
+end

data/spec/everyday-cli-utils/kmeans_spec.rb

@@ -2,25 +2,67 @@ require_relative '../../lib/everyday-cli-utils'
 include EverydayCliUtils
 import :kmeans
 
+def gen_arr(options = {}, &block)
+  min = options[:min] || 1
+  max = options[:max] || 4
+  base_mult = options[:base_mult] || 100
+  min2 = options[:min2] || min
+  max2 = options[:max2] || max
+  (min..max).to_a.flat_map { |v| (min2..max2).to_a.flat_map { |v2| [base_mult*v + block.call(v, v2), 100*v - block.call(v, v2)]}}
+end
+
+def expect_arr(actual_to_expected = {})
+  actual_to_expected.each { |a, e|
+    a = a.sort
+    e = e.sort
+    expect(a.count).to eq e.count
+    expect(a).to eq e
+  }
+end
+
+def expect_arr_two_deep(actual_to_expected = {})
+  actual_to_expected.each { |a, e|
+    a = a.sort
+    e = e.sort
+    expect(a.count).to eq e.count
+    (0...a.count).each { |i|
+      ai = a[i].sort
+      ei = e[i].sort
+      expect(ai).to eq ei
+    }
+  }
+end
+
+def expect_arr_count(actual_to_expected_count = {})
+  actual_to_expected_count.each { |a, ec|
+    expect(a.count).to eq ec
+  }
+end
+
 describe EverydayCliUtils::Kmeans do
   it 'finds the right clusters in simple data' do
-    arr    = [100, 200, 99, 400, 98, 201, 101, 405, 102]
-    nmeans = arr.nmeans
-    expect(nmeans.count).to eq 3
-    expect(nmeans).to eq [100, 200.5, 402.5]
+    arr    = gen_arr { |v, v2| Math.sqrt(v2) }
+    expect_arr arr.nmeans => [100, 200, 300, 400]
   end
 
   it 'limits number of clusters found' do
     arr    = (1..50).to_a.map { |v| (v * (101-v)) ** 2 }
-    nmeans = arr.nmeans(5)
-    expect(nmeans.count).to eq 5
-    nmeans = arr.nmeans(3)
-    expect(nmeans.count).to eq 3
+    expect_arr_count arr.nmeans(5) => 5, arr.nmeans(3) => 3
   end
 
   it 'finds outliers in simple data' do
-    arr      = [100, 200, 99, 400, 98, 201, 101, 405, 102]
-    outliers = arr.outliers
-    expect(outliers).to eq [400.0, 405.0]
+    arr      = gen_arr { |v, v2| (v2+v)/v2 }
+    expect_arr arr.outliers => [197, 203, 296, 304, 395, 405]
+  end
+
+  it 'finds the correct means when k is specified' do
+    arr      = gen_arr { |v, v2| (v2+v)/v2 }
+    expect_arr arr.kmeans(2) => [150, 350]
+  end
+
+  it 'finds the correct means when k is specified' do
+    arr      = gen_arr { |v, v2| (v2+v)/v2 }
+    kmeans = arr.kmeans(2)
+    expect_arr_two_deep arr.get_clusters(kmeans) => [gen_arr(min: 1, max: 2, min2: 1, max2: 4) { |v, v2| (v2+v)/v2 }, gen_arr(min: 3, max: 4, min2: 1, max2: 4) { |v, v2| (v2+v)/v2 }]
   end
 end

data/spec/everyday-cli-utils/maputil_spec.rb

@@ -16,7 +16,7 @@ describe 'maputil' do
 
   it 'provides a shortcut for summing the values of an list' do
     arr = (0..9).to_a
-    sum = arr.sum
+    sum = arr.epg_sum
     expect(sum).to eq 45
   end
 
@@ -89,4 +89,12 @@ describe 'maputil' do
     expected = { a: 11, b: 2, c: 3, d: 14, e: 5, f: 16 }
     expect(extended).to eq expected
   end
+
+  it 'provides a means of subtracting one hash from another' do
+    hash1    = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 }
+    hash2    = { a: 1, d: 14, f: 6 }
+    diff = hash1 - hash2
+    expected = { b: 2, c: 3, d: 4, e: 5 }
+    expect(diff).to eq expected
+  end
 end

data/spec/everyday-cli-utils/option_spec.rb

@@ -182,6 +182,8 @@ describe EverydayCliUtils::OptionUtil do
     -0, --set-defaults               set defaults
 '
     expect(opt.to_s).to eq expected
+    opt.help_str = "#{expected}\nTest"
+    expect(opt.help).to eq "#{expected}\nTest"
   end
 
   it 'supports layers' do
@@ -195,6 +197,7 @@ describe EverydayCliUtils::OptionUtil do
     clean        = { opt1: false, opt2: [], opt3: nil, opt4: [] }
     clean2       = { opt1: true, opt2: [], opt3: nil, opt4: [] }
     opt          = Option1.new
+    expect(opt.opts).to be_a(OptionParser)
     opt.default_settings toggle: true, append: true
     opt.option :opt1, %w(-1 --opt-1)
     opt.option_with_param :opt2, %w(-2 --big-opt-2)
@@ -255,13 +258,63 @@ Script + Global + Local Defaults:
 
 SHOW
     opt.apply_options :arg, opt1: true
-    expect(opt.options).to eq total
-    expect(opt.option_list.composite(:global, :arg)).to eq global_arg
-    expect(opt.option_list.composite(:global, :local)).to eq global_local
-    expect(opt.option_list.composite(:global)).to eq global
-    expect(opt.option_list.composite(:local)).to eq local
-    expect(opt.option_list.composite(:local, :arg)).to eq local_arg
-    expect(opt.option_list.composite(:arg)).to eq arg
-    expect(opt.option_list.composite(:global, :local, :arg)).to eq total
+    opt.show_defaults_option %w(-d --show-defaults), exit_on_show: false
+    file = File.expand_path('global_defaults.yaml')
+    begin
+      opt.global_defaults_option file, %w(-g --global-defaults), exit_on_save: true
+      opt.help_option %w(-h --help), exit_on_print: false
+      expect(opt.options).to eq total
+      expect(opt.option_list.composite(:global, :arg)).to eq global_arg
+      expect(opt.option_list.composite(:global, :local)).to eq global_local
+      expect(opt.option_list.composite(:global)).to eq global
+      expect(opt.option_list.composite(:local)).to eq local
+      expect(opt.option_list.composite(:local, :arg)).to eq local_arg
+      expect(opt.option_list.composite(:arg)).to eq arg
+      expect(opt.option_list.composite(:global, :local, :arg)).to eq total
+      $stdout = StringIO.new
+      opt.parse!(%w(-h -d))
+      expect($stdout.string).to eq 'Usage: rspec [options]
+    -1, --opt-1
+    -2, --big-opt-2 PARAM
+    -3, --bigger-opt-3 PARAM
+    -4, --even-bigger-opt-4 PARAM
+    -d, --show-defaults
+    -g, --global-defaults
+    -h, --help
+Script Defaults:
+    -1, --opt-1                      true
+    -2 PARAM, --big-opt-2            []
+    -3 PARAM, --bigger-opt-3         nil
+    -4 PARAM, --even-bigger-opt-4    []
+
+Script + Global Defaults:
+    -1, --opt-1                      false
+    -3 PARAM, --bigger-opt-3         \'hi\'
+    -4 PARAM, --even-bigger-opt-4    [5]
+
+Script + Global + Local Defaults:
+    -2 PARAM, --big-opt-2            [\'hi\', \'bye\']
+    -3 PARAM, --bigger-opt-3         \'bye\'
+    -4 PARAM, --even-bigger-opt-4    [5, 4]
+
+'
+      expect { opt.parse!(%w(-g)) }.to raise_exception(SystemExit)
+    ensure
+      File.delete(file)
+    end
+  end
+
+  it 'still supports the old option style' do
+    vals = {value: '', multi: [], toggle: true}
+    opts = OptionParser.new { |opts|
+        EverydayCliUtils::Option.add_option_with_param(vals, opts, ['-v', '--value PARAM'], :value)
+        EverydayCliUtils::Option.add_option_with_param(vals, opts, ['-m', '--multi PARAM'], :multi, append: true)
+        EverydayCliUtils::Option.add_option(vals, opts, %w(-t --toggle), :toggle, toggle: true)
+    }
+    expected = {value: '', multi: [], toggle: true}
+    expect(vals).to eq expected
+    opts.parse!(%w(-v ABC -m DEF -m GHI -t))
+    expected = {value: 'ABC', multi: ['DEF', 'GHI'], toggle: false}
+    expect(vals).to eq expected
   end
 end

data/spec/everyday-cli-utils/override_spec.rb

@@ -20,6 +20,8 @@ describe 'override' do
     arr.override(:first) { "Boo! #{self.overrides.first}" }
     arr.override(:first) { "Boo Again! #{self.overrides[1].first}" }
     arr.override(:first) { "Boo Again Again! #{self.overrides[1].first} | #{self.overrides.first}" }
+    expect(arr.has_override?(:first)).to be true
+    expect(arr.has_override?(:test)).to be false
     expect(arr.first).to eq 'Boo Again Again! Boo! 1 | Boo Again! 1'
   end
 
@@ -27,6 +29,8 @@ describe 'override' do
     TestClass.override(:test) { |t| "Boo! #{self.overrides.test("-#{t}-")}" }
     TestClass.override(:test) { |t| "Boo Again! #{self.overrides[1].test("+#{t}+")}" }
     TestClass.override(:test) { |t| "Boo Again Again! #{self.overrides[1].test("!#{t}!")} | #{self.overrides.test("~#{t}~")}" }
+    expect(TestClass.has_override?(:first)).to be false
+    expect(TestClass.has_override?(:test)).to be true
     expect(TestClass.new.test('Eric')).to eq 'Boo Again Again! Boo! Hi -!Eric!-! | Boo Again! Hi +~Eric~+!'
   end
 

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday-cli-utils
 version: !ruby/object:Gem::Version
-  version: 1.8.7.1
+  version: 1.8.7.2
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
 description: A few CLI and general utilities.  Includes a numbered-menu select loop
   utility, a ANSI formatting escape code handler, a text-based histogram maker, k-means
   and n-means (k-means with minimum optimal k) calculators, various collection utility
@@ -85,6 +85,7 @@ files:
 - lib/everyday-cli-utils/safe/kmeans.rb
 - lib/everyday-cli-utils/safe/maputil.rb
 - lib/everyday-cli-utils/version.rb
+- spec/everyday-cli-utils/base_spec.rb
 - spec/everyday-cli-utils/format_spec.rb
 - spec/everyday-cli-utils/kmeans_spec.rb
 - spec/everyday-cli-utils/maputil_spec.rb
@@ -110,16 +111,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A few CLI and general utils
 test_files:
+- spec/everyday-cli-utils/base_spec.rb
 - spec/everyday-cli-utils/format_spec.rb
 - spec/everyday-cli-utils/kmeans_spec.rb
 - spec/everyday-cli-utils/maputil_spec.rb
 - spec/everyday-cli-utils/option_spec.rb
 - spec/everyday-cli-utils/override_spec.rb
 - spec/spec_helper.rb
-has_rdoc: