drain 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c577f08df5d0dd378a335824250d97008d3eb24896d101ecc1ed51a2281a1f0
-  data.tar.gz: f35b4fd99afb4870ddb44991b776ef8e5621739d7d83d7ba4d9ae851b2713df1
+  metadata.gz: 8da4d9b373952c13931d7ed377565f1cd60297107413a4230f3cbdc2481af952
+  data.tar.gz: ba54f1c1946487b37916d0d6e0a14542d273f3dccd5f86109586cd275d8d2e32
 SHA512:
-  metadata.gz: a889f20d3499a98ddc6da50f8cc14201881cf695271b250730ebc26024e657f2af2f7764f5e078979029559dd1dea3745a60a9df9c40ae8d5fc64f7903948a1e
-  data.tar.gz: 1a95a1661230282f9339258e1b6a241bd4fe2e503fbb9f43ea20c220e220a093903356cd8e78fd36e62899189b919a5a4ee50a3261951fdfde1bceebb91cbae1
+  metadata.gz: 97028489d945221d6aed71741954a1dec636d2961cf8fa6c22988fa447e8c5548d8450f3c8f0d5dd9d2f25d35ad0e54a7a1d485cf1af667e8f47a462afe86538
+  data.tar.gz: bbd72c1baaf24811cc950c7003ec9d5911dadd73ee38cce08d2c80191376f17066e3494ce7b3d63556219fb35af6f30a9a4cdf99d33d3a29302cf87c64d736ae

data/.github/workflows/ruby.yml

@@ -0,0 +1,25 @@
+name: Ruby
+
+on: [push]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+        ruby: [ 2.3, 2.4, 2.5, 2.6, 2.7, jruby, truffleruby ]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: 'Git checkout'
+      uses: actions/checkout@v2
+    - name: 'Setup ruby'
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: 'Install bundler and gems'
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+    - name: "Run tests"
+      run: |
+        bundle exec rake test

data/.travis.yml

@@ -1,9 +1,13 @@
 ---
 language: ruby
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
+  - 2.7.0
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
+  - 2.3.8 #eol, but still used in debian
+  #- 2.2.10
+  #- 2.1.10
   #- ruby-head
   #- ruby-head-clang
 script: rake test

data/ChangeLog.md

@@ -1,4 +1,161 @@
-### 0.1.0 / 2015-02-24
+== Release v0.7.0 (2020-07-09) ==
 
-* Initial release:
+	* 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
+	* Add github action for tests
+	* Bump travis versions
+	* Fix ruby 2.7 warning
+	* graph.rb: add merge! and merge
+	* test: fix minitest warnings
+	* gemspec: add chronic and chronic_duration
+
+== Release v0.5.1 (2020-02-18) ==
+
+	* DR::URI -> DR::URIEscape
+
+== Release v0.5 (2020-02-18) ==
+
+	* Bump version
+	* DR::URI.escape
+	* Fixes for ruby 2.7
+	* URI.encode is obsolete
+
+== Release v0.4 (2019-09-13) ==
+
+	* Bump version
+	* Delegator.access_methods
+	* delegate: add missing require
+	* Delegator.delegate_h
+	* Fix a bug in deep_merge
+	* Utils: pretty = true means color by default
+	* Utils: PPHelper and pretty_print colors
+	* time_parse: do not load active_support/time
+	* Fix test failures
+	* Update Rakefile
+	* Update Rakefile
+	* Comments
+	* graph: to_s and inspect
+	* Doc: add warning
+
+== Release v0.3.0 (2018-09-07) ==
+
+	* Bump version
+	* test_date_parse.rb: set TZ to GMT to get test working on travis
+	* Update travis
+	* Utils.rsplit
+	* Formatter: clean ups
+	* simple_formatter: ability to expand messages
+	* Fix test
+	* Ad formatter/simple_formatter
+	* simple_keywords: strip by default + can now change delims
+	* simple_keywords: switch from a Module to a Class
+	* parse/simple_keywords
+	* URI: rename to_s to to_ssh
+	* URI::Ssh.parse: handle empty string
+	* SSH Uri: allow non standard hosts
+	* Hash#has_keys: bug fix
+	* URIWrapper::Ssh
+	* Hash#has_keys?
+	* Hash#add_to_key: configure behavior via keywords
+	* Hash#add_to_key, Hash#set_key
+	* Hash#deep_merge: configure how to merge arrays
+	* Hash#add_key
+	* Hash: add_key, dig_with_default
+	* bool.rb: allow to keep Strings/Symbols
+	* slice_with_default
+	* simple_parser: more parsing methods
+	* bool: bug fixes
+	* Copyright
+	* Hash#reverse_merge
+	* Graph#dump: be more flexible to how we dump
+	* Graph: allow to merge with a Hash
+	* to_caml_case and to_snake_case
+	* pretty_print: preserve options
+	* base: uri
+
+== Release v0.2.0 (2018-02-01) ==
+
+	* Bump version
+	* Update tests
+	* utils: pretty_print
+	* eruby: add Eruby.process_eruby
+	* Eruby: indent Context the same way as other modules
+	* Move git.rb to git_helpers
+	* fix somg bug in refinements usage
+	* tests + more comments
+	* graph: Add Graph.build
+	* eruby: comments about a possible ruby bug fix in 2.4.1
+	* graph: allow to merge graphs
+	* graph: bug fixes
+	* Eruby: automatically wrap into unbound_instance if a block is passed
+	* eruby: streamline implementation and bug fixes
+	* eruby: more template possibilities
+	* eruby.rb: start adding features from Tilt
+	* Eruby: be uniform accross erubi/erubis/erb
+	* Clean up comments
+	* test_drain: test for Drain::VERSION
+	* Add drain.rb which calls dr.rb
+	* travis: test agains ruby HEAD
+	* Update drain.gemspec
+	* Configure travis and streamline rake and test files
+	* simple_parser: renders globalopts fully customisable
+	* I don't need bundler for travis
+	* travis
+	* gitignore
+	* Try to do a minimal example for ruby's segfault
+	* descendants/ancestors: propagate ourselves
+	* Correct a bug in graph.rb
+	* parse_string: allows to customize the splitting characters
+	* Remove Hash#set_keyed_value!
+	* Hash#set_keyed_value
+	* Copyright
+	* simple_parser: document the splitting order
+	* simple_parser: add tests
+	* Add missing require
+	* graph: allow ancestors and descendants on a node
+	* Deprecation warning
+	* Copyright
+	* tests + comments
+	* Still more tests for core_ext.rb
+	* Still more tests
+	* More tests
+	* Test Hash#deep_merge
+	* Add tests
+	* Useless use of slef
+	* Converter: test on recursive object
+	* git: get config
+	* Add Hash#leafs
+	* Add to_h to graph
+	* graph construction now accepts a lambda
+	* Add hash conversion ton graph.rb
+	* Add converter.rb (converts an object to an hash) and tests
+	* graph: add .compact in to_nodes
+	* graph: method to updat node attributes
+	* graph: show attributes
+	* Graph: improved unneeded, and bug fix in unneeded_descendants
+	* Graph#connected: bug fix
+	* Graph: check that children are of the same type
+	* Refinements: fix syntax errors
+	* unneeded_descendants(ancestors) is bigger than ancestors(unneeded_descendants)
+	* graph: bug fixes
+	* Use dr rather than drain for brevity
+	* Graph.rb
+	* Git: add a submodules command
+	* Graph#build_node
+	* Rework Graph#build
+	* Test includes_extends_host_with
+	* Split core_ext into two files
+
+== Release v0.1.0 (2015-02-24) ==
+
+	* Description
+	* Add library files
+	* Initial commit.
 

data/Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :development do
+group :extra_devel do
+  gem 'minitest-reporters', '~> 1.4'
+  gem 'yard', '~> 0.9'
   gem 'kramdown'
+  gem 'rubygems-tasks', '~> 0.2'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 2015–2018 Damien Robert
+Copyright © 2015–2020 Damien Robert
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,9 +3,10 @@
 * [Homepage](https://github.com/DamienRobert/drain#readme)
 * [Issues](https://github.com/DamienRobert/drain/issues)
 * [Documentation](http://rubydoc.info/gems/drain)
-* [Email](mailto:Damien.Olivier.Robert+gems at gmail.com)
+* [Email](mailto:Damien.Olivier.Robert+gems@gmail.com)
 
 [![Gem Version](https://img.shields.io/gem/v/drain.svg)](https://rubygems.org/gems/drain)
+[![Ruby test result](https://github.com/DamienRobert/drain/workflows/Ruby/badge.svg)](https://github.com/DamienRobert/drain/actions?query=workflow%3ARuby)
 [![Build Status](https://travis-ci.org/DamienRobert/drain.svg?branch=master)](https://travis-ci.org/DamienRobert/drain)
 
 ## Description
@@ -17,15 +18,25 @@ The Api is far from stable yet, so use at your own risk!
 
   For now the API is experimental and some parts are not ready to use!
 
+## Examples
+
+    ~~~ ruby
+    require 'drain'
+    ~~~
+
+## Requirements
+
 ## Install
 
+    ~~~ sh
     $ gem install drain
+    ~~~
 
 ## Copyright
 
-Copyright © 2015–2018 Damien Robert
+Copyright © 2015–2020 Damien Robert
 
-MIT License. See [LICENSE.txt](./LICENSE.txt) for details.
+MIT License. See [`LICENSE.txt`](LICENSE.txt) for details.
 
 Some of the code is inspired by other project, in general I give proper
 acknowledgement in the corresponding file.

data/Rakefile

@@ -1,15 +1,11 @@
+## Uncomment to use `rake` directly rather than `bundle exec rake`
+#begin
+#  require 'bundler/setup'
+#rescue LoadError => e
+#  warn "Could not setup bundler: #{e.message}"
+#end
 require 'rake'
 
-begin
-  require 'rubygems/tasks'
-  Gem::Tasks.new(sign: {checksum: true, pgp: true}, 
-    scm: {status: true}) do |tasks|
-  tasks.console.command = 'pry'
-end
-rescue LoadError => e
-  warn e.message
-end
-
 require 'rake/testtask'
 Rake::TestTask.new do |test|
   test.libs << 'test'
@@ -25,5 +21,14 @@ rescue LoadError => e
     warn e.message
   end
 end
+desc 'Generate docs'
 task :doc => :yard
 
+begin
+  require 'dr/rake_gems'
+  Gem::MyTasks.new
+rescue LoadError => e
+  warn e.message
+end
+
+task :default => :test

data/drain.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |gem|
     end
   end
   gem.files = glob[gemspec['files']] if gemspec['files']
+  gem.files = gem.files + gemspec['extra_files'] if gemspec['extra_files']
 
   gem.executables = gemspec.fetch('executables') do
     glob['bin/*'].map { |path| File.basename(path) }

data/gemspec.yml

@@ -9,6 +9,6 @@ homepage: https://github.com/DamienRobert/drain#readme
 
 development_dependencies:
   minitest: "~> 5.0"
-  rake: "~> 10"
-  rubygems-tasks: "~> 0.2"
-  yard: "~> 0.8"
+  rake: ">= 10"
+  chronic: "~> 0.10"
+  chronic_duration: "~> 0.10"

data/lib/dr/base/delegate.rb

@@ -0,0 +1,28 @@
+module DR
+	module Delegator
+		extend self
+		def delegate_h(klass, var)
+			require 'forwardable'
+			# put in a Module so that they are easier to distinguish from the
+			# 'real' functions
+			m=Module.new do
+				extend(Forwardable)
+				methods=[:[], :[]=, :any?, :assoc, :clear, :compact, :compact!, :delete, :delete_if, :dig, :each, :each_key, :each_pair, :each_value, :empty?, :fetch, :fetch_values, :has_key?, :has_value?, :include?, :index, :invert, :keep_if, :key, :key?, :keys, :length, :member?, :merge, :merge!, :rassoc, :reject, :reject!, :select, :select!, :shift, :size, :slice, :store, :to_a, :to_h, :to_s, :transform_keys, :transform_keys!, :transform_values, :transform_values!, :update, :value?, :values, :values_at]
+				include(Enumerable)
+				def_delegators var, *methods
+			end
+			klass.include(m)
+		end
+
+		def access_methods(klass, var, *methods)
+			methods.each do |k|
+				klass.define_method k do
+					instance_variable_get(var)[k]
+				end
+				klass.defined_method :"#{k}=" do |*args|
+					instance_variable_get(var).send(:[]=, k, *args)
+				end
+			end
+		end
+	end
+end

data/lib/dr/base/graph.rb

@@ -7,7 +7,7 @@ module DR
 		attr_reader :graph
 		attr_accessor :name, :attributes, :parents, :children
 		def initialize(name, attributes: {}, graph: nil)
-			@name = name.to_s
+			@name = name
 			@children = []
 			@parents = []
 			@attributes = attributes
@@ -78,7 +78,7 @@ module DR
 
 		STEP = 4
 		def to_s(show_attr: true)
-			@name + (show_attr && ! attributes.empty? ? " #{attributes}" : "")
+			@name.to_s + (show_attr && ! attributes.empty? ? " #{attributes}" : "")
 		end
 		def inspect
 			"#{self.class}: #{to_s(show_attr: true)}"+(graph.nil? ? "" : " (#{graph})")
@@ -107,10 +107,12 @@ module DR
 	class Graph
 		attr_accessor :nodes
 		include Enumerable
+		# note: passing a graph won't work
 		def initialize(*nodes, attributes: {}, infos: nil)
 			@nodes=[]
 			# a node can be a Hash or a Node
-			build(*nodes, attributes: {}, infos: infos)
+			# so nodes really is a list of subgraphs
+			build(*nodes, attributes: attributes, infos: infos)
 		end
 		def each(&b)
 			@nodes.each(&b)
@@ -123,6 +125,10 @@ module DR
 		def to_a
 			return @nodes
 		end
+		def names
+			@nodes.map(&:name)
+		end
+
 		def to_hash(methods: [:children,:parents,:attributes], compact: true, recursive: true)
 			require 'dr/base/converter'
 			Converter.to_hash(@nodes, methods: methods, recursive: recursive, compact: compact)
@@ -142,7 +148,7 @@ module DR
 			h=to_hash(methods: [:children])
 			Hash[h.map {|k,v| [k.name, v.map(&:name)]}]
 		end
-		alias to_children to_h
+		#alias to_children to_h
 
 		def to_children
 			require 'dr/base/converter'
@@ -150,8 +156,11 @@ module DR
 		end
 
 		def inspect
-			"#{self.class}: #{map {|x| x.to_s}}"
+			"#{self.class}: #{map {|x| x.to_s(show_attr: false)}}"
 		end
+		# def to_s
+		# 	"#{self.class}: #{map {|x| x.to_s(show_attr: false)}}"
+		# end
 
 		#construct a node (without edges)
 		def new_node(node,**attributes)
@@ -204,6 +213,11 @@ module DR
 			end
 			self
 		end
+		
+		# alias << build
+		def <<(node, **opts)
+		  build(node, **opts)
+		end
 
 		def all
 			@nodes.sort
@@ -216,14 +230,17 @@ module DR
 		end
 
 		# allow a hash too
-		def |(graph)
-			graph=Graph.new(graph) unless Graph===graph
+		def merge!(graph)
+			graph=Graph.new(graph, **{}) unless Graph===graph
 			build(*graph.all, recursive: false)
 		end
-		def +(graph)
+		def merge(graph)
 			clone.|(graph)
 		end
 
+		alias | merge!
+		alias + merge
+
 		def dump(mode: :graph, nodes_list: :roots, show_attr: true, out: [], **_opts)
 			n=case nodes_list
 				when :roots; roots
@@ -368,7 +385,7 @@ module DR
 				while !new_nodes.empty?
 					g2=yield(*new_nodes)
 					g2=Graph.new(g2) unless g2.is_a?(Graph)
-					g|g2
+					g.merge!(g2)
 					nodes=nodes.concat(new_nodes)
 					new_nodesg.nodes.map(&:name)-nodes
 				end