ctioga2 0.6 → 0.6.1

data/Changelog

@@ -1,3 +1,10 @@
+ctioga2 (0.6.1)
+
+  * Fix crash when a curve has no points within the plot boundaries
+  * Work around encoding problems arising on windows
+
+ -- Vincent <vincent.fourmond@9online.fr>  Mon  9 Sep 22:19:01 CEST 2013
+
 ctioga2 (0.6)
 
   * Fix various problems related to file names and directories

data/lib/ctioga2/commands/general-commands.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/parsers/file'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 497 $', '$Date: 2013-09-04 22:07:55 +0200 (Wed, 04 Sep 2013) $')
+  Version::register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
 
   module Commands
  
@@ -60,6 +60,9 @@ EOH
               [ CmdArg.new('file')], 
               {'log' => CmdArg.new('boolean') }
               ) do |plotmaker, file, opts|
+      # Work around bug on windows !
+      file = Utils::transcode_until_found(file)
+
       if opts['log']
         tg = file.sub(/(\.ct2)?$/, '-log.txt')
         Log::log_to(tg, "ctioga2 version '#{CTioga2::Version::version}' starting at #{Time.now} to process file: #{file}")

data/lib/ctioga2/commands/interpreter.rb

@@ -21,7 +21,7 @@ require 'ctioga2/commands/doc/doc'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 492 $', '$Date: 2013-09-03 21:54:09 +0200 (Tue, 03 Sep 2013) $')
+  Version::register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
 
   # This module contains the real core of ctioga2: a set of classes
   # that implement the concept of commands. Each command translates
@@ -210,9 +210,10 @@ module CTioga2
         if ! @plotmaker_target.figure_name
           @plotmaker_target.figure_name = file.gsub(/\.[^.]+$/,'')
         end
+
         dir = File::dirname(file)
         base = File::basename(file)
-        
+
         Dir::chdir(dir) do
           @file_parser.run_command_file(base, self)
         end

data/lib/ctioga2/graphics/elements/curve2d.rb

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 474 $', '$Date: 2013-08-31 15:05:39 +0200 (Sat, 31 Aug 2013) $')
+  Version::register_svn_info('$Revision: 505 $', '$Date: 2013-09-05 22:18:57 +0200 (Thu, 05 Sep 2013) $')
 
   module Graphics
 
@@ -111,7 +111,17 @@ module CTioga2
                 t.append_point_to_path(x, y)
               end
             else
+
+              # Hmmmm. This may get the wrong thing if you happen to
+              # draw something completely outside.
               f = func.bound_values(*bnds.extrema)
+
+              # If for some reason, there is no point left, we plot
+              # the original function.
+              if f.size < 2
+                f = func
+              end
+              
               t.move_to_point(f.x.first, f.y.first)
               t.append_points_to_path(f.x[1..-1], f.y[1..-1])
             end

data/lib/ctioga2/plotmaker.rb

@@ -106,6 +106,9 @@ CTioga2::Log::init_logger
 
 require 'shellwords'
 
+# Path name mangling
+require 'pathname'
+
 # Maybe, maybe, maybe... We need tioga ?
 require 'Tioga/FigureMaker'
 
@@ -155,7 +158,7 @@ require 'ctioga2/postprocess'
 # displays of rate constants vs potentials)
 module CTioga2
 
-  Version::register_svn_info('$Revision: 478 $', '$Date: 2013-09-01 11:24:02 +0200 (Sun, 01 Sep 2013) $')
+  Version::register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
 
   # This class is the core of ctioga. It parses the command-line arguments,
   # reads all necessary files and plots graphs. Most of its functionality
@@ -342,55 +345,50 @@ module CTioga2
 
 
       t = create_figure_maker
-      # If figname is clearly a path, we split it into directory/name
-      # and set the output directory to directory.
-      if File::basename(figname) != figname
-        dir = File::dirname(figname)
-        # If path is relative and output_directory is specified, we make
-        # the path relative to output_dir
-        if @output_directory && dir =~ /^[^\/~]/
-          dir = File::join(@output_directory, dir)
-        end
-        t.save_dir = dir
-        figname = File::basename(figname)
-      elsif @output_directory
-        t.save_dir = @output_directory
-      end
 
-      effective_fig_name = figname.gsub(/[.\s]/) do |x|
-        "__#{x.ord}__"
+      path = Pathname.new(figname)
+      if @output_directory
+        out = Pathname.new(@output_directory)
+        path = out + path
       end
 
-      if effective_fig_name != figname
-        debug { "Mangled name to '#{effective_fig_name}'"}
-      end
+      # We always cd into the target directory for creading the
+      Dir.chdir(path.dirname) do
+        fn = path.basename.to_s
 
-      t.def_figure(effective_fig_name) do
-        @latex_font.set_global_font(t)
-        @root_object.draw_root_object(t)
-      end
-      t.make_preview_pdf(t.figure_index(effective_fig_name))
-
-      # We look for latex errors
-      if t.respond_to? :pdflatex_errors
-        errs = t.pdflatex_errors
-        if errs.size > 0
-          error { "pdflatex returned with #{errs.size} error lines"}
-          for l in errs
-            warn { "pdflatex error: #{l.chomp}" }
+        efn = fn.gsub(/[.\s]/) do |x|
+          "__#{x.ord}__"
+        end
+
+        if efn != fn
+          debug { "Mangled name to '#{fn}'"}
+        end
+
+        t.def_figure(efn) do
+          @latex_font.set_global_font(t)
+          @root_object.draw_root_object(t)
+        end
+        t.make_preview_pdf(t.figure_index(efn))
+
+        # We look for latex errors
+        if t.respond_to? :pdflatex_errors
+          errs = t.pdflatex_errors
+          if errs.size > 0
+            error { "pdflatex returned with #{errs.size} error lines"}
+            for l in errs
+              warn { "pdflatex error: #{l.chomp}" }
+            end
           end
         end
-      end
 
-      # We first rename the PDF file if it was mangled.
-      if effective_fig_name != figname
-        Dir.chdir(t.save_dir || ".") do
-          File::rename("#{effective_fig_name}.pdf", "#{figname}.pdf")
+        # We first rename the PDF file if it was mangled.
+        if efn != fn
+          File::rename("#{efn}.pdf", "#{fn}.pdf")
         end
+
       end
 
-      file = t.save_dir ? File::join(t.save_dir, figname + ".pdf") : 
-        figname + ".pdf"
+      file = path.to_s + ".pdf"
 
       # Feed it
       @postprocess.process_file(file, last)

data/lib/ctioga2/utils.rb

@@ -35,7 +35,7 @@ module CTioga2
     # arguments and have the Date and Revision svn:keyword:. Use this
     # way:
     #
-    #  Version::register_svn_info('$Revision: 496 $', '$Date: 2013-09-04 21:31:56 +0200 (Wed, 04 Sep 2013) $')
+    #  Version::register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
     #
     # To set the correct properties, the following command-line can be
     # used:
@@ -75,7 +75,7 @@ module CTioga2
     }
 
     # The position of the URL, used for getting the version
-    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.6/lib/ctioga2/utils.rb $'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.6.1/lib/ctioga2/utils.rb $'
     
     # The version of ctioga2
     CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
@@ -84,7 +84,7 @@ module CTioga2
                        "SVN version"
                      end
 
-    register_svn_info('$Revision: 496 $', '$Date: 2013-09-04 21:31:56 +0200 (Wed, 04 Sep 2013) $')
+    register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
 
   end
 
@@ -225,6 +225,35 @@ module CTioga2
 
       return Math.log10(a.first).send(method)
     end
+
+
+    # Transcodes the given string from all encodings into the target
+    # encoding until an encoding is found in which the named file
+    # exists.
+    #
+    # Works around encoding problems on windows.
+    def self.transcode_until_found(file)
+      if File.exists? file
+        return file
+      end
+      begin                     # We wrap in a begin/rescue block for
+                                # Ruby 1.8
+        for e in Encoding::constants
+          e = Encoding.const_get(e)
+          if e.is_a? Encoding
+            begin
+              ts = file.encode(Encoding::default_external, e)
+              if File.exists? ts
+                return ts
+              end
+            rescue
+            end
+          end
+        end
+      rescue
+      end
+      return file               # But that will fail later on.
+    end
   end
     
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga