vv 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 052ef19db592bebd51a14310cc4eea838dbd10645f43c05f15cb774292222990
-  data.tar.gz: 2e23028b168d6cb104a0b631c9b80bcb11696120854fbd603126bc962aa380f9
+  metadata.gz: 51e268d782cc4e4615a19f9bef609d810465b50bf74fa7161d9cb1ed02fa3caf
+  data.tar.gz: 3f2ce5fac2641daf1b82d38df2b0e682aec543bf14a8f485c1976acb5bc9a0ca
 SHA512:
-  metadata.gz: a62626e31c21dbe0c5fd426681c2b0007cb4f0a0e844e77a0f1bf5faa9c49edcc7b2da9a4d2e6650220982f95708d3563ffa68090e2371233f6b66f4db780aa9
-  data.tar.gz: 998917dbf37b9900ef500517674d42fad1c64cacbd4aab294a13c29c5c795cbda0926cd0efd0106969287a58fa3fe0f5398e2980e83e39e7786120d54e871f9d
+  metadata.gz: 85bab86083aa0ff67da2ba25e85fab3a8fb2edc7f430e477bdf2bacee7f95f4aa959eabb0cae117d8af0073e507fa446f8da4b121f3d27170c8fe0fb390c9cc7
+  data.tar.gz: 923ae7cbe0ff1166a5653597e58b18ec38bf42cd2ce0f6644553c1f27598d13670c7fce0b5a5008cf7053590756a5d39900e4fcef5ed2525e18d2719dc9008ae

data/lib/vv/array_methods.rb

@@ -3,6 +3,7 @@ module VV
 
     def self.included(base)
       base.extend(ClassMethods)
+      base.include(VV::SetMethods::SetAndArrayMethods)
       base.attr_accessor :cli_print_separator
     end
 
@@ -14,42 +15,6 @@ module VV
 
     end
 
-    def gravify
-      self.collect do |elem|
-        "`#{elem}`"
-      end
-    end
-
-    def gravify!
-      self.collect! do |elem|
-        "`#{elem}`"
-      end
-    end
-
-    def includes_any?(other)
-      raise TypeError, "Expecting array" unless other.is_a? Array
-      uother = other.uniq
-      uself  = self.uniq
-      (uself + uother).uniq.size < (uself.size + uother.size)
-    end
-
-    def include_any?(other)
-      self.includes_any?(other)
-    end
-
-    def stringify_collection grave: false
-      return self.gravify.stringify_collection if grave
-
-      return String.empty_string if self.blank?
-      return self.first          if self.size == 1
-      return self.join " and "   if self.size == 2
-
-      new_collection = self[0..-3]
-      back_fragment  = self[-2..-1].join ", and "
-      new_collection << back_fragment
-      new_collection.join ", "
-    end
-
     def spaced
       self.join(" ")
     end

data/lib/vv/cli.rb

@@ -6,10 +6,12 @@ module VV
                 :settings,
                 :cache_path,
                 :config_path,
-                :data_path
+                :data_path,
+                :verbosity
 
     def initialize version: nil,
                    name: nil,
+                   argv: nil,
                    config_path: nil,
                    cache_path:  nil,
                    data_path:   nil
@@ -28,6 +30,11 @@ module VV
       @settings = nil
 
       self.set_default_paths
+
+      # Most of the time we want to just initialize the
+      # thing fully, but it's helpful to test and debug if
+      # we're not forced to.
+      self.parse_flags argv unless argv.nil?
     end
 
     def set_default_paths
@@ -47,6 +54,38 @@ module VV
     def parse_flags argv
       argv = argv.split " " if argv.is_a? String
       @settings = @option_router.parse argv
+      set_verbosity
+    end
+
+    def set_normal_verbosity
+      @verbosity = :normal
+    end
+
+    def set_verbosity
+      verbosity_flags = %w[ -v -vv -vvv -q -s ]
+      flag_set = @settings.keys.includes_any? verbosity_flags
+      return self.set_normal_verbosity unless flag_set
+
+      @settings.keys.includes_one! verbosity_flags
+
+      flag = (@settings.keys & verbosity_flags).first
+
+
+      index = verbosity_flags.index(flag)
+      @verbosity = %i[ verbose
+                       very_verbose
+                       very_very_verbose
+                       quiet
+                       absolute_silence ][index]
+    end
+
+    def help?
+      return false if @settings.nil?
+      @settings["-h"]
+    end
+
+    def print_help width: 80
+      option_router.help_doc.cli_print width: width
     end
 
   end
@@ -112,7 +151,7 @@ module VV
       "Duplicate command line flag #{@flag} encountered."
 
       @flag = lookup_canonical_flag @flag
-      fail message if @response.include? @flag
+      fail message if @parsed_arguments.include? @flag
 
       self.set_flag
     end
@@ -129,13 +168,13 @@ module VV
       value   = @value
       value &&= @value.to_d if decimal?
       value ||= true
-      @response[@flag] = value
+      @parsed_arguments[@flag] = value
     end
 
     # This needs a refactor.
     def parse argv
       @flags_cease = false
-      @response = {}
+      @parsed_arguments = {}
 
       argv.each do |arg|
         next add_input_arg arg if @flags_cease
@@ -155,7 +194,9 @@ module VV
         self.cease_flag_consideration
       end
 
-      @response
+      @flag = @value = @current_flag = nil
+
+      @parsed_arguments
     end
 
     def end_of_commands
@@ -250,8 +291,8 @@ module VV
       collection = \
       @flag_settings[@flag][:type] == :collection
       if collection
-        @response[@flag] ||= []
-        @response[@flag] << @value
+        @parsed_arguments[@flag] ||= []
+        @parsed_arguments[@flag] << @value
       else
         @current_flag = nil
         self.set_flag
@@ -260,8 +301,8 @@ module VV
     end
 
     def add_input_arg arg
-      @response[:input_arguments] ||= []
-      @response[:input_arguments] << arg
+      @parsed_arguments[:input_arguments] ||= []
+      @parsed_arguments[:input_arguments] << arg
     end
 
     def standardize_value

data/lib/vv/file_methods.rb

@@ -160,6 +160,7 @@ module VV
       end
       alias_method :xdg_config_home, :config_home
 
+      # Where application specific files should be stored
       def data_home
         path   = ENV['XDG_DATA_HOME']
         return path unless path.blank?

data/lib/vv/gem_methods.rb

@@ -9,6 +9,7 @@ module Gem
     Gem.find_files(glob).each do |filepath|
       start = dirname.size + 1
       ruby_require_path = filepath[start..-1]
+
       if block_given?
         yield ruby_require_path
       else

data/lib/vv/set_methods.rb

@@ -0,0 +1,88 @@
+module VV
+
+  module SetMethods
+
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.include(SetAndArrayMethods)
+    end
+
+    module ClassMethods
+
+      def vv_included?
+        true
+      end
+
+    end
+
+    module SetAndArrayMethods
+
+      def gravify
+        self.collect do |elem|
+          "`#{elem}`"
+        end
+      end
+
+      def gravify!
+        self.collect! do |elem|
+          "`#{elem}`"
+        end
+      end
+
+      def includes! other
+        return if self.include? other
+        fail "Collection does not include `#{other}`."
+      end
+      alias_method :include!, :includes!
+
+      def includes_one?(other)
+        ok_type   = other.is_a? Array
+        ok_type ||= other.is_a? Set
+
+        fail TypeError, "Expecting array" unless ok_type
+
+        ( self & other ).one?
+      end
+      alias_method :include_one?, :includes_one?
+
+      def includes_one!(other)
+        return true if includes_one? other
+        message = "Collections did not share exactly one element."
+        fail message
+      end
+      alias_method :include_one!, :includes_one!
+
+      def includes_any?(other)
+        ok_type   = other.is_a? Array
+        ok_type ||= other.is_a? Set
+
+        fail TypeError, "Expecting array" unless ok_type
+        ( self & other ).any?
+      end
+      alias_method :include_any?, :includes_any?
+
+      def includes_any! other
+        return true if includes_any? other
+        message = "Collections did not share exactly any elements."
+        fail message
+      end
+      alias_method :include_any!, :includes_any!
+
+      def stringify_collection grave: false
+        return self.gravify.stringify_collection if grave
+
+        return String.empty_string if self.blank?
+        return self.first          if self.size == 1
+        return self.join " and "   if self.size == 2
+
+        new_collection = self[0..-3]
+        back_fragment  = self[-2..-1].join ", and "
+        new_collection << back_fragment
+        new_collection.join ", "
+      end
+
+    end
+
+  end
+
+end

data/lib/vv/version.rb

@@ -1,3 +1,3 @@
 module VV
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/vv.rb

@@ -5,6 +5,7 @@ require 'bigdecimal/util'
 require 'fileutils'
 
 require_relative "vv/gem_methods"
+require_relative "vv/set_methods"
 
 Gem.require_files "vv/*.rb"
 Gem.require_files "vv/style/*.rb"
@@ -26,6 +27,10 @@ class Hash
   include VV::HashMethods
 end
 
+class Set
+  include VV::SetMethods
+end
+
 class Array
   include VV::ArrayMethods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vv
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Zach Aysan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,6 +73,7 @@ files:
 - lib/vv/object_methods.rb
 - lib/vv/random_methods.rb
 - lib/vv/readline_methods.rb
+- lib/vv/set_methods.rb
 - lib/vv/string_methods.rb
 - lib/vv/style/bold.rb
 - lib/vv/style/color.rb