tins 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47e2a7320e764d140a7f3a96366c6d4317e8c3e
-  data.tar.gz: 439500131858c99b5b650bef1e3a0d7800a9d38b
+  metadata.gz: 8d95f5373263dfc49acdc7454b95d6478380b9c8
+  data.tar.gz: 373d5f71db24e78f3cc2a06cfb1bd118b1399e42
 SHA512:
-  metadata.gz: 06f40d2c367606b173325cdc1fedae2870781fc42a1a9ac8694f71c0217fed8ec0849b0167975cfed5f5a402cbc3aa40e685f4d23fd6788b88d21ed85e92ac75
-  data.tar.gz: a70916db92071ea8263548e558543b1451aa03289738a0b49fadb6662f7287312d96481a4f6e66c27dc06a938c1615628ec5b3643dd150be8140a6011eee7977
+  metadata.gz: d05d1f070f99951cc7a4307210804f5c72b7fc9209d4540c3604c87bdc076e3d2074ccd6c2ac0ee58034c8af05ed884ed918244dc8916231445365cca8c1e6d0
+  data.tar.gz: cc037cae1e42b6c8831fc785b95d371f2f68d2ed4b1686a09f7b6cdd4248ef5681f898d6889e0a6516db5132540dcd7a0b6eb1d6ed84ecf8f71bf69cf7051f4e

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
   - rbx-head
   - jruby-head

data/README.md

@@ -12,7 +12,10 @@ Non yet.
 
 ## Changes
 
-
+* 2016-04-12 Release 1.10.0
+  - Support mixed rest arguments in go argument parsing.
+* 2016-03-10 Release 1.9.0
+  - Add Tins::Duration for displaying durations.
 * 2016-01-18 Release 1.8.2
   - Implement Tins::StringVersion::Version#dup and
     Tins::StringVersion::Version#clone.

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.10.0

data/lib/tins/go.rb

@@ -6,6 +6,7 @@ module Tins
         @arguments.push argument
         self
       end
+      alias << push
 
       def each(&block)
         @arguments.each(&block)
@@ -29,38 +30,41 @@ module Tins
         t[a ? 1 : 0][o] = a ? nil : false
         t
       }
+      r = []
       while a = args.shift
-        a !~ /\A-(.+)/ and args.unshift a and break
-        p = $1
+        /\A-(?<p>.+)/ =~ a or (r << a; next)
         until p == ''
           o = p.slice!(0, 1)
           if v.key?(o)
-            if p == '' then
-              a = args.shift or break 1
+            if args.empty?
+              r << a
+              break 1
+            elsif p == ''
+              a = args.shift
             else
               a = p
             end
             if v[o].nil?
               a = a.dup
               a.extend EnumerableExtension
-              a.push a
+              a << a
               v[o] = a
             else
-              v[o].push a
+              v[o] << a
             end
             break
           elsif b.key?(o)
-            if b[o] == false
-              b[o]= 1
-            else
+            if b[o]
               b[o] += 1
+            else
+              b[o] = 1
             end
           else
-            args.unshift a
-            break 1
+            r << a
           end
-        end and break
+        end && break
       end
+      args.replace r
       b.merge(v)
     end
   end

data/lib/tins/version.rb

@@ -1,6 +1,6 @@
 module Tins
   # Tins version
-  VERSION         = '1.9.0'
+  VERSION         = '1.10.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

@@ -5,7 +5,6 @@ module Tins
   class GoTest < Test::Unit::TestCase
     include Tins::GO
 
-
     def test_empty_string
       r = go '', args = %w[a b c]
       assert_equal({}, r)
@@ -46,5 +45,12 @@ module Tins
       assert_equal %w[hello world], r['b'].to_a
       assert_equal %w[-c rest], args
     end
+
+    def test_mixed_rest
+      r = go 'ab:e:', args = %w[-b hello -c rest -aa -b world -d rest -e]
+      assert_equal({ 'a' => 2, 'b' => 'hello', 'e' => nil }, r)
+      assert_equal %w[hello world], r['b'].to_a
+      assert_equal %w[-c rest -d rest -e], args
+    end
   end
 end

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.9.0 ruby lib
+# stub: tins 1.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins"
-  s.version = "1.9.0"
+  s.version = "1.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2016-03-10"
+  s.date = "2016-04-12"
   s.description = "All the stuff that isn't good/big enough for a real library."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/dslkit.rb", "lib/dslkit/polite.rb", "lib/dslkit/rude.rb", "lib/spruz.rb", "lib/tins.rb", "lib/tins/alias.rb", "lib/tins/annotate.rb", "lib/tins/ask_and_send.rb", "lib/tins/attempt.rb", "lib/tins/bijection.rb", "lib/tins/case_predicate.rb", "lib/tins/complete.rb", "lib/tins/concern.rb", "lib/tins/count_by.rb", "lib/tins/date_dummy.rb", "lib/tins/date_time_dummy.rb", "lib/tins/deep_const_get.rb", "lib/tins/deep_dup.rb", "lib/tins/dslkit.rb", "lib/tins/duration.rb", "lib/tins/extract_last_argument_options.rb", "lib/tins/file_binary.rb", "lib/tins/find.rb", "lib/tins/generator.rb", "lib/tins/go.rb", "lib/tins/hash_symbolize_keys_recursive.rb", "lib/tins/hash_union.rb", "lib/tins/if_predicate.rb", "lib/tins/implement.rb", "lib/tins/limited.rb", "lib/tins/lines_file.rb", "lib/tins/memoize.rb", "lib/tins/method_description.rb", "lib/tins/minimize.rb", "lib/tins/module_group.rb", "lib/tins/named_set.rb", "lib/tins/null.rb", "lib/tins/once.rb", "lib/tins/p.rb", "lib/tins/partial_application.rb", "lib/tins/proc_compose.rb", "lib/tins/proc_prelude.rb", "lib/tins/range_plus.rb", "lib/tins/require_maybe.rb", "lib/tins/responding.rb", "lib/tins/secure_write.rb", "lib/tins/sexy_singleton.rb", "lib/tins/string_byte_order_mark.rb", "lib/tins/string_camelize.rb", "lib/tins/string_underscore.rb", "lib/tins/string_version.rb", "lib/tins/subhash.rb", "lib/tins/terminal.rb", "lib/tins/thread_local.rb", "lib/tins/time_dummy.rb", "lib/tins/to.rb", "lib/tins/to_proc.rb", "lib/tins/token.rb", "lib/tins/uniq_by.rb", "lib/tins/version.rb", "lib/tins/write.rb", "lib/tins/xt.rb", "lib/tins/xt/annotate.rb", "lib/tins/xt/ask_and_send.rb", "lib/tins/xt/attempt.rb", "lib/tins/xt/blank.rb", "lib/tins/xt/case_predicate.rb", "lib/tins/xt/complete.rb", "lib/tins/xt/concern.rb", "lib/tins/xt/count_by.rb", "lib/tins/xt/date_dummy.rb", "lib/tins/xt/date_time_dummy.rb", "lib/tins/xt/deep_const_get.rb", "lib/tins/xt/deep_dup.rb", "lib/tins/xt/dslkit.rb", "lib/tins/xt/extract_last_argument_options.rb", "lib/tins/xt/file_binary.rb", "lib/tins/xt/full.rb", "lib/tins/xt/hash_symbolize_keys_recursive.rb", "lib/tins/xt/hash_union.rb", "lib/tins/xt/if_predicate.rb", "lib/tins/xt/implement.rb", "lib/tins/xt/irb.rb", "lib/tins/xt/method_description.rb", "lib/tins/xt/named.rb", "lib/tins/xt/null.rb", "lib/tins/xt/p.rb", "lib/tins/xt/partial_application.rb", "lib/tins/xt/proc_compose.rb", "lib/tins/xt/proc_prelude.rb", "lib/tins/xt/range_plus.rb", "lib/tins/xt/require_maybe.rb", "lib/tins/xt/responding.rb", "lib/tins/xt/secure_write.rb", "lib/tins/xt/sexy_singleton.rb", "lib/tins/xt/string.rb", "lib/tins/xt/string_byte_order_mark.rb", "lib/tins/xt/string_camelize.rb", "lib/tins/xt/string_underscore.rb", "lib/tins/xt/string_version.rb", "lib/tins/xt/subhash.rb", "lib/tins/xt/time_dummy.rb", "lib/tins/xt/time_freezer.rb", "lib/tins/xt/to.rb", "lib/tins/xt/uniq_by.rb", "lib/tins/xt/write.rb"]
@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.3.1"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_development_dependency(%q<test-unit>, ["~> 3.1"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.3.1"])
+      s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_dependency(%q<test-unit>, ["~> 3.1"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.3.1"])
+    s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
     s.add_dependency(%q<test-unit>, ["~> 3.1"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement