gnuplot 2.2 → 2.3.1

data/lib/gnuplot.rb

@@ -17,9 +17,23 @@ module Gnuplot
   # Return the full path to the first match or nil if no match is found.
   # 
   def Gnuplot.which ( bin )
+    if RUBY_PLATFORM =~ /mswin|mingw/
+      all = [bin, bin + '.exe']
+    else
+      all = [bin]
+    end
+    for exec in all
+      if which_helper(exec)
+        return which_helper(exec)
+      end
+    end
+    return nil
+  end
+
+  def Gnuplot.which_helper bin
     return bin if File::executable? bin
 
-    path = ENV['PATH'] # || ENV['WHAT_EVER_WINDOWS_PATH_VAR_IS']
+    path = ENV['PATH']
     path.split(File::PATH_SEPARATOR).each do |dir|
       candidate = File::join dir, bin.strip
       return candidate if File::executable? candidate
@@ -42,6 +56,7 @@ module Gnuplot
   # Return the path to the gnuplot executable or nil if one cannot be found.
   def Gnuplot.gnuplot( persist = true )
     cmd = which( ENV['RB_GNUPLOT'] || 'gnuplot' )
+    raise 'gnuplot executable not found' unless cmd
     cmd += " -persist" if persist
     cmd
   end
@@ -73,11 +88,13 @@ module Gnuplot
     def initialize (io = nil, cmd = "plot")
       @cmd = cmd
       @sets = []
+      @arbitrary_lines = []
       @data = []
       yield self if block_given?
-      
+      puts "writing this to gnuplot:\n" + to_gplot + "\n" if $VERBOSE    
       io << to_gplot if io
     end
+    attr_accessor :arbitrary_lines
 
     # Invoke the set method on the plot using the name of the invoked method
     # as the set variable and any arguments that have been passed as the
@@ -96,7 +113,7 @@ module Gnuplot
     # readable code.
 
     def set ( var, value = "" )
-      value = "'#{value}'" if QUOTED.include? var unless value =~ /^'.*'$/
+      value = "\"#{value}\"" if QUOTED.include? var unless value =~ /^'.*'$/
       @sets << [ var, value ]
     end
 
@@ -118,20 +135,20 @@ module Gnuplot
 
     def to_gplot (io = "")
       @sets.each { |var, val| io << "set #{var} #{val}\n" }
+      @arbitrary_lines.each{|line| io << line << "\n" }
 
       if @data.size > 0 then
         io << @cmd << " " << @data.collect { |e| e.plot_args }.join(", ")
         io << "\n"
 
-	v = @data.collect { |ds| ds.to_gplot }
-	io << v.compact.join("e\n")
+        v = @data.collect { |ds| ds.to_gplot }
+      	io << v.compact.join("e\n")
       end
 
       io
     end
   end
 
-
   class SPlot < Plot
 
     def initialize (io = nil, cmd = "splot")
@@ -157,7 +174,6 @@ module Gnuplot
   end
 
 
-
   # Container for a single dataset being displayed by gnuplot.  Each object
   # has a reference to the actual data being plotted as well as settings that
   # control the "plot" command.  The data object must support the to_gplot
@@ -174,10 +190,11 @@ module Gnuplot
   # @todo Use the delegator to delegate to the data property.
 
   class DataSet 
-    attr_accessor :title, :with, :using, :data, :linewidth, :matrix
+    attr_accessor :title, :with, :using, :data, :linewidth, :matrix, :smooth, :axes
   
     def initialize (data = nil)
       @data = data
+      @title = @with = @using = @linewidth = @matrix = @smooth = @axes = nil # avoid warnings
       yield self if block_given?
     end
         
@@ -192,7 +209,9 @@ module Gnuplot
       io << ( (@data.instance_of? String) ? @data : "'-'" )
 
       io << " using #{@using}" if @using
-      
+     
+      io << " axes #{@axes}" if @axes
+ 
       io << case @title
             when /notitle/ then " notitle"
             when nil       then ""
@@ -201,6 +220,7 @@ module Gnuplot
 
       io << " matrix" if @matrix
       io << " with #{@with}" if @with
+      io << " smooth #{@smooth}" if @smooth
       io << " linewidth #{@linewidth}" if @linewidth
       io
     end

metadata

@@ -1,39 +1,62 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: gnuplot
 version: !ruby/object:Gem::Version 
-  version: "2.2"
-date: 2005-11-14 00:00:00 -05:00
-summary: Utility library to aid in interacting with gnuplot
-require_paths: 
-  - lib
-email: gmiller@bittwiddlers.com
-homepage: http://rgplot.rubyforge.org
-rubyforge_project: rgplot
-description: 
-autorequire: gnuplot.rb
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-  version: 
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 1
+  version: 2.3.1
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
-  - Gordon James Miller
-files: 
-  - lib/gnuplot.rb
-test_files: []
-rdoc_options: []
-extra_rdoc_files: []
+- see AUTHORS.txt
+autorequire: gnuplot.rb
+bindir: bin
+cert_chain: []
+
+date: 2010-03-22 00:00:00 -06:00
+default_executable: 
+dependencies: []
+
+description: Utility library to aid in interacting with gnuplot
+email: rogerpack2005@gmail.com
 executables: []
+
 extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/gnuplot.rb
+has_rdoc: true
+homepage: http://github.com/rdp/ruby_gnuplot/tree/master
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-dependencies: []
+
+rubyforge_project: 
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: Utility library to aid in interacting with gnuplot
+test_files: []
+