rio 0.5.1 → 0.6.0

data/lib/rio/tempdir.rb

@@ -29,8 +29,6 @@ it apart in tempdir.rb.
 =end
 require 'tmpdir'
 
-
-
 module AutoRemoval #:nodoc: all
   MAX_TRY = 10
   @@cleanlist = []

data/lib/rio/to_rio.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/to_rio/all.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/to_rio/array.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/to_rio/io.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/to_rio/object.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/to_rio/string.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/undef_rake_dsl.rb

@@ -0,0 +1,3 @@
+Rake::DeprecatedObjectDSL.private_instance_methods.each do |method_name|
+  Object.send(:undef_method, method_name)
+end if defined?(Rake::DeprecatedObjectDSL)

data/lib/rio/uri/file.rb

@@ -20,7 +20,6 @@ module URI
   #
   class FILE < Generic
     include REGEXP
-    #DEFAULT_PORT = 80
 
     COMPONENT = [
       :scheme, 
@@ -78,7 +77,7 @@ module URI
         if @registry || @opaque
           raise InvalidURIError, 
                 "can not set host with registry or opaque"
-          #      elsif v != '' and @parser.regexp[:HOST] !~ v
+        #      elsif v != '' and @parser.regexp[:HOST] !~ v
         elsif v != '' and HOST !~ v
           raise InvalidComponentError,
                 "bad component(expected host component): #{v}"
@@ -114,22 +113,6 @@ module URI
       self.host = '' if self.host.nil?
     end
 
-    #
-    # == Description
-    #
-    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
-    #
-    # If the URI contains a query, the full path is URI#path + '?' + URI#query.
-    # Otherwise, the path is simply URI#path.
-    #
-#     def request_uri
-#       r = path_query
-#       if r[0] != ?/
-#         r = '/' + r
-#       end
-
-#       r
-#     end
   end
 
   @@schemes['FILE'] = FILE

data/lib/rio/uriref.rb

@@ -8,8 +8,6 @@ module RIO
     def initialize(u,b=nil)
       @ref = u
       @base = b
-      #p "URIRef#initialize u=#{u} (#{u.class}),b=#{b} (#{b.class})"
-      #puts caller[0,6]
       raise ArgumentError, "Either uri(#{u}) or base(#{b.inspect}) must be absolute" unless
         @ref.absolute? or @base.absolute?
     end
@@ -66,14 +64,12 @@ module RIO
 
     def self.path_str_to_uri(pth,opts={})
       cr_args = opts[:encoding] ? {:encoding => opts[:encoding]} : {} 
-      #p cr_args
       case
       when pth.start_with?("//")
         ::Alt::URI.create(cr_args.merge(:netpath => pth))
       when (pth.start_with?("/") or (pth =~ %r{^[a-zA-Z]:}))
         ::Alt::URI.create(cr_args.merge(:path => pth))
       when pth =~ %r{^[a-zA-Z][a-zA-Z]+:}
-        #pth = "/" + pth if pth =~ /^[a-zA-Z]:/
         ::Alt::URI.parse(pth,opts)
       else
         ::Alt::URI.create(cr_args.merge(:path => pth))
@@ -86,7 +82,6 @@ module RIO
       when (pth.start_with?("/") or (pth =~ %r{^[a-zA-Z]:}))
         ::Alt::URI.create(:scheme => 'file', :authority => "", :path => pth)
       when (pth =~ %r{^[a-zA-Z0-9-][a-zA-Z0-9-]+:})
-        #pth = "/" + pth if pth =~ /^[a-zA-Z]:/
         ::Alt::URI.parse(pth)
       else
         raise ArgumentError, "Base(#{pth.inspect}) must be absolute"
@@ -100,7 +95,6 @@ module RIO
       end
     end
     def rel(b=nil)
-      # p "uriref (#{self}).rel(#{b.inspect})"
       if b.nil?
        self.class.build(ref.rel(base),:base => base)
       else
@@ -108,12 +102,9 @@ module RIO
       end
     end
     def route_from(b)
-      # p "uriref (#{self}).route_from(#{b.inspect})"
-      #self.class.build(abs.ref,b).rel
       self.class.build(abs.ref.route_from(b.ref),:base => b)
     end
     def route_to(b)
-      #self.class.build(b,abs.ref).rel
       self.class.build(self.abs.ref.route_to(b.ref),:base => self.ref)
     end
     def join(*args)
@@ -121,15 +112,7 @@ module RIO
       self
     end
     def to_s() ref.to_s end
-    #extend Forwardable
-    #extend Fwd
-    #fwd :ref, :scheme, :authority, :path, :query, :fragment
-    #fwd :ref, :host, :port, :userinfo, :user, :password
-    #fwd :ref, :typecode
-    #def_delegators :ref, :to_s, :normalize, :absolute?, :len gth
-    #fwd :ref, :dirname,:basename,:filename,:extname
-    #fwd :ref, :netpath,:fspath
-    #fwd :ref, :ext
+
     def method_missing(sym,*args,&block)
       ref.__send__(sym,*args,&block)
     end

data/lib/rio/util.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.

data/lib/rio/version.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -27,7 +27,7 @@
 module RIO
   # :stopdoc:
   module Version #:nodoc: all
-    VERSION = '0.5.1'
+    VERSION = '0.6.0'
 
     N = VERSION.split('.').freeze
     MAJOR = N[0].freeze

data/misc/update-copyright.rb

@@ -1,7 +1,7 @@
 require 'rio'
 
-old_cr = 'Copyright (c) 2005,2006,2007,2008,2009,2010 Christopher Kleckner'
-new_cr = 'Copyright (c) 2005-2012 Christopher Kleckner'
+old_cr = 'Copyright (c) 2005-2012 Christopher Kleckner'
+new_cr = 'Copyright (c) 2005-2017 Christopher Kleckner'
 
 old_cr_re = Regexp.new(Regexp.escape(old_cr))
 

data/rio.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |gem|
                        '--main' << 'README'
   gem.rubyforge_project = 'rio'
 
-  gem.required_ruby_version = '>= 1.9.1'
+  gem.required_ruby_version = '>= 2.3.1'
+  gem.licenses = ['GPL-2.0']
 
-  gem.add_dependency "test-unit"
-  gem.add_dependency "rdoc"
 end

data/test/env.sh

@@ -1,4 +1,3 @@
-alias ruby19='/loc/r19/cyg/bin/ruby'
-export RUBYLIB=/loc/work/rio/lib
+export RUBYLIB=`pwd`/lib
 
 

data/test/http/tc/copy_from_http.rb

@@ -33,7 +33,6 @@ module RIO::HTTP::UnitTest
         urio = rio(url)
         ario < urio
         exp = urio.contents
-        puts HWFILE.abs
         assert_equal(exp,ario.contents)
         assert_equal(rio(HWFILE).contents,rio('outf').contents)
       end

data/test/runhttp.rb

@@ -1,9 +1,10 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 Dir.chdir File.dirname(__FILE__)
 $:.unshift File.expand_path('../lib/')
 $:.unshift File.expand_path('../test/')
 
 require 'rio'
+p "[#{RUBY_PLATFORM}] - Ruby(#{RUBY_VERSION}) - Rio(#{RIO::VERSION})"
 require 'lib/temp_server'
 require 'pp'
 

data/test/runtests.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -KU
+#!/usr/bin/env ruby
 # encoding: UTF-8
 Dir.chdir File.dirname(__FILE__)
 $devlib=File.expand_path('../lib/')
@@ -6,8 +6,6 @@ $:.unshift $devlib unless $:[0] == $devlib
 $testlib=File.expand_path('../test/')
 $:.unshift $testlib unless $:[0] == $testlib
 
-
-
 require 'platform'
 
 require 'rio'
@@ -56,6 +54,7 @@ def run(options)
   
   options.keys.each do |opt|
     case opt
+
     when :std
       require 'tc/all'
       require 'alturi/tests'
@@ -63,11 +62,14 @@ def run(options)
       find_tests(ms)
       ms.add(:URI,Alt)
       ms.add(:URIRef)
+
     when :http
       require 'http/tests'
+      require 'lib/temp_server'
       ms.add(:HTTP)
-      #require 'lib/temp_server.rb'
-      #TempServer.new.run('runhttptests.rb')
+      runtestpath = File.expand_path('runhttptests.rb')
+      TempServer.run(runtestpath)
+
     when :ftp
       require 'ftp/tests'
       ms.add(:FTP)

data/test/tc/copyarray.rb

@@ -127,7 +127,7 @@ class TC_copyarray < Test::Unit::TestCase
     out = rio('out').delete!
     assert!(out.exist?)
     out < rio(@d[1]).lines[1]
-    assert_equal([@l[0][1],@l[1][1]],out[])
+    assert_equal([@l[0][1],@l[1][1]].sort,out[].sort)
 
     out = rio('out').delete!
     assert!(out.exist?)
@@ -146,7 +146,7 @@ class TC_copyarray < Test::Unit::TestCase
     out = rio('out').delete!.touch
     assert(out.exist?)
     out < rio(@d[1]).lines[1]
-    assert_equal([@l[0][1],@l[1][1]],out[])
+    assert_equal([@l[0][1],@l[1][1]].sort,out[].sort)
 
     out = rio('out').delete!.touch
     assert(out.exist?)
@@ -168,7 +168,7 @@ class TC_copyarray < Test::Unit::TestCase
     out < @f
     $trace_states = false
     assert(out.directory?)
-    assert_equal(smap(@f.map { |el| el.rel(@d[0]) }),smap(out.map { |el| el.rel(out) }))
+    assert_equal(smap(@f.map { |el| el.rel(@d[0]) }).sort,smap(out.map { |el| el.rel(out) }).sort)
     assert_equal(@l[0],rio(out,@f[0].filename).to_a)
     assert_equal(@l[1],rio(out,@f[1].filename).to_a)
     #assert_equal(@l[0]+@l[1],out[])
@@ -179,6 +179,6 @@ class TC_copyarray < Test::Unit::TestCase
     out < @d[0].files.lines
     assert(out.file?)
     assert(out.closed?)
-    assert_equal(@l[0]+@l[1],out[])
+    assert_equal((@l[0]+@l[1]).sort,out[].sort)
   end
 end

data/test/tc/copydir.rb

@@ -122,7 +122,7 @@ class TC_copydir < Test::RIO::TestCase
     dst = rio('files_a_fi').delete!.touch
     dst < @d0.files[]
     exp = %w[f0 f1].inject([]) { |lines,f| lines + rio(@d0,f).readlines }
-    assert_equal(exp,dst.readlines)
+    assert_equal(exp.sort,dst.readlines.sort)
   end
   def test_files_a_nonex
     dst = rio('files_a_nonex').delete!

metadata

@@ -1,48 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rio
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Christopher Kleckner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2017-05-09 00:00:00.000000000 Z
+dependencies: []
 description: Rio is a Ruby class wrapping much of the functionality of IO, File, Dir,
   Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
 email:
@@ -52,7 +19,7 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README
@@ -236,6 +203,7 @@ files:
 - lib/rio/to_rio/io.rb
 - lib/rio/to_rio/object.rb
 - lib/rio/to_rio/string.rb
+- lib/rio/undef_rake_dsl.rb
 - lib/rio/uri/file.rb
 - lib/rio/uriref.rb
 - lib/rio/util.rb
@@ -412,32 +380,32 @@ files:
 - test/uriref/tc/route.rb
 - test/uriref/tests.rb
 homepage: http://rio4ruby.com
-licenses: []
+licenses:
+- GPL-2.0
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Rio
-- --main
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rio
-rubygems_version: 1.8.24
+rubygems_version: 2.6.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rio - Ruby I/O Facilitator
 test_files:
 - test/alturi/tc/create.rb