plotty 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ee59e3e02d9e99451d65a0c0580e7fa29561d8f
-  data.tar.gz: 9926f065f4c1ae3f8efc8bfaf53ee245d4700af4
+SHA256:
+  metadata.gz: 016556c8fc016be7abc5fc5c5d61925aae7dbb33a82b9acd22213930e878ddcd
+  data.tar.gz: 7c205e096b7c9089550ebbcaa90925c7bf1dc90787571b62e444eb78d0534938
 SHA512:
-  metadata.gz: a531dc811cf328e24334a1faf577bb13dd41809d6677a8ac980f9d9fec31843f392064edabab399b9c1cd54060d2e787bf50d5b570e6146dcbb276649067934b
-  data.tar.gz: b148af4b818bb1cd3f10a88cb1f250a20d96af8aa5e4e83f2c00e47a1030c56dd10a32ec02872a522d4155b9cc65e6073e7ca61fd36d6dedf0073b1ecd499bbe
+  metadata.gz: e2724ee565736c9040114287f65185d242364d5d3381841043da1b0b186530567c79ecb7af3fcbec9b212f4232d88dd3043b4aac2d9a68dd963ff1c63682b9f6
+  data.tar.gz: 6ba6bd7a79bc85e4431be4bffb0ba2f49a6507677c91d349d82d074a3c128bd4c73ac6823876b54a5f07ec8903d864f6ca865aa428fd7ea7137911deb1ec43f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plotty (0.3.0)
+    plotty (0.4.0)
       samovar
       tty-screen
 
@@ -47,4 +47,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/README.md

@@ -110,7 +110,30 @@ plotty -x 1:1:100 -y '\d+' -e "set terminal dumb; set key outside" -- 'echo $x'
 
 ### Web Server Benchmark
 
-
+```
+                wrk -c $x -t $x -d 1 http://localhost:9292 *******              
+               wrk -c $x -t $x -d 1 http://localhost:9293 #######              
+  800 +--------------------------------------------------------------------+   
+      |           +          +           +          +           +          |   
+  700 |-+                         ################################       +-|   
+      |                       ####                                         |   
+  600 |-+                  ###                                           +-|   
+      |                ####                                                |   
+      |              ##                                                    |   
+  500 |-+          ##                                                    +-|   
+      |          ##                                                        |   
+  400 |-+       #                                                        +-|   
+      |       ##                                                           |   
+  300 |-+    #                                                           +-|   
+      |     #                                                              |   
+  200 |-+   #                                                            +-|   
+      |    #                                                               |   
+      |  ##*******************************************************         |   
+  100 |-#                                                                +-|   
+      |#          +          +           +          +           +          |   
+    0 +--------------------------------------------------------------------+   
+      0           50        100         150        200         250        300  
+```
 
 ## Contributing
 

data/lib/plotty.rb

@@ -1,3 +1,22 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 require_relative "plotty/version"
 require_relative "plotty/graph"

data/lib/plotty/graph.rb

@@ -55,22 +55,23 @@ module Plotty
 		end
 	end
 	
-	class Function
-		def initialize(pattern, command)
-			@pattern = Regexp.new(pattern)
-			@command = command
-		end
-		
-		def title
-			@command
+	Function = Struct.new(:pattern, :command, :title) do
+		def self.parse(pattern, command)
+			pattern = Regexp.new(pattern)
+			
+			if command =~ /^(\w+):(.*?)$/
+				self.new(pattern, $2, $1)
+			else
+				self.new(pattern, command, command)
+			end
 		end
 		
 		def call(value)
 			r, w = IO.pipe
 			
-			puts "Running #{@command} with x = #{value}..."
+			# puts "Running #{@command} with x = #{value}..."
 			
-			pid = Process.spawn({'x' => value.to_s}, @command, out: w, err: STDERR)
+			pid = Process.spawn({'x' => value.to_s}, self.command, out: w, err: STDERR)
 			
 			w.close
 			
@@ -78,10 +79,10 @@ module Plotty
 			
 			Process.waitpid pid
 			
-			if match = @pattern.match(buffer)
+			if match = self.pattern.match(buffer)
 				result = match[1] || match[0]
 				
-				puts "\tresult = #{result}"
+				# puts "\tresult = #{result}"
 				
 				return result
 			end
@@ -97,7 +98,7 @@ module Plotty
 		def self.parse(x, y, commands)
 			self.new(
 				Sequence.parse(x),
-				commands.collect{|command| Function.new(y, command)},
+				commands.collect{|command| Function.parse(y, command)},
 			)
 		end
 		
@@ -105,21 +106,54 @@ module Plotty
 			TTY::Screen.size.reverse
 		end
 		
-		def plot!(script = nil)
+		def generate_values
 			File.open("data.txt", "w") do |file|
+				file.sync = true
+				
 				@x.each do |x|
 					values = @y.collect do |function|
 						function.call(x)
 					end
 					
-					puts "#{x}: #{values.inspect}"
+					# puts "#{x}: #{values.inspect}"
 					file.puts "#{x} #{values.join(' ')}"
 				end
 			end
+		end
+		
+		def generate_plot(path = "plot.gp")
+			File.open(path, "w") do |file|
+				yield file if block_given?
+				
+				file.write("plot ")
+				first = true
+				@y.collect.with_index do |function, index|
+					if first
+						first = false
+					else
+						file.write ','
+					end
+					
+					file.write "'data.txt' using 1:#{index+2} with lines title #{function.title.dump}"
+				end
+				
+				file.puts
+				
+				# file.puts "pause 1"
+				# file.puts "reread"
+			end
 			
-			plots = @y.collect.with_index{|function, index| "'data.txt' using 1:#{index+2} with lines title #{function.title.dump}"}
+			return path
+		end
+		
+		def plot!(script = nil)
+			generate_values
+			
+			path = generate_plot do |file|
+				file.puts script if script
+			end
 			
-			system("gnuplot", "-e", "#{script}; plot #{plots.join(', ')}")
+			system("gnuplot", path)
 		end
 	end
 end

data/lib/plotty/version.rb

@@ -1,3 +1,23 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 module Plotty
-	VERSION = "0.3.0"
+	VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plotty
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Draw graphs from data gathered by executing commands