everyday-cli-utils 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b782f421cdd9590afee254f31a04ede52ea639
-  data.tar.gz: 15cc9c8b271b27098d55d9a200c1108b8be17a35
+  metadata.gz: 7892604af4bb9b58227dea18a0c14a9c8daaffb9
+  data.tar.gz: b0dfde2c8a940aeb9f09104f27b523f0a8867a5b
 SHA512:
-  metadata.gz: 90b018a8acffbbb70a677bcc064eadfa03291bfe8ffae3e70aa1404ec68e362d25e9136f2b9f9317c8893120d7ad74c0b09ab2777b7cc809ddfb7418c1d0f13e
-  data.tar.gz: 353c6a1b8d6ee9be21ee2335a6bc82c801bbdd24f9313be231cccd6cfea9945aa94c97866779eb14b9cc5eddd02c9b7b0ac815ae0581e80cbc2c8a48b977e8d4
+  metadata.gz: 65770fbd4440a17dfafd6d5b4234aad239de0ee499f5c7be24e8f1ed3589d02f190f80fdb3e4822c9887371194ae3acf7c17d58148fcefac67a01b6c02e8dddf
+  data.tar.gz: 83ad2e2ad25d0fd7cfe1efdeb9fba19a71215f2ee27372cce584da79f51e7bb6b18c993bfcd2352d60a5482f5d6475c15b7a7a2b50c95e6648fb6cd798dca36a

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in everyday-cli-utils.gemspec
 gemspec
+gem 'codeclimate-test-reporter', '~> 0.4', '>= 0.4.7', group: :test, require: nil

data/Gemfile.ci

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gem 'bundler', '~> 1.6'
 gem 'rake', '~> 10.0'
-gem 'rspec'
+gem 'rspec'
+gem 'codeclimate-test-reporter', group: :test, require: nil

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    everyday-cli-utils (1.8.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    codeclimate-test-reporter (0.4.7)
+      simplecov (>= 0.7.1, < 1.0.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    json (1.8.3)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.10)
+  codeclimate-test-reporter (~> 0.4, >= 0.4.7)
+  everyday-cli-utils!
+  rake (~> 10.4)
+  rspec (~> 3.3)
+
+BUNDLED WITH
+   1.10.4

data/README.md

@@ -1,18 +1,15 @@
 # EverydayCliUtils
 
-[![Gem Version](https://badge.fury.io/rb/everyday-cli-utils.png)](http://badge.fury.io/rb/everyday-cli-utils)
-[![Build Status](https://travis-ci.org/henderea/everyday-cli-utils.png?branch=master)](https://travis-ci.org/henderea/everyday-cli-utils)
-[![Dependency Status](https://gemnasium.com/henderea/everyday-cli-utils.png)](https://gemnasium.com/henderea/everyday-cli-utils)
-[![Code Climate](https://codeclimate.com/github/henderea/everyday-cli-utils.png)](https://codeclimate.com/github/henderea/everyday-cli-utils)
-[![Coverage Status](https://coveralls.io/repos/henderea/everyday-cli-utils/badge.png?branch=master)](https://coveralls.io/r/henderea/everyday-cli-utils?branch=master)
+[![Gem Version](https://badge.fury.io/rb/everyday-cli-utils.svg)](http://badge.fury.io/rb/everyday-cli-utils)
+[![Build Status](https://travis-ci.org/henderea/everyday-cli-utils.svg?branch=master)](https://travis-ci.org/henderea/everyday-cli-utils)
+[![Dependency Status](https://gemnasium.com/henderea/everyday-cli-utils.svg)](https://gemnasium.com/henderea/everyday-cli-utils)
+[![Code Climate](https://codeclimate.com/github/henderea/everyday-cli-utils/badges/gpa.svg)](https://codeclimate.com/github/henderea/everyday-cli-utils)
+[![Test Coverage](https://codeclimate.com/github/henderea/everyday-cli-utils/badges/coverage.svg)](https://codeclimate.com/github/henderea/everyday-cli-utils)
 
 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 methods, and a utility for using OptionParser with less code.
 
 Note: The curses utility has been moved to the `everyday-curses` gem
 
-## Issue Tracking
-Please use <https://everydayprogramminggenius.atlassian.net/browse/ECU> for issue tracking.
-
 ## Installation
 
 Add this line to your application's Gemfile:

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.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'rspec', '~> 3.3'
 end

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

@@ -23,6 +23,11 @@ module EverydayCliUtils
       block.call(options[val.to_i - 1])
     end
 
+    def self::ask_yn(question, &block)
+      resp = Readline.readline("#{question} (yes/no) ", true)
+      block.call(resp.downcase == 'yes' || resp.downcase == 'y')
+    end
+
     def self::hash_to_options(hash, extra = [])
       hash.keys + extra
     end

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

@@ -4,22 +4,24 @@ require 'yaml'
 
 module EverydayCliUtils
   class Option
-    def self.add_option(options, opts, names, opt_name, settings = {})
-      opts.on(*names) {
-        options[opt_name] = !settings[:toggle] || !options[opt_name]
-        yield if block_given?
-      }
-    end
+    class << self
+      def add_option(options, opts, names, opt_name, settings = {})
+        opts.on(*names) {
+          options[opt_name] = !settings[:toggle] || !options[opt_name]
+          yield if block_given?
+        }
+      end
 
-    def self.add_option_with_param(options, opts, names, opt_name, settings = {})
-      opts.on(*names, settings[:type] || String) { |param|
-        if settings[:append]
-          options[opt_name] << param
-        else
-          options[opt_name] = param
-        end
-        yield if block_given?
-      }
+      def add_option_with_param(options, opts, names, opt_name, settings = {})
+        opts.on(*names, settings[:type] || String) { |param|
+          if settings[:append]
+            options[opt_name] << param
+          else
+            options[opt_name] = param
+          end
+          yield if block_given?
+        }
+      end
     end
   end
 
@@ -46,54 +48,86 @@ module EverydayCliUtils
   end
 
   class OptionTypes
-    def self.def_type(type, default_value_block, value_determine_block, name_mod_block = nil, value_transform_block = nil)
-      @types       ||= {}
-      @types[type] = OptionType.new(default_value_block, value_determine_block, name_mod_block, value_transform_block)
-    end
-
-    def self.default_value(type, settings = {})
-      @types ||= {}
-      @types.has_key?(type) ? @types[type].default_value(settings) : nil
-    end
-
-    def self.updated_value(type, current_value, new_value, settings = {})
-      @types ||= {}
-      @types.has_key?(type) ? @types[type].updated_value(current_value, new_value, settings) : current_value
-    end
-
-    def self.mod_names(type, names, settings = {})
-      @types ||= {}
-      @types.has_key?(type) ? @types[type].mod_names(names, settings) : names
-    end
-
-    def_type(:option,
-             ->(_) {
-               false
-             },
-             ->(current_value, new_value, settings) {
-               new_value ? (!settings[:toggle] || !current_value) : current_value
-             },
-             ->(names, settings) {
-               settings.has_key?(:desc) ? (names + [settings[:desc]]) : names
-             },
-             ->(new_value, _) {
-               !(!new_value)
-             })
-    def_type(:option_with_param,
-             ->(settings) {
-               settings[:append] ? [] : nil
-             },
-             ->(current_value, new_value, settings) {
-               settings[:append] ? (current_value + new_value) : ((new_value.nil? || new_value == '') ? current_value : new_value)
-             },
-             ->(names, settings) {
-               names[0] << ' PARAM' unless names.any? { |v| v.include?(' ') }
-               names = settings.has_key?(:desc) ? (names + [settings[:desc]]) : names
-               settings.has_key?(:type) ? (names + [settings[:type]]) : names
-             },
-             ->(new_value, settings) {
-               new_value.is_a?(Array) ? (settings[:append] ? new_value : new_value[0]) : (settings[:append] ? [new_value] : new_value)
-             })
+    class << self
+      def def_type(type, default_value_block, value_determine_block, name_mod_block = nil, value_transform_block = nil)
+        @types       ||= {}
+        @types[type] = OptionType.new(default_value_block, value_determine_block, name_mod_block, value_transform_block)
+      end
+
+      def default_value(type, settings = {})
+        @types ||= {}
+        @types.has_key?(type) ? @types[type].default_value(settings) : nil
+      end
+
+      def updated_value(type, current_value, new_value, settings = {})
+        @types ||= {}
+        @types.has_key?(type) ? @types[type].updated_value(current_value, new_value, settings) : current_value
+      end
+
+      def mod_names(type, names, settings = {})
+        @types ||= {}
+        @types.has_key?(type) ? @types[type].mod_names(names, settings) : names
+      end
+
+      #region option procs
+      def option_default(_)
+        false
+      end
+
+      def option_value_determine(current_value, new_value, settings)
+        new_value ? (!settings[:toggle] || !current_value) : current_value
+      end
+
+      def option_name_mod(names, settings)
+        settings.has_key?(:desc) ? (names + [settings[:desc]]) : names
+      end
+
+      def option_value_transform(new_value, _)
+        !(!new_value)
+      end
+
+      #endregion
+
+      def def_option_type
+        def_type(:option,
+                 method(:option_default),
+                 method(:option_value_determine),
+                 method(:option_name_mod),
+                 method(:option_value_transform))
+      end
+
+      #region option_with_param procs
+      def param_option_default(settings)
+        settings[:append] ? [] : nil
+      end
+
+      def param_option_value_determine(current_value, new_value, settings)
+        settings[:append] ? (current_value + new_value) : ((new_value.nil? || new_value == '') ? current_value : new_value)
+      end
+
+      def param_option_name_mod(names, settings)
+        names[0] << ' PARAM' unless names.any? { |v| v.include?(' ') }
+        names = settings.has_key?(:desc) ? (names + [settings[:desc]]) : names
+        settings.has_key?(:type) ? (names + [settings[:type]]) : names
+      end
+
+      def param_option_value_transform(new_value, settings)
+        new_value.is_a?(Array) ? (settings[:append] ? new_value : new_value[0]) : (settings[:append] ? [new_value] : new_value)
+      end
+
+      #endregion
+
+      def def_option_with_param_type
+        def_type(:option_with_param,
+                 method(:param_option_default),
+                 method(:param_option_value_determine),
+                 method(:param_option_name_mod),
+                 method(:param_option_value_transform))
+      end
+    end
+
+    def_option_type
+    def_option_with_param_type
   end
 
   class OptionDef
@@ -128,15 +162,17 @@ module EverydayCliUtils
       value
     end
 
-    def self.register(opts, options, type, opt_name, names, settings = {}, default_settings = {}, &block)
-      settings          = EverydayCliUtils::MapUtil.extend_hash(default_settings, settings)
-      opt               = OptionDef.new(type, names.clone, settings, &block)
-      options[opt_name] = opt
-      names             = OptionTypes.mod_names(type, names, settings)
-      opts.on(*names) { |*args|
-        opt.update(args, :arg)
-        opt.run
-      }
+    class << self
+      def register(opts, options, type, opt_name, names, settings = {}, default_settings = {}, &block)
+        settings          = EverydayCliUtils::MapUtil.extend_hash(default_settings, settings)
+        opt               = OptionDef.new(type, names.clone, settings, &block)
+        options[opt_name] = opt
+        names             = OptionTypes.mod_names(type, names, settings)
+        opts.on(*names) { |*args|
+          opt.update(args, :arg)
+          opt.run
+        }
+      end
     end
   end
 
@@ -169,12 +205,14 @@ module EverydayCliUtils
       @pre_parse_block.call(self, options_list) unless @pre_parse_block.nil?
     end
 
-    def self.register(order, opts, options, opt_name, names, exit_on_action, print_on_exit_str, settings, default_settings, action_block, pre_parse_block = nil)
-      settings                          = EverydayCliUtils::MapUtil.extend_hash(default_settings, settings)
-      opt                               = SpecialOptionDef.new(order, exit_on_action, names, print_on_exit_str, settings, action_block, pre_parse_block)
-      options.special_options[opt_name] = opt
-      names << settings[:desc] if settings.has_key?(:desc)
-      opts.on(*names) { opt.state = true }
+    class << self
+      def register(order, opts, options, opt_name, names, exit_on_action, print_on_exit_str, settings, default_settings, action_block, pre_parse_block = nil)
+        settings                          = EverydayCliUtils::MapUtil.extend_hash(default_settings, settings)
+        opt                               = SpecialOptionDef.new(order, exit_on_action, names, print_on_exit_str, settings, action_block, pre_parse_block)
+        options.special_options[opt_name] = opt
+        names << settings[:desc] if settings.has_key?(:desc)
+        opts.on(*names) { opt.state = true }
+      end
     end
   end
 
@@ -219,11 +257,15 @@ module EverydayCliUtils
     end
 
     def run_special
-      @special_options.to_a.sort_by { |v| v[1].order }.each { |v| v[1].run(self) }
+      run_special_helper { |v| v[1].run(self) }
     end
 
     def run_special_pre_parse
-      @special_options.to_a.sort_by { |v| v[1].order }.each { |v| v[1].run_pre_parse(self) }
+      run_special_helper { |v| v[1].run_pre_parse(self) }
+    end
+
+    def run_special_helper(&block)
+      @special_options.to_a.sort_by { |v| v[1].order }.each(&block)
     end
 
     def composite(*layers)
@@ -263,15 +305,17 @@ module EverydayCliUtils
     def options_to_str(options, indent = 4)
       str          = ''
       max_name_len = @options.values.map { |v| v.names.join(', ').length }.max
-      options.each { |v|
-        opt       = @options[v[0]]
-        val       = v[1]
-        names_str = opt.names.join(', ')
-        str << "#{' ' * indent}#{names_str}#{' ' * ((max_name_len + 4) - names_str.length)}#{val_to_str(val)}\n"
-      }
+      options.each { |v| str << build_option_str(v, indent, max_name_len) }
       str
     end
 
+    def build_option_str(v, indent, max_name_len)
+      opt       = @options[v[0]]
+      val       = v[1]
+      names_str = opt.names.join(', ')
+      "#{' ' * indent}#{names_str}#{' ' * ((max_name_len + 4) - names_str.length)}#{val_to_str(val)}\n"
+    end
+
     def val_to_str(val)
       if val.nil?
         'nil'
@@ -301,45 +345,54 @@ module EverydayCliUtils
     end
 
     def defaults_option(file_path, names, settings = {})
-      @options             ||= OptionList.new
-      settings[:file_path] = File.expand_path(file_path)
-      @options.register_special(4, :defaults, names, !settings.has_key?(:exit_on_save) || settings[:exit_on_save], 'Defaults set', settings,
-          ->(opt, options) {
-            IO.write(opt.settings[:file_path], options.composite(:local, :arg).to_yaml)
-          }, ->(opt, options) {
-            unless opt.settings[:file_path].nil? || !File.exist?(opt.settings[:file_path])
-              options.update_all :local, YAML::load_file(opt.settings[:file_path])
-            end
-          })
+      defaults_options_helper(file_path, names, settings, 4, :defaults, 'Defaults set', :local)
     end
 
     def global_defaults_option(file_path, names, settings = {})
+      defaults_options_helper(file_path, names, settings, 3, :global_defaults, 'Global defaults set', :global)
+    end
+
+    def defaults_options_helper(file_path, names, settings, order, opt_name, print_on_exit_string, composite_name)
       @options             ||= OptionList.new
       settings[:file_path] = File.expand_path(file_path)
-      @options.register_special(3, :global_defaults, names, !settings.has_key?(:exit_on_save) || settings[:exit_on_save], 'Global defaults set', settings,
-          ->(opt, options) {
-            IO.write(opt.settings[:file_path], options.composite(:global, :arg).to_yaml)
-          }, ->(opt, options) {
-            unless opt.settings[:file_path].nil? || !File.exist?(opt.settings[:file_path])
-              options.update_all :global, YAML::load_file(opt.settings[:file_path])
-            end
-          })
+      @options.register_special(order, opt_name, names, key_absent_or_true(settings, :exit_on_save), print_on_exit_string, settings,
+                                write_defaults_proc(composite_name), read_defaults_proc(composite_name))
+    end
+
+    def write_defaults_proc(composite_name)
+      ->(opt, options) { IO.write(opt.settings[:file_path], options.composite(composite_name, :arg).to_yaml) }
+    end
+
+    def read_defaults_proc(composite_name)
+      ->(opt, options) {
+        file_path = opt.settings[:file_path]
+        options.update_all composite_name, YAML::load_file(file_path) unless file_path_nil_or_exists?(file_path)
+      }
+    end
+
+    def file_path_nil_or_exists?(file_path)
+      file_path.nil? || !File.exist?(file_path)
+    end
+
+    def key_absent_or_true(settings, key)
+      !settings.has_key?(key) || settings[key]
     end
 
     def show_defaults_option(names, settings = {})
-      @options ||= OptionList.new
-      @options.register_special(2, :show_defaults, names, !settings.has_key?(:exit_on_show) || settings[:exit_on_show], nil, settings,
-                                ->(_, options) {
-                                  puts options.show_defaults
-                                })
+      show_info_helper(names, settings, 2, :show_defaults, :exit_on_show) { |_, options|
+        puts options.show_defaults
+      }
     end
 
     def help_option(names, settings = {})
+      show_info_helper(names, settings, 1, :help, :exit_on_print) { |_, options|
+        puts options.help
+      }
+    end
+
+    def show_info_helper(names, settings, order, opt_name, exit_on_sym, &block)
       @options ||= OptionList.new
-      @options.register_special(1, :help, names, !settings.has_key?(:exit_on_print) || settings[:exit_on_print], nil, settings,
-                                ->(_, options) {
-                                  puts options.help
-                                })
+      @options.register_special(order, opt_name, names, key_absent_or_true(settings, exit_on_sym), nil, settings, block)
     end
 
     def default_settings(settings = {})

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

@@ -15,6 +15,21 @@ class MethodOverrides
   def get(obj)
     OverridesInstance.new(@overrides, obj)
   end
+
+  class << self
+    def register_override(s, s2, method_name, &block)
+      s.class_eval {
+        MethodOverrides.store_true_override(s, s2, method_name)
+        s.create_method(method_name.to_sym, &block)
+      }
+    end
+
+    def store_true_override(s, s2, method_name)
+      original_method   = s.instance_method(method_name.to_sym)
+      s2.true_overrides ||= MethodOverrides.new
+      s2.true_overrides.store_override(method_name.to_sym, original_method)
+    end
+  end
 end
 
 class OverridesInstance
@@ -29,18 +44,25 @@ class OverridesInstance
   end
 
   def call_override(method_symbol, *args, &block)
-    if @overrides.has_key?(method_symbol.to_sym)
-      overrides = @overrides[method_symbol.to_sym]
-      ind       = overrides.count + (@ind - 1)
-      ovin      = Thread.current["overrides_ind_#{@obj.__id__}"] || 0
-      ind       += ovin
-      Thread.current["overrides_ind_#{@obj.__id__}"] = @ind + ovin - 1
-      rv                                             = overrides[ind].bind(@obj).call(*args, &block)
-      Thread.current["overrides_ind_#{@obj.__id__}"] = ovin
-      rv
-    else
-      @obj.send(method_symbol.to_sym, *args, &block)
-    end
+    @overrides.has_key?(method_symbol.to_sym) ? -> {
+      overrides, ind, ovin = get_overrides_and_inds(method_symbol)
+      call_override_at_index(overrides, ind, ovin, args, &block)
+    }.call : @obj.send(method_symbol.to_sym, *args, &block)
+  end
+
+  def call_override_at_index(overrides, ind, ovin, args, &block)
+    Thread.current["overrides_ind_#{@obj.__id__}"] = @ind + ovin - 1
+    rv                                             = overrides[ind].bind(@obj).call(*args, &block)
+    Thread.current["overrides_ind_#{@obj.__id__}"] = ovin
+    rv
+  end
+
+  def get_overrides_and_inds(method_symbol)
+    overrides = @overrides[method_symbol.to_sym]
+    ind       = overrides.count + (@ind - 1)
+    ovin      = Thread.current["overrides_ind_#{@obj.__id__}"] || 0
+    ind       += ovin
+    return overrides, ind, ovin
   end
 
   def method_missing(symbol, *args, &block)
@@ -66,15 +88,10 @@ class Object
   end
 
   def override(method_name, &block)
-    s2 = self
-    class << self
+    s = class << self
       self
-    end.class_eval {
-      original_method     = instance_method(method_name.to_sym)
-      s2.true_overrides ||= MethodOverrides.new
-      s2.true_overrides.store_override(method_name.to_sym, original_method)
-      self.create_method(method_name.to_sym, &block)
-    }
+    end
+    MethodOverrides.register_override(s, self, method_name, &block)
   end
 
   class << self
@@ -91,12 +108,7 @@ class Object
     end
 
     def override(method_name, &block)
-      self.class_eval {
-        original_method     = instance_method(method_name.to_sym)
-        self.true_overrides ||= MethodOverrides.new
-        self.true_overrides.store_override(method_name.to_sym, original_method)
-        self.create_method(method_name.to_sym, &block)
-      }
+      MethodOverrides.register_override(self, self, method_name, &block)
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module EverydayCliUtils
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 end

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

@@ -70,21 +70,21 @@ describe 'maputil' do
   end
 
   it 'provides a means of cloning a hash' do
-    hash = { a: 1, b: 2, c: 3, d: 4, e: 5 }
+    hash   = { a: 1, b: 2, c: 3, d: 4, e: 5 }
     cloned = hash.clone
     expect(hash).to_not equal cloned
   end
 
   it 'provides a means of using map with a hash' do
-    hash = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 }
-    mapped = hash.hashmap { |v| v[1] + ((v[0] == :a || v[0] == :c || v[0] == :e) ? 1 : -1) }
-    expected = { a: 2, b: 1, c: 4, d: 3, e: 6, f: 5}
+    hash     = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 }
+    mapped   = hash.hashmap { |v| v[1] + ((v[0] == :a || v[0] == :c || v[0] == :e) ? 1 : -1) }
+    expected = { a: 2, b: 1, c: 4, d: 3, e: 6, f: 5 }
     expect(mapped).to eq expected
   end
 
   it 'provides a means of extending one hash with another' do
-    hash1 = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 }
-    hash2 = { a: 11, d: 14, f: 16 }
+    hash1    = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 }
+    hash2    = { a: 11, d: 14, f: 16 }
     extended = hash2.extend_hash(hash1)
     expected = { a: 11, b: 2, c: 3, d: 14, e: 5, f: 16 }
     expect(extended).to eq expected

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

@@ -191,7 +191,7 @@ describe EverydayCliUtils::OptionUtil do
     total        = { opt1: true, opt2: %w(hi bye), opt3: 'bye', opt4: [5, 4] }
     global_local = { opt1: false, opt2: %w(hi bye), opt3: 'bye', opt4: [5, 4] }
     local        = { opt1: true, opt2: %w(hi bye), opt3: 'bye', opt4: [4] }
-    local_arg        = { opt1: false, opt2: %w(hi bye), opt3: 'bye', opt4: [4] }
+    local_arg    = { opt1: false, opt2: %w(hi bye), opt3: 'bye', opt4: [4] }
     clean        = { opt1: false, opt2: [], opt3: nil, opt4: [] }
     clean2       = { opt1: true, opt2: [], opt3: nil, opt4: [] }
     opt          = Option1.new

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

@@ -11,7 +11,7 @@ end
 describe 'override' do
   it 'supports overriding methods' do
     arr = [1, 2, 3]
-    arr.override(:first) { "Boo! #{self.overrides.first}"}
+    arr.override(:first) { "Boo! #{self.overrides.first}" }
     expect(arr.first).to eq 'Boo! 1'
   end
 

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday-cli-utils
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 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
@@ -67,6 +67,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.ci
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A few CLI and general utils
@@ -121,3 +122,4 @@ test_files:
 - spec/everyday-cli-utils/option_spec.rb
 - spec/everyday-cli-utils/override_spec.rb
 - spec/spec_helper.rb
+has_rdoc: