tins 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c162dc3ce6ee0fe3d5cc14201c0ef65a9d0cebca7d9a30216f2d0749ed259acf
-  data.tar.gz: 77b5ff9739a7909fe05166e3a8ed251356992439f5d0089d1b600f56a1d8e90e
+  metadata.gz: 6ef6d2f0b36fcd36a9e2d04a93734e2344f34b3e7fbb7cf338e5d96c4a956b2f
+  data.tar.gz: 336a0db38796155a2561e55ac4c631730c179f1246045b1161cdd5a32e197c6a
 SHA512:
-  metadata.gz: edac0fbe5c2e439d67e0aa1bddb126f97f90c7184b3677c1d8e8cc9ef63bf1233ecf481698a9d70d677be2ef0ce9440a6c8daae68cd87eeb78237ee3d6b847f4
-  data.tar.gz: e215a79e72afbae06ed880c26de22c597483243c78fa7612479705348370da5c069ad93e3d4b0aff855ddf3fd65eb3811a5064e81f27f4c5d9d9f92ff59028e8
+  metadata.gz: 53f6a410165371cb96139274549b0dff25f33c538aca7e71adf62e36b2c7bd94bef7c4f321de7321faea9eb220deceac8479a0a1c02fe96a438c92691d22f215
+  data.tar.gz: 67c04f5f1c9804b574ef4af508cf2ae814da283a9bed1714413274d4ca91b8fe10f798672ec58813362f50bb13c3c4cf8aab9ad2726fae66def4a6048f33f8cf

data/README.md

@@ -12,7 +12,10 @@ Non yet.
 
 ## Changes
 
-* * 2018-11-07 Release 1.19.0
+
+* 2018-11-14 Release 1.20.0
+ - Support default arguments in Tins::GO#go method.
+* 2018-11-07 Release 1.19.0
  - Allow annotations without arguments
 * 2018-11-02 Release 1.18.0
  - `thread_local` and `thread_global` with default block

data/VERSION

@@ -1 +1 @@
-1.19.0
+1.20.0

data/lib/tins/go.rb

@@ -22,14 +22,35 @@ module Tins
     # 'xy:' an option '-x' without an option argument is searched, and an
     # option '-y foo' with an option argument ('foo').
     #
+    # The _defaults_ argument specifies default values for the options.
+    #
     # An option hash is returned with all found options set to true or the
     # found option argument.
-    def go(s, args = ARGV)
+    def go(s, args = ARGV, defaults: {})
+      d = defaults || {}
       b, v = s.scan(/(.)(:?)/).inject([ {}, {} ]) { |t, (o, a)|
         a = a == ':'
         t[a ? 1 : 0][o] = a ? nil : false
         t
       }
+      b.each_key do |k|
+        d.key?(k) or next
+        if [ 0, false, nil ].include?(d[k])
+          b[k] = false
+        elsif d[k].respond_to?(:to_int)
+          b[k] = d[k].to_int
+        else
+          b[k] = 1
+        end
+      end
+      v.each_key do |k|
+        d.key?(k) or next
+        if [ 0, false, nil ].include?(d[k])
+          v[k] = nil
+        else
+          v[k] = d[k].to_s
+        end
+      end
       r = []
       while a = args.shift
         /\A-(?<p>.+)/ =~ a or (r << a; next)
@@ -44,7 +65,7 @@ module Tins
             else
               a = p
             end
-            if v[o].nil?
+            if v[o].nil? || !(EnumerableExtension === v[o])
               a = a.dup
               a.extend EnumerableExtension
               a << a

data/lib/tins/version.rb

@@ -1,6 +1,6 @@
 module Tins
   # Tins version
-  VERSION         = '1.19.0'
+  VERSION         = '1.20.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/go_test.rb

@@ -58,5 +58,20 @@ module Tins
       assert_equal({ 'a' => 1, 'b' => 'hello', 'e' => nil }, r)
       assert_equal [], args
     end
+
+    def test_defaults
+      r = go('bv:', args = %w[ -v bar ], defaults: { ?b => true, ?v => 'foo' })
+      assert_equal({ ?b => 1, 'v' => 'bar' }, r)
+      assert_equal [], args
+      r = go('bv:', args = %w[ -b -v bar ], defaults: { ?b => 22, ?v => 'foo' })
+      assert_equal({ ?b => 23, 'v' => 'bar' }, r)
+      assert_equal [], args
+      r = go('bv:', args = %w[ -b ], defaults: { ?b => false, ?v => 'foo' })
+      assert_equal({ ?b => 1, 'v' => 'foo' }, r)
+      assert_equal [], args
+      r = go('bv:', args = %w[ ], defaults: { ?b => false, ?v => 'foo' })
+      assert_equal({ ?b => false, 'v' => 'foo' }, r)
+      assert_equal [], args
+    end
   end
 end

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.19.0 ruby lib
+# stub: tins 1.20.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins".freeze
-  s.version = "1.19.0"
+  s.version = "1.20.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2018-11-07"
+  s.date = "2018-11-14"
   s.description = "All the stuff that isn't good/big enough for a real library.".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.md".freeze, "lib/dslkit.rb".freeze, "lib/dslkit/polite.rb".freeze, "lib/dslkit/rude.rb".freeze, "lib/spruz.rb".freeze, "lib/tins.rb".freeze, "lib/tins/alias.rb".freeze, "lib/tins/annotate.rb".freeze, "lib/tins/ask_and_send.rb".freeze, "lib/tins/attempt.rb".freeze, "lib/tins/bijection.rb".freeze, "lib/tins/case_predicate.rb".freeze, "lib/tins/complete.rb".freeze, "lib/tins/concern.rb".freeze, "lib/tins/count_by.rb".freeze, "lib/tins/date_dummy.rb".freeze, "lib/tins/date_time_dummy.rb".freeze, "lib/tins/deep_const_get.rb".freeze, "lib/tins/deep_dup.rb".freeze, "lib/tins/dslkit.rb".freeze, "lib/tins/duration.rb".freeze, "lib/tins/expose.rb".freeze, "lib/tins/extract_last_argument_options.rb".freeze, "lib/tins/file_binary.rb".freeze, "lib/tins/find.rb".freeze, "lib/tins/generator.rb".freeze, "lib/tins/go.rb".freeze, "lib/tins/hash_symbolize_keys_recursive.rb".freeze, "lib/tins/hash_union.rb".freeze, "lib/tins/if_predicate.rb".freeze, "lib/tins/implement.rb".freeze, "lib/tins/limited.rb".freeze, "lib/tins/lines_file.rb".freeze, "lib/tins/memoize.rb".freeze, "lib/tins/method_description.rb".freeze, "lib/tins/minimize.rb".freeze, "lib/tins/module_group.rb".freeze, "lib/tins/named_set.rb".freeze, "lib/tins/null.rb".freeze, "lib/tins/once.rb".freeze, "lib/tins/p.rb".freeze, "lib/tins/partial_application.rb".freeze, "lib/tins/proc_compose.rb".freeze, "lib/tins/proc_prelude.rb".freeze, "lib/tins/range_plus.rb".freeze, "lib/tins/require_maybe.rb".freeze, "lib/tins/responding.rb".freeze, "lib/tins/secure_write.rb".freeze, "lib/tins/sexy_singleton.rb".freeze, "lib/tins/string_byte_order_mark.rb".freeze, "lib/tins/string_camelize.rb".freeze, "lib/tins/string_underscore.rb".freeze, "lib/tins/string_version.rb".freeze, "lib/tins/subhash.rb".freeze, "lib/tins/temp_io.rb".freeze, "lib/tins/temp_io_enum.rb".freeze, "lib/tins/terminal.rb".freeze, "lib/tins/thread_local.rb".freeze, "lib/tins/time_dummy.rb".freeze, "lib/tins/to.rb".freeze, "lib/tins/to_proc.rb".freeze, "lib/tins/token.rb".freeze, "lib/tins/uniq_by.rb".freeze, "lib/tins/unit.rb".freeze, "lib/tins/version.rb".freeze, "lib/tins/write.rb".freeze, "lib/tins/xt.rb".freeze, "lib/tins/xt/annotate.rb".freeze, "lib/tins/xt/ask_and_send.rb".freeze, "lib/tins/xt/attempt.rb".freeze, "lib/tins/xt/blank.rb".freeze, "lib/tins/xt/case_predicate.rb".freeze, "lib/tins/xt/complete.rb".freeze, "lib/tins/xt/concern.rb".freeze, "lib/tins/xt/count_by.rb".freeze, "lib/tins/xt/date_dummy.rb".freeze, "lib/tins/xt/date_time_dummy.rb".freeze, "lib/tins/xt/deep_const_get.rb".freeze, "lib/tins/xt/deep_dup.rb".freeze, "lib/tins/xt/dslkit.rb".freeze, "lib/tins/xt/expose.rb".freeze, "lib/tins/xt/extract_last_argument_options.rb".freeze, "lib/tins/xt/file_binary.rb".freeze, "lib/tins/xt/full.rb".freeze, "lib/tins/xt/hash_symbolize_keys_recursive.rb".freeze, "lib/tins/xt/hash_union.rb".freeze, "lib/tins/xt/if_predicate.rb".freeze, "lib/tins/xt/implement.rb".freeze, "lib/tins/xt/irb.rb".freeze, "lib/tins/xt/method_description.rb".freeze, "lib/tins/xt/named.rb".freeze, "lib/tins/xt/null.rb".freeze, "lib/tins/xt/p.rb".freeze, "lib/tins/xt/partial_application.rb".freeze, "lib/tins/xt/proc_compose.rb".freeze, "lib/tins/xt/proc_prelude.rb".freeze, "lib/tins/xt/range_plus.rb".freeze, "lib/tins/xt/require_maybe.rb".freeze, "lib/tins/xt/responding.rb".freeze, "lib/tins/xt/secure_write.rb".freeze, "lib/tins/xt/sexy_singleton.rb".freeze, "lib/tins/xt/string.rb".freeze, "lib/tins/xt/string_byte_order_mark.rb".freeze, "lib/tins/xt/string_camelize.rb".freeze, "lib/tins/xt/string_underscore.rb".freeze, "lib/tins/xt/string_version.rb".freeze, "lib/tins/xt/subhash.rb".freeze, "lib/tins/xt/temp_io.rb".freeze, "lib/tins/xt/time_dummy.rb".freeze, "lib/tins/xt/time_freezer.rb".freeze, "lib/tins/xt/to.rb".freeze, "lib/tins/xt/uniq_by.rb".freeze, "lib/tins/xt/write.rb".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar