plotty 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e23e114429e1fbd71981ddf4091978cf0e3b1fb
-  data.tar.gz: 3b7205cc26a63509e9613b048a805b7ef87e40f5
+  metadata.gz: 1ee59e3e02d9e99451d65a0c0580e7fa29561d8f
+  data.tar.gz: 9926f065f4c1ae3f8efc8bfaf53ee245d4700af4
 SHA512:
-  metadata.gz: d2d36080766010086ce0e4e981d86946049c6982406c3b9e43644ebb641c6db0192fb295f4bedabaf1f969f4a3376c10e46348fd3963a3776bb9631588a19854
-  data.tar.gz: bc36b92e54ec8baa7b6236afbc11f975b957af1c5b93f5f7b76410bf155a5e167e0442fd8172924adef81e88e99282fe8c9e47ec13cbeb8e0122cfe0fcb9a44a
+  metadata.gz: a531dc811cf328e24334a1faf577bb13dd41809d6677a8ac980f9d9fec31843f392064edabab399b9c1cd54060d2e787bf50d5b570e6146dcbb276649067934b
+  data.tar.gz: b148af4b818bb1cd3f10a88cb1f250a20d96af8aa5e4e83f2c00e47a1030c56dd10a32ec02872a522d4155b9cc65e6073e7ca61fd36d6dedf0073b1ecd499bbe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plotty (0.1.0)
+    plotty (0.3.0)
       samovar
       tty-screen
 

data/README.md

@@ -14,22 +14,132 @@ gem 'plotty'
 
 And then execute:
 
-    $ bundle
+	$ bundle
 
 Or install it yourself as:
 
-    $ gem install plotty
+	$ gem install plotty
 
 ## Usage
 
-TODO: Write usage instructions here
+`plotty` allows you to graph data from commands, e.g.
 
-## Development
+	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
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/plotty.
+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/lib/plotty/command.rb

@@ -35,6 +35,8 @@ module Plotty
 				option "-x <axis>", "Specify the x axis explicitly", default: "1:10"
 				option "-y <axis>", "Specify the y axis explicitly"
 				
+				option "-e/--script <script>", "Prepend this script to the gnuplot command."
+				
 				option '-h/--help', "Print out help information."
 				option '-v/--version', "Print out the application version."
 			end
@@ -42,7 +44,7 @@ module Plotty
 			split :command
 			
 			def plot_graph
-				Graph.parse(options[:x], options[:y], @command).plot!
+				Graph.parse(options[:x], options[:y], @command).plot!(options[:script])
 			end
 			
 			def invoke(program_name: File.basename($0))

data/lib/plotty/graph.rb

@@ -49,7 +49,7 @@ module Plotty
 				Scalar.new($1.to_i, $3.to_i, $2.to_i)
 			when /^(.*?):(.*?):(.*?)$/
 				Linear.new($1.to_i, $3.to_i, $2.to_i)
-			when command =~ /^(.*?):(.*?)$/
+			when /^(.*?):(.*?)$/
 				Linear.new($1.to_i, $2.to_i, 1)
 			end
 		end
@@ -61,6 +61,10 @@ module Plotty
 			@command = command
 		end
 		
+		def title
+			@command
+		end
+		
 		def call(value)
 			r, w = IO.pipe
 			
@@ -90,10 +94,10 @@ module Plotty
 			@y = y
 		end
 		
-		def self.parse(x, y, command)
+		def self.parse(x, y, commands)
 			self.new(
 				Sequence.parse(x),
-				Function.new(y, command.first),
+				commands.collect{|command| Function.new(y, command)},
 			)
 		end
 		
@@ -101,21 +105,21 @@ module Plotty
 			TTY::Screen.size.reverse
 		end
 		
-		def plot!
-			r, w = IO.pipe
-			
-			pid = Process.spawn({'GNUTERM' => 'dumb'}, "gnuplot -p -e \"set terminal dumb #{size.join(' ')}; plot '<cat' with lines notitle\"", in: r, out: STDOUT, err: STDERR)
-			
-			r.close
-			
-			@x.each do |x|
-				y = @y.call(x)
-				w.puts "#{x} #{y}"
+		def plot!(script = nil)
+			File.open("data.txt", "w") do |file|
+				@x.each do |x|
+					values = @y.collect do |function|
+						function.call(x)
+					end
+					
+					puts "#{x}: #{values.inspect}"
+					file.puts "#{x} #{values.join(' ')}"
+				end
 			end
 			
-			w.close
+			plots = @y.collect.with_index{|function, index| "'data.txt' using 1:#{index+2} with lines title #{function.title.dump}"}
 			
-			Process.waitpid pid
+			system("gnuplot", "-e", "#{script}; plot #{plots.join(', ')}")
 		end
 	end
 end

data/lib/plotty/version.rb

@@ -1,3 +1,3 @@
 module Plotty
-	VERSION = "0.1.0"
+	VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plotty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar