ctioga2 0.7 → 0.8

data/lib/ctioga2/metabuilder/types/numbers.rb

@@ -20,8 +20,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 401 $', '$Date: 2013-08-19 17:29:59 +0200 (Mon, 19 Aug 2013) $')
-
   module MetaBuilder
 
     # The module Types should be used for all subclasses of

data/lib/ctioga2/metabuilder/types/strings.rb

@@ -19,9 +19,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
-
-
   module MetaBuilder
 
     # The module Types should be used for all subclasses of

data/lib/ctioga2/metabuilder/types/styles.rb

@@ -20,8 +20,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 401 $', '$Date: 2013-08-19 17:29:59 +0200 (Mon, 19 Aug 2013) $')
-
   module MetaBuilder
     module Types
 

data/lib/ctioga2/plotmaker.rb

@@ -158,8 +158,6 @@ require 'ctioga2/postprocess'
 # displays of rate constants vs potentials)
 module CTioga2
 
-  Version::register_svn_info('$Revision: 522 $', '$Date: 2013-09-22 12:02:48 +0200 (Sun, 22 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
   # is delegated into classes.
@@ -357,11 +355,11 @@ module CTioga2
         fn = path.basename.to_s
 
         efn = fn.gsub(/[.\s]/) do |x|
-          "__#{x.ord}__"
+          "__#{x[0].ord}__"
         end
 
         if efn != fn
-          debug { "Mangled name to '#{fn}'"}
+          debug { "Mangled name to '#{efn}'"}
         end
 
         t.def_figure(efn) do

data/lib/ctioga2/postprocess.rb

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 522 $', '$Date: 2013-09-22 12:02:48 +0200 (Sun, 22 Sep 2013) $')
-
   # What happens to generated PDF files ?
   #
   # \todo

data/lib/ctioga2/utils.rb

@@ -14,6 +14,10 @@
 # For platform detection
 require 'rbconfig'
 
+# The version
+require 'ctioga2/version'
+
+
 module CTioga2
 
   # An exception to raise upon to-be-implemented-one-day features
@@ -26,69 +30,14 @@ module CTioga2
 
     # The current version of the program.
     def self.version
-      if CTIOGA_VERSION =~ /SVN/
-        return "SVN, revision #{SVN_INFO['revision']}#{SVN_INFO['suffix']}, #{SVN_INFO['date']}"
-      else
-        return CTIOGA_VERSION
-      end
+      return GIT_VERSION
     end
 
 
-    # All files should use this function with the appropriate
-    # arguments and have the Date and Revision svn:keyword:. Use this
-    # way:
-    #
-    #  Version::register_svn_info('$Revision: 532 $', '$Date: 2013-09-29 12:13:33 +0200 (Sun, 29 Sep 2013) $')
-    #
-    # To set the correct properties, the following command-line can be
-    # used:
-    #
-    #  svn propset svn:keywords 'Date Revision'
-    def self.register_svn_info(rev_str, date_str)
-      if rev_str =~ /(\d+)/
-        rev = $1
-        str = 'Date'
-        date = date_str.gsub(/\$#{str}:\s*(.*)\$/) { $1 }
-        if SVN_INFO['revision'] < rev.to_i
-          SVN_INFO['revision'] = rev.to_i
-          SVN_INFO['date'] = date
-        end
-        # Hmmm, we want to see how many revisions is git ahead of SVN
-        if rev_str =~ /(\+git\d+)/
-          SVN_INFO['suffix'] = $1
-        end
-      end
-    end
-
     # Returns the date ctioga2 was last modified.
     def self.last_modified_date
-      SVN_INFO['date'] =~ /([\d-]+)/
-      return $1
+      return GIT_DATE
     end
-
-
-    # The constants are moved here, as they disturb rdoc parsing.
-
-
-    # Informations collected about subversion revisions
-    SVN_INFO = { 
-      'revision' => 0,
-      'date' => "old",
-      'suffix' => ''
-    }
-
-    # The position of the URL, used for getting the version
-    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.7/lib/ctioga2/utils.rb $'
-    
-    # The version of ctioga2
-    CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
-                       $1
-                     else
-                       "SVN version"
-                     end
-
-    register_svn_info('$Revision: 532 $', '$Date: 2013-09-29 12:13:33 +0200 (Sun, 29 Sep 2013) $')
-
   end
 
   # Various utilities
@@ -477,11 +426,4 @@ class String
   end
 end
 
-begin
-  # This is a dirty hack in order to ensure that the SVN revision
-  # information is kept up-to-date even when using git-svn. This
-  # file is not present in standard installations.
-  require 'ctioga2/git-fools-svn'
-rescue LoadError => e
-end
 

data/lib/ctioga2/version.rb

@@ -0,0 +1,8 @@
+# Automatically generated file.
+module CTioga2
+
+  module Version
+GIT_VERSION = '0.8'
+GIT_DATE = 'Fri 27 Dec 01:11:58 CET 2013'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga
@@ -66,6 +66,7 @@ files:
 - lib/ctioga2/commands/commands.rb
 - lib/ctioga2/postprocess.rb
 - lib/ctioga2/utils.rb
+- lib/ctioga2/version.rb
 - lib/ctioga2/graphics/types/dimensions.rb
 - lib/ctioga2/graphics/types/boundaries.rb
 - lib/ctioga2/graphics/types/location.rb
@@ -76,6 +77,7 @@ files:
 - lib/ctioga2/graphics/types/point.rb
 - lib/ctioga2/graphics/coordinates.rb
 - lib/ctioga2/graphics/elements/redirecting-container.rb
+- lib/ctioga2/graphics/elements/histogram.rb
 - lib/ctioga2/graphics/elements/parametric2d.rb
 - lib/ctioga2/graphics/elements/gradient-region.rb
 - lib/ctioga2/graphics/elements/region.rb
@@ -153,7 +155,7 @@ files:
 - Changelog
 - setup.rb
 - bin/ctioga2
-homepage: http://ctioga2.rubyforge.org
+homepage: http://ctioga2.sourceforge.net
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -172,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ctioga2
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3