plotty 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016556c8fc016be7abc5fc5c5d61925aae7dbb33a82b9acd22213930e878ddcd
-  data.tar.gz: 7c205e096b7c9089550ebbcaa90925c7bf1dc90787571b62e444eb78d0534938
+  metadata.gz: 803c07230307be6c48e3404effbc1cde3e2e2b616545e241b7c8f813a7fc9fdc
+  data.tar.gz: 1ccae425bc6678012a9106297b2a38f6e8461388a9f09f5fa91cf2cf1c27ee2c
 SHA512:
-  metadata.gz: e2724ee565736c9040114287f65185d242364d5d3381841043da1b0b186530567c79ecb7af3fcbec9b212f4232d88dd3043b4aac2d9a68dd963ff1c63682b9f6
-  data.tar.gz: 6ba6bd7a79bc85e4431be4bffb0ba2f49a6507677c91d349d82d074a3c128bd4c73ac6823876b54a5f07ec8903d864f6ca865aa428fd7ea7137911deb1ec43f7
+  metadata.gz: 8c499f3d39a37005968f220ae416dcbb6942c6daa5d2b57802b165bac9a083aae0448985a489cbb9b126d7a757b463cb10cb2c84f98c2b1fd3b04afed426a2a5
+  data.tar.gz: 6b0082b63fd500bf4c4bed18564e305e65e0d2202de778e4664de3bbd33c3da9d921dc4e3aa3b04d9e8a4d4b4634dea3b8c4297776f8a8e98fff90dd5ba4a72d

data/bin/plotty

@@ -22,4 +22,4 @@
 
 require_relative '../lib/plotty/command'
 
-Plotty::Command.parse(ARGV).invoke
+Plotty::Command::Top.call

data/lib/plotty/command.rb

@@ -24,16 +24,14 @@ require_relative 'graph'
 
 module Plotty
 	module Command
-		def self.parse(*args)
-			Top.parse(*args)
-		end
-		
 		class Top < Samovar::Command
 			self.description = "Render graphs by executing commands."
 			
 			options do
+				option "-n/--name <string>", "The name of the output plot.", default: "plot"
+				
 				option "-x <axis>", "Specify the x axis explicitly", default: "1:10"
-				option "-y <axis>", "Specify the y axis explicitly"
+				option "-y <axis>", "Regular expression for the y-axis value."
 				
 				option "-e/--script <script>", "Prepend this script to the gnuplot command."
 				
@@ -41,13 +39,13 @@ module Plotty
 				option '-v/--version', "Print out the application version."
 			end
 			
-			split :command
+			split :command, "The command to execute."
 			
 			def plot_graph
-				Graph.parse(options[:x], options[:y], @command).plot!(options[:script])
+				Graph.parse(options[:x], options[:y], @command).plot!(options[:script], options[:name])
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def call(program_name: File.basename($0))
 				if @options[:version]
 					puts "plotty v#{Teapot::VERSION}"
 				elsif @options[:help] or @command.nil?

data/lib/plotty/graph.rb

@@ -45,6 +45,8 @@ module Plotty
 		
 		def self.parse(command)
 			case command
+			when /^(.*?),(.*?)$/
+				command.split(',').map(&:to_i)
 			when /^(.*?):\*(.*?):(.*?)$/
 				Scalar.new($1.to_i, $3.to_i, $2.to_i)
 			when /^(.*?):(.*?):(.*?)$/
@@ -57,7 +59,7 @@ module Plotty
 	
 	Function = Struct.new(:pattern, :command, :title) do
 		def self.parse(pattern, command)
-			pattern = Regexp.new(pattern)
+			pattern = Regexp.new(pattern, Regexp::MULTILINE)
 			
 			if command =~ /^(\w+):(.*?)$/
 				self.new(pattern, $2, $1)
@@ -69,7 +71,7 @@ module Plotty
 		def call(value)
 			r, w = IO.pipe
 			
-			# puts "Running #{@command} with x = #{value}..."
+			$stderr.puts "Running #{self.command} with x = #{value}..."
 			
 			pid = Process.spawn({'x' => value.to_s}, self.command, out: w, err: STDERR)
 			
@@ -80,11 +82,13 @@ module Plotty
 			Process.waitpid pid
 			
 			if match = self.pattern.match(buffer)
-				result = match[1] || match[0]
+				$stderr.puts "\tresult = #{match.inspect}"
 				
-				# puts "\tresult = #{result}"
-				
-				return result
+				if match.captures.empty?
+					return [match[0]]
+				else
+					return match.captures
+				end
 			end
 		end
 	end
@@ -106,8 +110,11 @@ module Plotty
 			TTY::Screen.size.reverse
 		end
 		
-		def generate_values
-			File.open("data.txt", "w") do |file|
+		def generate_values(name)
+			path = name + ".csv"
+			values = nil
+			
+			File.open(path, "w") do |file|
 				file.sync = true
 				
 				@x.each do |x|
@@ -115,41 +122,50 @@ module Plotty
 						function.call(x)
 					end
 					
-					# puts "#{x}: #{values.inspect}"
-					file.puts "#{x} #{values.join(' ')}"
+					file.puts "#{x}, #{values.flatten.join(', ')}"
 				end
 			end
+			
+			return values.map(&:count)
 		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 ','
+		def generate_plot(name, offsets, force = false)
+			path = name + ".gp"
+			
+			if !File.exist?(path) or force
+				File.open(path, "w") do |file|
+					file.puts('set datafile separator ","')
+					
+					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 "'#{name}.txt' using 1:#{offsets[index]} with lines title #{function.title.dump}"
 					end
 					
-					file.write "'data.txt' using 1:#{index+2} with lines title #{function.title.dump}"
+					file.puts
 				end
-				
-				file.puts
-				
-				# file.puts "pause 1"
-				# file.puts "reread"
 			end
 			
 			return path
 		end
 		
-		def plot!(script = nil)
-			generate_values
+		def plot!(script = nil, name = "plot")
+			counts = generate_values(name)
+			offsets = [2]
+			
+			counts.each do |count|
+				offsets << offsets.last + count
+			end
 			
-			path = generate_plot do |file|
+			path = generate_plot(name, offsets) do |file|
 				file.puts script if script
 			end
 			

data/lib/plotty/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: plotty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,33 +80,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables:
 - plotty
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- Gemfile.lock
-- README.md
-- Rakefile
 - bin/plotty
 - lib/plotty.rb
 - lib/plotty/command.rb
 - lib/plotty/graph.rb
 - lib/plotty/version.rb
-- plotty.gemspec
-- spec/plotty_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/ioquatix/plotty
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  funding_uri: https://github.com/sponsors/ioquatix/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,11 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Draw graphs from data gathered by executing commands
-test_files:
-- spec/plotty_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,11 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.0
-before_install: gem install bundler -v 1.16.0

data/Gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :develoment do
-	gem 'pry'
-end

data/Gemfile.lock

@@ -1,50 +0,0 @@
-PATH
-  remote: .
-  specs:
-    plotty (0.4.0)
-      samovar
-      tty-screen
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    mapping (1.1.1)
-    method_source (0.9.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    samovar (1.8.0)
-      mapping (~> 1.0)
-      rainbow (~> 2.0)
-    tty-screen (0.6.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  plotty!
-  pry
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1

data/README.md

@@ -1,168 +0,0 @@
-# Plotty
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/plotty`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'plotty'
-```
-
-And then execute:
-
-	$ bundle
-
-Or install it yourself as:
-
-	$ gem install plotty
-
-## Usage
-
-`plotty` allows you to graph data from commands, e.g.
-
-	plotty -x 1:10 -y '\d+' -- 'echo 1' 'echo $x' 'expr $x \* $x'
-
-This will graph the results xecuting the 3 commands after the split with `$x = 1, 2, 3, ... 10`. The y value is computed by the first match of the given regular expression.
-
-### X Axis
-
-The `-x` argument can take sequences of the following format:
-
-| Value     | Meaning                                                          |
-| ----------|------------------------------------------------------------------|
-| `1:10`    | Enumerate from 1 to 10.                                          |
-| `1:2:10`  | Enumerate from 1 to 10 with steps of size 2.                     |
-| `1:*2:64` | Enumerate from 1 to 64 by multiplying the value by 2 each time.  |
-
-### Y Axis
-
-The `-y` argument is a regular expression which is used to extract the y value from the `stdout` of the command. If a capture is specified, the first one is used.
-
-### Use libcaca
-
-Add the following to your `~/.gnuplot`
-
-	set terminal caca driver ncurses
-
-If you are on arch, install [gnuplot-caca](https://aur.archlinux.org/packages/gnuplot-caca).
-
-## Examples
-
-### Trivial Math
-
-```
-plotty -x 1:1:20 -y '\d+' -e "set terminal dumb; set key outside" -- 'echo 1' 'echo $x'
-
-20 +------------------------------------------------------+                  
-   |     +    +     +    +     +    +     +    +     +### |  echo 1 *******  
-18 |-+                                              ##  +-| echo $x #######  
-   |                                             ###      |                  
-16 |-+                                        ###       +-|                  
-   |                                       ###            |                  
-14 |-+                                   ##             +-|                  
-   |                                  ###                 |                  
-12 |-+                             ###                  +-|                  
-   |                            ###                       |                  
-10 |-+                        ##                        +-|                  
-   |                       ###                            |                  
- 8 |-+                  ###                             +-|                  
-   |                 ###                                  |                  
- 6 |-+             ##                                   +-|                  
-   |            ###                                       |                  
- 4 |-+       ###                                        +-|                  
-   |      ###                                             |                  
- 2 |-+  ##                                              +-|                  
-   |  ##**************************************************|                  
- 0 +------------------------------------------------------+                  
-   0     2    4     6    8     10   12    14   16    18   20                 
-```
-
-```
-plotty -x 1:1:100 -y '\d+' -e "set terminal dumb; set key outside" -- 'echo $x' 'expr $x \* $x'
-
-100 +-----------------------------------------------+                        
-    |    +     +    +    +     +    +    +     +   #|       echo $x *******  
- 90 |-+                                          ##-| expr $x \* $x #######  
-    |                                           #   |                        
- 80 |-+                                       ##  +-|                        
-    |                                       ##      |                        
- 70 |-+                                   ##      +-|                        
-    |                                    #          |                        
- 60 |-+                                ##         +-|                        
-    |                                ##             |                        
- 50 |-+                             #             +-|                        
-    |                             ##                |                        
- 40 |-+                         ##                +-|                        
-    |                         ##                    |                        
- 30 |-+                    ###                    +-|                        
-    |                   ###                         |                        
- 20 |-+               ##                          +-|                        
-    |             ####                              |                        
- 10 |-+     ######                     *************|                        
-    |  #####***************************  +     +    |                        
-  0 +-----------------------------------------------+                        
-    1    2     3    4    5     6    7    8     9    10   
-```
-
-### 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
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2012, 2014, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
-
-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.

data/Rakefile

@@ -1,13 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
-task :console do
-	require 'pry'
-	require_relative 'lib/plotty'
-	
-	Pry.start
-end

data/plotty.gemspec

@@ -1,24 +0,0 @@
-
-require_relative "lib/plotty/version"
-
-Gem::Specification.new do |spec|
-	spec.name          = "plotty"
-	spec.version       = Plotty::VERSION
-	spec.authors       = ["Samuel Williams"]
-	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-
-	spec.summary       = %q{Draw graphs from data gathered by executing commands}
-	spec.homepage      = "https://github.com/ioquatix/plotty"
-
-	spec.files         = `git ls-files`.split($/)
-	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ["lib"]
-
-	spec.add_dependency "samovar"
-	spec.add_dependency "tty-screen"
-
-	spec.add_development_dependency "bundler", "~> 1.16"
-	spec.add_development_dependency "rake", "~> 10.0"
-	spec.add_development_dependency "rspec", "~> 3.0"
-end

data/spec/plotty_spec.rb

@@ -1,9 +0,0 @@
-RSpec.describe Plotty do
-  it "has a version number" do
-    expect(Plotty::VERSION).not_to be nil
-  end
-
-  it "does something useful" do
-    expect(false).to eq(true)
-  end
-end

data/spec/spec_helper.rb

@@ -1,14 +0,0 @@
-require "bundler/setup"
-require "plotty"
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end