plotrobber 0.0.7 → 0.1.1

data/lib/plotrobber.rb

@@ -1,26 +1,85 @@
 require 'plotrobber/version'
-
-require 'gnuplot'
 require 'tempfile'
 
-def plotting(&blk)
-  IO.popen('gnuplot -preserve', 'w+') {|io| @@gp = io; blk[io] }
+def plotting(preserve=false, &blk)
+  if ENV['DEBUG']
+    @@gp = STDOUT
+    blk[STDOUT]
+  else
+    cmd = 'gnuplot'
+    cmd << ' -preserve' if preserve
+
+    IO.popen(cmd, 'w+') do |io|
+      @@gp = io
+      blk[io]
+    end
+  end
+end
+
+module Plotrobber
+  class PlotWrapper
+  end
+end
+
+def before_each_plot(&blk)
+  Plotrobber::PlotWrapper.before_each = blk
 end
 
+
 def plot(filename=nil, &blk)
-  @@gp.puts 'reset'
+  p = Plotrobber::PlotWrapper.new
 
-  Gnuplot::Plot.new(@@gp) do |p|
-    p.magic_terminal(filename) if filename
-    p.instance_exec(p, &blk)
-  end
+  p.magic_terminal(filename) if filename
+
+  p.instance_exec(&Plotrobber::PlotWrapper.before_each) if Plotrobber::PlotWrapper.before_each
+
+  p.instance_exec(p, &blk)
+
+  @@gp << p.to_s << "\nreset\n"
 end
 
-class Gnuplot::Plot
+class Plotrobber::PlotWrapper
+  def self.before_each ; @before_each ; end
+  def self.before_each=(blk) ; @before_each = blk ; end
+
+  attr_accessor :commands, :functions
+
+  def initialize
+    @commands  = []
+    @functions = []
+  end
+
+  def to_s
+    @commands.map(&:to_s).join("\n") + "\nplot\\\n\t" + @functions.join(",\\\n\t")
+  end
+
   def please(s)
-    arbitrary_lines << s
+    @commands << s
+  end
+
+  def set(s)
+    please "set #{s}"
+  end 
+
+  QUOTED = %w[title output xlabel ylabel]
+  def quote(k, v)
+    if QUOTED.include?(k.to_s) and v !~ /\A'.*'\z/
+      '"%s"' % v
+    else
+      v
+    end
   end
 
+
+  for cmd in %w[terminal output xtics ytics xlabel ylabel xrange yrange style]
+    class_eval <<-EOS
+      def #{cmd}(s)
+        set "#{cmd} %s" % [quote('#{cmd}', s)]
+      end
+    EOS
+  end
+
+
   def store(data)
     (@store ||= {})[data] ||= begin
       file = Tempfile.new(['plotrobber.','.dat'])
@@ -86,16 +145,19 @@ class Gnuplot::Plot
   def show(what, *args)
     name = source_name what
 
-    self.data << Gnuplot::DataSet.new(name) do |ds|
-      for arg in args
-        if Hash === arg
-          for k, v in arg
-            ds.send("#{k}=", v)
-          end
-        else
-          ds.send arg.to_s
+    output = [name]
+
+    for arg in args
+      if Hash === arg
+        for k, v in arg
+          output << k
+          output << quote(k, v) unless v === true
         end
+      else
+        output << arg.to_s
       end
     end
+
+    @functions << output.join(' ')
   end
 end

data/lib/plotrobber/version.rb

@@ -1,3 +1,3 @@
 module Plotrobber
-  VERSION = "0.0.7"
+  VERSION = "0.1.1"
 end

data/plotrobber.gemspec

@@ -16,6 +16,4 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-
-  gem.add_dependency('gnuplot')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plotrobber
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: gnuplot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-04-20 00:00:00.000000000 Z
+dependencies: []
 description: gnuplot easier.
 email:
 - eli@fox-epste.in