graphviz 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26ed6f42266187f65af641382518c0d00e2eabd8
-  data.tar.gz: 3ac7a918a5f7da7288fec080a712b572eddecfbb
+  metadata.gz: 19495d84180ba9ab615643343f701ce704013006
+  data.tar.gz: 329c2911542140bca2019879729fdf7c0bf14db1
 SHA512:
-  metadata.gz: 23e5b1deba81bd053beb0dab4c03450b16324df909999233d5a344f8e205682d412f1d27c3c80a81693b0dbbdadcaae3eb463dda72f7eb9b1d6f16b235420602
-  data.tar.gz: 82088298acc5dd68c759a1ae87ed5c40a15d7b863da5e643e9d402d94c2ffa465dc124608bb058e69570c492c9a9fcd985c3a9d6943a6973325f29e1b04063a6
+  metadata.gz: 73b47d36224242eaa821e4041576804190c87e2b71c4482548eef2de5d854b4993c4e03286ccc584183646588341c70c79b60580bc2369fe5d46c222cb28303c
+  data.tar.gz: a469a380a39736e1b4c33eb214758c13d3339563a4d9c22152f1d5a9762a43a30e0bcf34f6eaffe1581d7e999e4b925a2664ae435a9613b7777ae8942d060ff1

data/.rspec

@@ -1,5 +1,3 @@
---color
 --format documentation
---backtrace
 --require spec_helper
 --warnings

data/Gemfile

@@ -5,5 +5,9 @@ gemspec
 
 group :development do
 	gem "guard-rspec"
-	gem "simplecov"
+end
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
 end

data/Guardfile

@@ -6,7 +6,7 @@ clearing :on
 ENV['COVERAGE'] = 'y'
 
 guard :rspec, cmd: "bundle exec rspec" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }
-  watch("spec/spec_helper.rb") { "spec" }
+	watch(%r{^spec/.+_spec\.rb$})
+	watch(%r{^lib/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }
+	watch("spec/spec_helper.rb") { "spec" }
 end

data/README.md

@@ -3,7 +3,6 @@
 Graphviz is a graph visualisation system. This gem is a lightweight interface for generating graphs with Graphviz.
 
 [![Build Status](https://travis-ci.org/ioquatix/graphviz.svg)](https://travis-ci.org/ioquatix/graphviz)
-[![Code Climate](https://codeclimate.com/github/ioquatix/graphviz.svg)](https://codeclimate.com/github/ioquatix/graphviz)
 [![Coverage Status](https://coveralls.io/repos/ioquatix/graphviz/badge.svg)](https://coveralls.io/r/ioquatix/graphviz)
 
 ## Installation

data/graphviz.gemspec

@@ -1,7 +1,5 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'graphviz/version'
+
+require_relative 'lib/graphviz/version'
 
 Gem::Specification.new do |spec|
 	spec.name          = "graphviz"
@@ -12,7 +10,7 @@ Gem::Specification.new do |spec|
 		Graphviz is a graph visualisation system. This gem is a lightweight interface for generating graphs with Graphviz.
 	EOF
 	spec.summary       = "A lightweight interface for generating graphs with Graphviz."
-	spec.homepage      = ""
+	spec.homepage      = "https://github.com/ioquatix/graphviz"
 	spec.license       = "MIT"
 
 	spec.files         = `git ls-files`.split($/)
@@ -22,8 +20,10 @@ Gem::Specification.new do |spec|
 
 	spec.has_rdoc = 'yard'
 
+	spec.add_dependency 'process-pipeline'
+
 	spec.add_development_dependency "yard"
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "rspec", "~> 3.4.0"
+	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
 end

data/lib/graphviz.rb

@@ -21,51 +21,40 @@
 require_relative "graphviz/version"
 require_relative "graphviz/graph"
 
+require 'process/pipeline'
+
 module Graphviz
-	# Signals that the process exited with a non-zero status.
-	class OutputError < StandardError
-	end
-	
 	# Outputs the graph using the +dot+ executable.
 	# @return [String] any data generated by the command unless an output path is specified.
 	#
-	# @option options [String] :output_format ('pdf') The output format (e.g. pdf).
+	# @option options [String] :format ('pdf') The output format (e.g. pdf).
 	# @option options [String] :path The output path, if not specified data is returned.
 	# @option options [String] :dot ('dot') The +dot+ executable to use.
-	def self.output(graph, options = {})
-		text = graph.to_dot
-		
-		output_format = options[:format]
+	def self.output(graph, path: nil, format: 'pdf', dot: 'dot')
+		output_format = format
 		
-		if options[:path]
+		if path
 			# Grab the output format from the file name:
-			if options[:path] =~ /\.(.*?)$/
+			if path =~ /\.(.*?)$/
 				output_format ||= $1
 			end
-			
-			output_file = File.open(options[:path], "w")
-		else
-			output_file = IO.pipe
 		end
 		
 		output, input = IO.pipe
-		pid = Process.spawn(options[:dot] || "dot", "-T#{output_format}", :out => output_file, :in => output)
-		
-		output.close
+		pipeline = Process::Pipeline.(dot, "-T#{output_format}")
 		
-		# Send graph data to process:
-		input.write(text)
-		input.close
-		
-		_, status = Process.wait2(pid)
-		
-		if status != 0
-			raise OutputError.new("dot exited with status #{status}")
-		end
+		writer = Thread.new do
+			graph.dump_graph(input)
 			
-		# Did we use a local pipe for output?
-		if Array === output_file
-			return task.output.read
+			input.close
+		end
+		
+		if path
+			pipeline.write(path, input: output)
+		else
+			return pipeline.read(input: output)
 		end
+	ensure
+		writer.join
 	end
 end

data/lib/graphviz/graph.rb

@@ -68,10 +68,10 @@ module Graphviz
 		end
 		
 		# @return [String] Output the graph using the dot format.
-		def to_dot(options = {})
+		def to_dot(**options)
 			buffer = StringIO.new
 			
-			dump_graph(buffer, "", options)
+			dump_graph(buffer, **options)
 			
 			return buffer.string
 		end
@@ -92,7 +92,7 @@ module Graphviz
 			end
 		end
 		
-		def dump_edges(buffer, indent, options)
+		def dump_edges(buffer, indent, **options)
 			@edges.each do |edge|
 				edge_attributes_text = dump_attributes(edge.attributes)
 				
@@ -101,7 +101,7 @@ module Graphviz
 		end
 		
 		# Dump the entire graph and all subgraphs to dot text format.
-		def dump_graph(buffer, indent, options)
+		def dump_graph(buffer, indent = "", **options)
 			format = graph_format(options)
 			
 			buffer.puts "#{indent}#{format} #{dump_value(self.identifier)} {"

data/lib/graphviz/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Graphviz
-	VERSION = "0.4.0"
+	VERSION = "1.0.0"
 end

data/spec/graphviz/graph_spec.rb

@@ -44,5 +44,11 @@ digraph "G" {
 			
 			expect(File.exist? "test.pdf").to be true
 		end
+
+		it 'should raise an error the executable is installed' do
+			expect do
+				Graphviz.output(subject, :dot => 'foobarbaz')
+			end.to raise_error(Errno::ENOENT, 'No such file or directory - foobarbaz')
+		end
 	end
 end

data/spec/spec_helper.rb

@@ -19,6 +19,8 @@ end
 require "bundler/setup"
 require "graphviz"
 
+Thread.abort_on_exception = true
+
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure
 	config.example_status_persistence_file_path = ".rspec_status"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: graphviz
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: process-pipeline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +105,7 @@ files:
 - spec/graphviz/edge_spec.rb
 - spec/graphviz/graph_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/ioquatix/graphviz
 licenses:
 - MIT
 metadata: {}
@@ -111,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A lightweight interface for generating graphs with Graphviz.
@@ -119,4 +133,3 @@ test_files:
 - spec/graphviz/edge_spec.rb
 - spec/graphviz/graph_spec.rb
 - spec/spec_helper.rb
-has_rdoc: yard