tokfile 0.0.4 → 0.0.5

data/test/helper.rb

@@ -23,12 +23,13 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest/autorun'
 require 'shoulda'
+$VERBOSE=false
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'tokfile'
 
-class Test::Unit::TestCase
-end
+$VERBOSE=false
+

data/test/test_tokfile.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestTokfileEqdsk < Test::Unit::TestCase
+class TestTokfileEqdsk < MiniTest::Test
 	def test_eqdsk_read
 		nr = 100
 		eq = TokFile::Eqdsk.new('test/data/EQDSK')
@@ -14,19 +14,25 @@ class TestTokfileEqdsk < Test::Unit::TestCase
 		assert_equal(1.269946123,eq.rbound[2])
 		assert_equal(0.5079056676,eq.ttprime[1])
 	end
-	def test_eqdsk_display
-		TokFile.write_summary_graph('test/data/EQDSK', 'eqdsk.ps', f: 'eqdsk')
+	#def test_eqdsk_display
+		#TokFile.write_summary_graph('test/data/EQDSK', 'eqdsk.ps', f: 'eqdsk')
+#
+	#end
+  def test_eqdsk_dummy_convert
+		TokFile.convert('test/data/EQDSK', 'test/data/EQDSK_OUT', f: 'eqdsk')
+		TokFile.convert('test/data/EQDSK_NO_BOUNDARY', 'test/data/EQDSK_OUT_FIXED', f: 'eqdsk')
+		TokFile.display_summary_graph('test/data/EQDSK_OUT_FIXED,test/data/EQDSK', f: 'eqdsk')
+  end
 
-	end
-	def test_ogyropsi_read
-		og = TokFile::Ogyropsi.new('test/data/ogyropsi.dat')
-		assert_equal(og.npsi, 41)
-	end
-	def test_ogyropsi_display
-		TokFile.write_summary_graph('test/data/ogyropsi.dat,test/data/ogyropsi.dat', 'ogyropsi.ps', f: 'ogyropsi')
-	end
-	def test_merge
-		TokFile.merge('test/data/ogyropsi.dat,test/data/ogyropsi_nobal.dat', 'test/data/ogyropsi_out.dat', f: 'ogyropsi', m: 'all,profiles')
-		TokFile.display_summary_graph('test/data/ogyropsi_out.dat,test/data/ogyropsi.dat,test/data/ogyropsi_nobal.dat', f: 'ogyropsi')
-	end
+	#def test_ogyropsi_read
+		#og = TokFile::Ogyropsi.new('test/data/ogyropsi.dat')
+		#assert_equal(og.npsi, 41)
+	#end
+	#def test_ogyropsi_display
+		#TokFile.write_summary_graph('test/data/ogyropsi.dat,test/data/ogyropsi.dat', 'ogyropsi.ps', f: 'ogyropsi')
+	#end
+	#def test_merge
+		#TokFile.merge('test/data/ogyropsi.dat,test/data/ogyropsi_nobal.dat', 'test/data/ogyropsi_out.dat', f: 'ogyropsi', m: 'all,profiles')
+		#TokFile.display_summary_graph('test/data/ogyropsi_out.dat,test/data/ogyropsi.dat,test/data/ogyropsi_nobal.dat', f: 'ogyropsi')
+	#end
 end

data/tokfile.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tokfile 0.0.4 ruby lib
+# stub: tokfile 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "tokfile"
-  s.version = "0.0.4"
+  s.name = "tokfile".freeze
+  s.version = "0.0.5"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Edmund Highcock"]
-  s.date = "2015-08-09"
-  s.description = "A tool for working with common tokamak file formats from tools like EFIT, CHEASE, TRANSP, CRONOS etc. Contains commands for plotting a summary of content, manipulating the data within them and most importantly, converting one format to another."
-  s.email = "edmundhighcock@users.sourceforge.net"
-  s.executables = ["tokfile"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Edmund Highcock".freeze]
+  s.date = "2017-01-16"
+  s.description = "A tool for working with common tokamak file formats from tools like EFIT, CHEASE, TRANSP, CRONOS etc. Contains commands for plotting a summary of content, manipulating the data within them and most importantly, converting one format to another.".freeze
+  s.email = "edmundhighcock@users.sourceforge.net".freeze
+  s.executables = ["tokfile".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md",
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/tokfile/eqdsk.rb",
     "lib/tokfile/ogyropsi.rb",
     "test/data/EQDSK",
+    "test/data/EQDSK_NO_BOUNDARY",
     "test/data/ogyropsi.dat",
     "test/data/ogyropsi_nobal.dat",
     "test/data/ogyropsi_out.dat",
@@ -41,42 +42,42 @@ Gem::Specification.new do |s|
     "test/test_tokfile.rb",
     "tokfile.gemspec"
   ]
-  s.homepage = "http://github.com/edmundhighcock/tokfile"
-  s.licenses = ["GPLv3"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "A set of tools for testing and manipulating and converting files associated with tokamaks."
+  s.homepage = "http://github.com/edmundhighcock/tokfile".freeze
+  s.licenses = ["GPLv3".freeze]
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "A set of tools for testing and manipulating and converting files associated with tokamaks.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<coderunner>, [">= 0.14.13"])
-      s.add_runtime_dependency(%q<graphkit>, [">= 0.3.3"])
-      s.add_runtime_dependency(%q<command-line-flunky>, [">= 1.0.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<coderunner>.freeze, [">= 0.14.13"])
+      s.add_runtime_dependency(%q<graphkit>.freeze, [">= 0.3.3"])
+      s.add_runtime_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.2"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<coderunner>, [">= 0.14.13"])
-      s.add_dependency(%q<graphkit>, [">= 0.3.3"])
-      s.add_dependency(%q<command-line-flunky>, [">= 1.0.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<coderunner>.freeze, [">= 0.14.13"])
+      s.add_dependency(%q<graphkit>.freeze, [">= 0.3.3"])
+      s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.2"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<coderunner>, [">= 0.14.13"])
-    s.add_dependency(%q<graphkit>, [">= 0.3.3"])
-    s.add_dependency(%q<command-line-flunky>, [">= 1.0.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<coderunner>.freeze, [">= 0.14.13"])
+    s.add_dependency(%q<graphkit>.freeze, [">= 0.3.3"])
+    s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.2"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokfile
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - lib/tokfile/eqdsk.rb
 - lib/tokfile/ogyropsi.rb
 - test/data/EQDSK
+- test/data/EQDSK_NO_BOUNDARY
 - test/data/ogyropsi.dat
 - test/data/ogyropsi_nobal.dat
 - test/data/ogyropsi_out.dat
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A set of tools for testing and manipulating and converting files associated