drain 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dea94fa15923f71b70d9dc67df57c6ea196e0cd68e2b8bf68dca52af40b98cc
-  data.tar.gz: eef6894d11959d219f09bb3c6e9f8a81d04a1c35ff262ca61aca6fe16b44e0c9
+  metadata.gz: 8da4d9b373952c13931d7ed377565f1cd60297107413a4230f3cbdc2481af952
+  data.tar.gz: ba54f1c1946487b37916d0d6e0a14542d273f3dccd5f86109586cd275d8d2e32
 SHA512:
-  metadata.gz: 21cbef6b4255d768f7c4b827edb317432e8c82c19aedc26cd11055c25883f5d09e8f53dc726432b0c0736465ed78800da0e2369a6d87bede7318905c7993eddb
-  data.tar.gz: 8ca316496349c54e69ef811b6eb2f90326c254d8a95c8b380a45509240d2d50bd0d5dc1765abac63a64ebb127e802224fd2cf4c5481d1b2c6ffe7af8dcbda74a
+  metadata.gz: 97028489d945221d6aed71741954a1dec636d2961cf8fa6c22988fa447e8c5548d8450f3c8f0d5dd9d2f25d35ad0e54a7a1d485cf1af667e8f47a462afe86538
+  data.tar.gz: bbd72c1baaf24811cc950c7003ec9d5911dadd73ee38cce08d2c80191376f17066e3494ce7b3d63556219fb35af6f30a9a4cdf99d33d3a29302cf87c64d736ae

data/ChangeLog.md

@@ -1,3 +1,11 @@
+== Release v0.7.0 (2020-07-09) ==
+
+	* Update test for new uri.rb API
+	* uri.rb: Add alias
+	* DR::URI
+	* utils.rb: switch to amazing_print
+	* graph.rb: <<
+
 == Release v0.6.0 (2020-02-26) ==
 
 	* Add github actions for tests

data/lib/dr/base/graph.rb

@@ -213,6 +213,11 @@ module DR
 			end
 			self
 		end
+		
+		# alias << build
+		def <<(node, **opts)
+		  build(node, **opts)
+		end
 
 		def all
 			@nodes.sort

data/lib/dr/base/uri.rb

@@ -2,217 +2,232 @@ require "uri"
 require "delegate"
 
 module URI
-	# From https://github.com/packsaddle/ruby-uri-ssh_git
-	module Ssh
-		extend self
-		# @example
-		#		url = URI::SshGit.parse('git@github.com:packsaddle/ruby-uri-ssh_git.git')
-		#		#=> #<URI::SshGit::Generic git@github.com:packsaddle/ruby-uri-ssh_git.git>
-		#		url.scheme #=> nil
-		#		url.userinfo #=> 'git'
-		#		url.user #=> 'git'
-		#		url.password #=> nil
-		#		url.host #=> 'github.com'
-		#		url.port #=> nil
-		#		url.registry #=> nil
-		#		url.path #=> 'packsaddle/ruby-uri-ssh_git.git'
-		#		url.opaque #=> nil
-		#		url.query #=> nil
-		#		url.fragment #=> nil
-		# @see http://docs.ruby-lang.org/en/2.2.0/URI/Generic.html
-		# @param url [String] git repository url via ssh protocol
-		# @return [Generic] parsed object
-		protected def internal_parse(uri_string)
-			host_part, path_part = uri_string&.split(':', 2)
-			# There may be no user, so reverse the split to make sure host always
-			# is !nil if host_part was !nil.
-			host, userinfo = host_part&.split('@', 2)&.reverse
-			Generic.build(userinfo: userinfo, host: host || uri_string, path: path_part)
-		end
-
-		# @param url [String] git repository-ish url
-		# @return [URI::Generic] if url starts ssh
-		# @return [URI::HTTPS] if url starts https
-		# @return [URI::SshGit] if url is ssh+git e.g git@example.com:schacon/ticgit.git
-		def parse(url, force: false)
-			(ssh_git_url?(url) || force)? URI::Ssh.internal_parse(url) : URI.parse(url)
-		end
-
-		## From: https://github.com/packsaddle/ruby-git_clone_url
-		# @param url [String] git repository-ish url
-		# @return [Boolean] true if url is git via ssh protocol
-		def ssh_git_url?(url)
-			!generic_url?(url)
-		end
-
-		# @param url [String] git repository-ish url
-		# @return [Boolean] true if url is https, ssh protocol
-		def generic_url?(url)
-			match = %r{\A(\w*)://}.match(url)
-			!match.nil?
-		end
-
-		class Generic < ::URI::Generic
-			# check_host returns `false` for 'foo_bar'
-			# but in ssh config this can be a valid host
-			def check_host(_v)
-				return true
-			end
-			# @example
-			#		Generic.build(
-			#			userinfo: 'git',
-			#			host: 'github.com',
-			#			path: 'packsaddle/ruby-uri-ssh_git.git'
-			#		).to_ssh
-			#		#=> 'git@github.com:packsaddle/ruby-uri-ssh_git.git'
-			#
-			# @return [String] git repository url via ssh protocol
-			def to_ssh(show_path: true)
-				str = ''
-				str << "#{user}@" if user && !user.empty?
-				str << "#{host}"
-				str << ":#{path}" if path and show_path
-				str
-			end
-		end
-	end
+  # From https://github.com/packsaddle/ruby-uri-ssh_git
+  module Ssh
+    extend self
+    # @example
+    #   url = URI::Ssh.parse('git@github.com:packsaddle/ruby-uri-ssh_git.git')
+    #   #=> #<URI::Ssh::Generic git@github.com:packsaddle/ruby-uri-ssh_git.git>
+    #   url.scheme #=> nil
+    #   url.userinfo #=> 'git'
+    #   url.user #=> 'git'
+    #   url.password #=> nil
+    #   url.host #=> 'github.com'
+    #   url.port #=> nil
+    #   url.registry #=> nil
+    #   url.path #=> 'packsaddle/ruby-uri-ssh_git.git'
+    #   url.opaque #=> nil
+    #   url.query #=> nil
+    #   url.fragment #=> nil
+    # @see http://docs.ruby-lang.org/en/2.2.0/URI/Generic.html
+    # @param url [String] git repository url via ssh protocol
+    # @return [Generic] parsed object
+    protected def internal_parse(uri_string)
+      host_part, path_part = uri_string&.split(':', 2)
+      # There may be no user, so reverse the split to make sure host always
+      # is !nil if host_part was !nil.
+      host, userinfo = host_part&.split('@', 2)&.reverse
+      Generic.build(userinfo: userinfo, host: host || uri_string, path: path_part)
+    end
+
+    # @param url [String] git repository-ish url
+    # @return [URI::Generic] if url starts ssh
+    # @return [URI::HTTPS] if url starts https
+    # @return [URI::SshGit] if url is ssh+git e.g git@example.com:schacon/ticgit.git
+    def parse(url, force: false)
+      (ssh_git_url?(url) || force)? ::URI::Ssh.internal_parse(url) : ::URI.parse(url)
+    end
+
+    ## From: https://github.com/packsaddle/ruby-git_clone_url
+    # @param url [String] git repository-ish url
+    # @return [Boolean] true if url is git via ssh protocol
+    def ssh_git_url?(url)
+      !generic_url?(url)
+    end
+
+    # @param url [String] git repository-ish url
+    # @return [Boolean] true if url is https, ssh protocol
+    def generic_url?(url)
+      match = %r{\A(\w*)://}.match(url)
+      !match.nil?
+    end
+
+    class Generic < ::URI::Generic #URI::Ssh::Generic
+      # check_host returns `false` for 'foo_bar'
+      # but in ssh config this can be a valid host
+      def check_host(_v)
+        return true
+      end
+      # @example
+      #   URI::Ssh::Generic.build(
+      #     userinfo: 'git',
+      #     host: 'github.com',
+      #     path: 'packsaddle/ruby-uri-ssh_git.git'
+      #   ).to_ssh
+      #   #=> 'git@github.com:packsaddle/ruby-uri-ssh_git.git'
+      #
+      # @return [String] git repository url via ssh protocol
+      def to_ssh(show_path: true)
+        str = ''
+        str << "#{user}@" if user && !user.empty?
+        str << "#{host}"
+        str << ":#{path}" if path and show_path
+        str
+      end
+    end
+  end
 end
 
 module DR
-	module MailToHelper
-		 # TODO: wrap to= to add user= and host=
-	end
-
-	# reimplement deprecated escape and unescape methods since
-	# URI.encode_www_form_component does not encode the same way
-	# cf the source code of URI::DEFAULT_PARSER.escape
-	module URIEscape
-		extend self
-		def escape(*arg)
-			URI::DEFAULT_PARSER.escape(*arg)
-		end
-		def unescape(*arg)
-			URI::DEFAULT_PARSER.unescape(*arg)
-		end
-	end
-
-	module URIlikeWrapper
-		def to_h
-			h = { uri: uri }
-			components = uri.component
-			components += %i[user password] if components.include?(:userinfo)
-			components.each do |m|
-				v = uri.public_send(m)
-				v && h[m] = v
-			end
-			h
-		end
-
-		def to_json(_state = nil)
-			h=to_h
-			h[:uri]=h[:uri].to_s #h[:uri] is a URIWrapper, so convert it to string so json does not convert it again
-			h.to_json
-		end
-
-		def to_public
-			pub = dup
-			pub.password = nil
-			pub.to_s
-		end
-
-		# uri=u2.merge(uri) does not work if uri is absolute
-		def reverse_merge(u2)
-			# return self unless uri.scheme
-			u2 = u2.clone
-			u2 = self.class.new(u2) unless u2.is_a?(self.class)
-			if opaque.nil? == u2.opaque.nil?
-				u2.soft_merge(self)
-			else
-				self
-			end
-		end
-
-		# merge(u2) replace self by u2 if u2 is aboslute
-		# soft_merge looks at each u2 components
-		def soft_merge(u2)
-			# we want automatic unescaping of u2 components
-			u2 = self.class.new(u2) unless u2.is_a?(self.class)
-			# only merge if we are both opaque or path like
-			if opaque.nil? == u2.opaque.nil?
-				components = uri.component
-				if components.include?(:userinfo)
-					components += %i[user password]
-					components.delete(:userinfo)
-				end
-				components.each do |m|
-					# path returns "" by default but we don't want to merge in this case
-					if u2.respond_to?(m) && (v = u2.public_send(m)) && !((v == "") && (m == :path))
-						uri.public_send(:"#{m}=", v)
-					end
-				end
-			end
-			self
-		end
-	end
-
-	class URIWrapper < SimpleDelegator
-		def uri
-			 __getobj__
-		end
-
-		def uri=(uri)
-			__setobj__(transform_uri(uri))
-		end
-
-		include URIlikeWrapper
-
-		def self.parse(s)
-			new(URI.parse(s))
-		end
-
-		def self.get_uri_object(uri)
-			uri = self.parse(uri.to_s) unless uri.is_a?(URI)
-			uri
-		end
-
-		private def transform_uri(uri)
-			# wrap the components around escape/unescape
-			uri = self.class.get_uri_object(uri)
-			if uri.is_a?(URI)
-				components = uri.component
-				components += %i[user password] if components.include?(:userinfo)
-				components.each do |m|
-					uri.define_singleton_method(m) do
-						r = super()
-						r && r.is_a?(String) ? URIEscape.unescape(r) : r
-						# r && r.is_a?(String) ? ::URI.decode_www_form_component(r) : r
-					end
-					uri.define_singleton_method(:"#{m}=") do |v|
-						begin
-							super(v && v.is_a?(String) ? URIEscape.escape(v) : v)
-							# super(v && v.is_a?(String) ? ::URI.encode_www_form_component(v) : v)
-						rescue URI::InvalidURIError => e
-							warn "#{e} in (#{self}).#{m}=#{v}"
-							 # require 'pry'; binding.pry
-						end
-					end
-					uri.extend(MailToHelper) if uri.is_a?(URI::MailTo)
-				end
-			end
-			uri
-		end
-
-		# recall that '//user@server' is an uri while 'user@server' is just a path
-		def initialize(uri)
-			super
-			self.uri = uri
-		end
-
-		class Ssh < URIWrapper
-			def self.parse(s)
-				new(URI::Ssh.parse(s))
-			end
-		end
-	end
+  module URI
+    module MailToHelper
+       # TODO: wrap to= to add user= and host=
+    end
+
+    module URIHelpers
+      def to_h
+        h = { uri: uri }
+        components = uri.component
+        components += %i[user password] if components.include?(:userinfo)
+        components.each do |m|
+          v = uri.public_send(m)
+          v && h[m] = v
+        end
+        h
+      end
+
+      def to_json(_state = nil)
+        h=to_h
+        h[:uri]=h[:uri].to_s #h[:uri] is a URIWrapper, so convert it to string so json does not convert it again
+        h.to_json
+      end
+
+      # strip password
+      def to_public
+        pub = dup
+        pub.password = nil
+        pub.to_s
+      end
+
+      def strip_user
+        pub = dup
+        pub.user = nil
+        pub.to_s
+      end
+
+      # uri=u2.merge(uri) does not work if uri is absolute
+      def reverse_merge(u2)
+        # return self unless uri.scheme
+        u2 = u2.clone
+        u2 = self.class.new(u2) unless u2.is_a?(self.class)
+        if opaque.nil? == u2.opaque.nil?
+          u2.soft_merge(self)
+        else
+          self
+        end
+      end
+
+      # merge(u2) replace self by u2 if u2 is aboslute
+      # soft_merge looks at each u2 components
+      def soft_merge(u2)
+        # we want automatic unescaping of u2 components
+        u2 = self.class.new(u2) unless u2.is_a?(self.class)
+        # only merge if we are both opaque or path like
+        if opaque.nil? == u2.opaque.nil?
+          components = uri.component
+          if components.include?(:userinfo)
+            components += %i[user password]
+            components.delete(:userinfo)
+          end
+          components.each do |m|
+            # path returns "" by default but we don't want to merge in this case
+            if u2.respond_to?(m) && (v = u2.public_send(m)) && !((v == "") && (m == :path))
+              uri.public_send(:"#{m}=", v)
+            end
+          end
+        end
+        self
+      end
+    end
+
+    class Wrapper < SimpleDelegator
+      def uri
+         __getobj__
+      end
+
+      def uri=(uri)
+        __setobj__(transform_uri(uri))
+      end
+
+      include URIHelpers
+
+      def self.parse(s)
+        new(::URI.parse(s))
+      end
+
+      def self.get_uri_object(uri)
+        uri = self.parse(uri.to_s) unless uri.is_a?(::URI)
+        uri
+      end
+
+      private def transform_uri(uri)
+        # wrap the components around escape/unescape
+        uri = self.class.get_uri_object(uri)
+        if uri.is_a?(::URI::Generic)
+          uri.extend(URI::MailToHelper) if uri.is_a?(::URI::MailTo)
+          components = uri.component
+          components += %i[user password] if components.include?(:userinfo)
+          components.each do |m|
+            uri.define_singleton_method(m) do
+              r = super()
+              r && r.is_a?(String) ? URI.unescape(r) : r
+              # r && r.is_a?(String) ? ::URI.decode_www_form_component(r) : r
+            end
+            uri.define_singleton_method(:"#{m}=") do |v|
+              begin
+                super(v && v.is_a?(String) ? URI.escape(v) : v)
+                # super(v && v.is_a?(String) ? ::URI.encode_www_form_component(v) : v)
+              rescue ::URI::InvalidURIError => e
+                warn "#{e} in (#{self}).#{m}=#{v}"
+                 # require 'pry'; binding.pry
+              end
+            end
+          end
+        end
+        uri
+      end
+
+      # recall that '//user@server' is an uri while 'user@server' is just a path
+      def initialize(uri)
+        super
+        self.uri = uri
+      end
+    end
+
+    class Ssh < Wrapper
+      def self.parse(s)
+        new(::URI::Ssh.parse(s))
+      end
+    end
+
+    # reimplement deprecated escape and unescape methods since
+    # URI.encode_www_form_component does not encode the same way
+    # cf the source code of URI::DEFAULT_PARSER.escape
+    module URIEscape
+      extend self
+      def escape(*arg)
+        ::URI::DEFAULT_PARSER.escape(*arg)
+      end
+      def unescape(*arg)
+        ::URI::DEFAULT_PARSER.unescape(*arg)
+      end
+    end
+    Escape=URIEscape
+    extend URIEscape
+
+    def self.parse(s)
+      Wrapper.parse(s)
+    end
+  end
 
 end

data/lib/dr/base/utils.rb

@@ -1,28 +1,32 @@
 module DR
 	module Utils
 		extend self
-		def pretty_print(string, format: nil, pretty: nil)
+		def pretty_print(string, format: nil, pretty: nil, **kw)
 			case format.to_s
 			when "json"
 				require 'json'
-				return pretty_print(string.to_json, pretty: pretty)
+				return pretty_print(string.to_json, pretty: pretty, **kw)
 			when "yaml"
 				require "yaml"
-				return pretty_print(string.to_yaml, pretty: pretty)
+				return pretty_print(string.to_yaml, pretty: pretty, **kw)
 			end
 			pretty = "color" if pretty == nil or pretty == true #default
 			case pretty.to_s
-			when "ap"
+			when "ap", "awesome_print", "amazing_print"
 				begin
-					require 'ap'
-					ap string
+					require 'amazing_print'
+					ap(string, **kw)
 				rescue LoadError,NameError
-					pretty_print(string,pretty: :pp)
+					pretty_print(string,pretty: :pp_color, **kw)
 				end
 			when "color", "pp_color"
 				begin
 					require 'pry'
-					Pry::ColorPrinter.pp string
+			    if kw[:multiline] == false #simulate no multiline
+					  Pry::ColorPrinter.pp string, $DEFAULT_OUTPUT, 9999
+			    else
+					  Pry::ColorPrinter.pp string
+					end
 				rescue LoadError,NameError
 					pretty_print(string,pretty: :pp)
 				end

data/lib/dr/version.rb

@@ -1,4 +1,4 @@
 module DR
   # drain version
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/test/test_uri.rb

@@ -1,9 +1,9 @@
 require 'helper'
 require 'dr/base/uri'
 
-describe DR::URIWrapper do
+describe DR::URI::Wrapper do
 	before do
-		@uri=DR::URIWrapper.new(DR::URIEscape.escape("http://ploum:secret@plam:443/foo bar"))
+		@uri=DR::URI::Wrapper.new(DR::URI::Escape.escape("http://ploum:secret@plam:443/foo bar"))
 	end
 	it "Wraps an uri element" do
 		_(@uri.scheme).must_equal "http"
@@ -29,7 +29,7 @@ describe DR::URIWrapper do
 		_(@uri.soft_merge("foo://plim@").to_s).must_equal("foo://plim:secret@plam:443/foo%20bar")
 	end
 	it "Can be reverse merged" do
-		_(DR::URIWrapper.parse("//user@server").reverse_merge(@uri).to_s).must_equal("http://user:secret@server:443/foo%20bar")
+		_(DR::URI::Wrapper.parse("//user@server").reverse_merge(@uri).to_s).must_equal("http://user:secret@server:443/foo%20bar")
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drain
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Damien Robert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -77,6 +77,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".bundle/config"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
@@ -113,7 +114,6 @@ files:
 - lib/dr/tools/gtk.rb
 - lib/dr/version.rb
 - lib/drain.rb
-- lib/drain/version.rb
 - test/helper.rb
 - test/test_converter.rb
 - test/test_core_ext.rb
@@ -130,7 +130,7 @@ licenses:
 - MIT
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Use a drain for a dryer ruby!
 test_files: []

data/lib/drain/version.rb

@@ -1,4 +0,0 @@
-module Drain
-  # drain version
-  VERSION = "0.1.0"
-end