trinitycrmod 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac9c19e9dada81c1e6a71927804d2871931e915
-  data.tar.gz: f4a0b5d4baa473fdce6ee84b071948aca3919958
+  metadata.gz: b4c4064ac49be83fd3218fe6019c7c43abe85f88
+  data.tar.gz: 310f019da68adf055c8cc32a70048fdfac956ceb
 SHA512:
-  metadata.gz: c5ef5ad0a3aebd7ee5412e939f6dbb6f88f92d6832ca22009e2aee4f840135055c438009c66ace33841fcd2b257097fba4444f0bd3e42019f2fb14ea4e688d44
-  data.tar.gz: b229817ccdabf6cfb7ee4cfdc1872a2c24fb21a46d4546896993d67dc473346f5067c2305255fdb5311e66c2bb2d0d24c4e3e3034af6c0e455d0dfd36d8a008f
+  metadata.gz: 1d8442ecee17f61f52c84115d1db381bfa806fd97a343ea46ae6112a744be096aa353dbb83ad5eda37a3a35c60c66ee64e7afb928b38001838dc0985883158b3
+  data.tar.gz: 1fd338e931c0d1fd2dc94d86c8fb6c2382154f3bdea2e0ff5349b0792ece360b3e5dc1eb9ca76954c69069088d5f6494f51db6742342374f8534c564aab0c568

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
    gem "coderunner", ">= 0.16.10"
    gem "text-data-tools", ">= 1.1.6"
 	 gem "gs2crmod", ">=0.11.76"
+	 gem "gryfxcrmod", ">=0.1.9"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Rakefile

@@ -27,7 +27,7 @@ end
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
+Rake::TestTask.new(:test => [:clean_tests]) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
@@ -38,6 +38,41 @@ Rake::TestTask.new(:sync_variables) do |test|
   test.pattern = 'sync_variables/sync_variables.rb'
   test.verbose = true
 end
+
+task :clean_tests do 
+    require 'coderunner'
+  require 'rubygems'
+  require 'bundler'
+  begin
+    Bundler.setup(:default, :development)
+  rescue Bundler::BundlerError => e
+    $stderr.puts e.message
+    $stderr.puts "Run `bundle install` to install missing gems"
+    exit e.status_code
+  end
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+  $LOAD_PATH.unshift(File.dirname(__FILE__))
+    @runner = CodeRunner.fetch_runner(Y: 'test/gs2_42982', C: 'trinity', X: '/dev/null')
+    FileUtils.rm(@runner.run_class.rcp.user_defaults_location + '/rake_test_gs2_42982_defaults.rb') rescue nil
+    FileUtils.rm('test/gs2_42982/rake_test_gs2_42982_defaults.rb') rescue nil
+    FileUtils.rm('test/gs2_42982/pr08_jet_42982_1d.dat') rescue nil
+    FileUtils.rm('test/gs2_42982/pr08_jet_42982_2d.dat') rescue nil
+    FileUtils.rm('test/gs2_42982/.CODE_RUNNER_TEMP_RUN_LIST_CACHE') rescue nil
+    #STDIN.gets
+    FileUtils.rm_r('test/gs2_42982/v/') rescue nil
+    FileUtils.rm_r('test/gs2_42982_results/v') rescue nil
+    FileUtils.rm('test/gs2_42982_results/.code_runner_script_defaults.rb') rescue nil
+    FileUtils.rm('test/gs2_42982_results/.CODE_RUNNER_TEMP_RUN_LIST_CACHE') rescue nil
+    FileUtils.rm('test/ifspppl_results/.code_runner_script_defaults.rb') rescue nil
+    FileUtils.rm_r('test/ifspppl_results/v/id_1/') rescue nil
+    FileUtils.rm('test/ifspppl/.code_runner_script_defaults.rb') rescue nil
+    FileUtils.rm('test/ifspppl/.CODE_RUNNER_TEMP_RUN_LIST_CACHE') rescue nil
+    FileUtils.rm('test/gs2_42982/pr08_jet_42982_1d.dat') rescue nil
+    FileUtils.rm('test/gs2_42982/pr08_jet_42982_2d.dat') rescue nil
+    FileUtils.rm_r('test/ifspppl/v') rescue nil
+end
+
+
     
 
 #require 'rcov/rcovtask

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/lib/trinitycrmod/trinity.rb

@@ -12,6 +12,11 @@ class CodeRunner
     class FluxOptionError < StandardError; end
 
 
+    # Setup gs2 in case people are using it
+    CodeRunner.setup_run_class('gs2')
+    # Setup gryfx in case people are using it
+    CodeRunner.setup_run_class('gryfx')
+    require 'trinitycrmod/trinity_gs2'
 
     # Where this file is
     @code_module_folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
@@ -28,12 +33,6 @@ class CodeRunner
     require 'trinitycrmod/flux_interpolator'
     require 'trinitycrmod/read_netcdf'
 
-    # Setup gs2 in case people are using it
-    CodeRunner.setup_run_class('gs2')
-    require 'trinitycrmod/trinity_gs2'
-
-    # Setup gryfx in case people are using it
-    CodeRunner.setup_run_class('gryfx')
 
     ################################################
     # Quantities that are read or determined by CodeRunner
@@ -102,10 +101,10 @@ class CodeRunner
       #new_run = self.dup
       (rcp.variables).each{|v| new_run.set(v, send(v)) if send(v) or new_run.send(v)}
       if @flux_option == "gs2"
-        gs2_runs.each_with_index do |run, i|
+        flux_runs.each_with_index do |run, i|
           CodeRunner::Gs2.rcp.variables.each{|v|
             next if [:ginit_option, :delt_option].include? v and new_run.no_restart_gs2
-            new_run.gs2_runs[i].set(v, run.send(v)) if run.send(v) or new_run.gs2_runs[i].send(v)
+            new_run.flux_runs[i].set(v, run.send(v)) if run.send(v) or new_run.flux_runs[i].send(v)
           }
         end
       end
@@ -122,7 +121,7 @@ class CodeRunner
       new_run.init_file = @run_name + ".tmp"
       @runner.nprocs = @nprocs if @runner.nprocs == "1" # 1 is the default so this means the user probably didn't specify nprocs
       # This is unnecessary for single restart file.
-      warning( "Restart is not on the same number of processors as the previous run: new is #{new_run.nprocs.inspect} and old is #{@nprocs.inspect}... this is only OK if you are using parallel netcdf and single restart files.") if not new_run.no_restart_gs2 and (!new_run.nprocs or new_run.nprocs != @nprocs)
+      warning( "Restart is not on the same number of processors as the previous run: new is #{new_run.nprocs.inspect} and old is #{@nprocs.inspect}... this is only OK if you are using parallel netcdf and single restart files.") if flux_gs2? and not new_run.no_restart_gs2 and (!new_run.nprocs or new_run.nprocs != @nprocs)
       raise "Restart cannot have a different sized jacobian: new is #{new_run.n_flux_tubes_jac} and old is #{n_flux_tubes_jac}" unless new_run.n_flux_tubes_jac == n_flux_tubes_jac
     #   @runner.parameters.each{|var, value| new_run.set(var,value)} if @runner.parameters
     #   ep @runner.parameters
@@ -141,38 +140,24 @@ class CodeRunner
         # run.
         FileUtils.cp("#@directory/#@run_name.#{ext}", "#{new_run.directory}/.")
       end
-      if new_run.flux_option == "gs2" and @flux_option == "gs2" and not new_run.no_restart_gs2
+      if (new_run.flux_gs2? and flux_gs2?) and not new_run.no_restart_gs2
         for i in 0...n_flux_tubes
           break if i >= new_run.n_flux_tubes
-          #if i >= n_flux_tubes_jac
-            #jn = i - n_flux_tubes_jac + 1
-            ##run_name = "calibrate_" + @run_name + (jn).to_s
-            #folder = "calibrate_#{jn}"
-          #else
-            #jn = i + 1
-            ##run_name = @run_name + (jn).to_s
-            #folder = "flux_tube_#{jn}"
-          #end
-          #
-          folder = gs2_folder_name(i)
-
-          new_run.gs2_runs[i].directory = new_run.directory + "/#{folder}"
-          FileUtils.makedirs(new_run.gs2_runs[i].directory)
-          #ep ['gs2_runs[i] before', gs2_runs[i].nwrite, new_run.gs2_runs[i].nwrite, new_run.gs2_runs[i].parameter_hash]
-          gs2_runs[i].restart(new_run.gs2_runs[i])
+          folder = flux_folder_name(i)
+
+          new_run.flux_runs[i].directory = new_run.directory + "/#{folder}"
+          FileUtils.makedirs(new_run.flux_runs[i].directory)
+          flux_runs[i].restart(new_run.flux_runs[i])
           if new_run.neval_calibrate and new_run.neval_calibrate > 0 and 
-            new_run.gs2_runs[i].nonlinear_mode == "off" 
+            new_run.flux_runs[i].nonlinear_mode == "off" 
 
-            new_run.gs2_runs[i].ginit_option = "noise"
-            new_run.gs2_runs[i].delt_option = "default"
-            new_run.gs2_runs[i].is_a_restart = false
-            new_run.gs2_runs[i].restart_id = nil
+            new_run.flux_runs[i].ginit_option = "noise"
+            new_run.flux_runs[i].delt_option = "default"
+            new_run.flux_runs[i].is_a_restart = false
+            new_run.flux_runs[i].restart_id = nil
           end
-          #ep ['gs2_runs[i] after', gs2_runs[i].nwrite, new_run.gs2_runs[i].nwrite, new_run.gs2_runs[i].parameter_hash]
-          #new_run.gs2_runs[i].run_name = new_run.run_name + (i+1).to_s
         end
       end
-      #@runner.submit(new_run)
       new_run
     end
     #  This is a hook which gets called just before submitting a simulation. It sets up the folder and generates any necessary input files.
@@ -184,7 +169,7 @@ class CodeRunner
         setup_chease if uses_chease?
         check_parameters
         write_input_file
-        generate_gs2_input_files if @flux_option == "gs2"
+        generate_flux_input_files if flux_gs2? or flux_gryfx?
     end
 
 
@@ -198,10 +183,10 @@ class CodeRunner
     def update_submission_parameters(parameters, start_from_defaults=true)
       @set_flux_defaults_procs ||= []
       super(parameters, start_from_defaults)
-      if @flux_option == "gs2"
+      if flux_gs2? or flux_gryfx?
         raise "No set_flux_defaults_procs defined" unless @set_flux_defaults_procs.size > 0
         @set_flux_defaults_procs.each{|prc| prc.call}
-        gs2_parameter_hashes = {}
+        flux_parameter_hashes = {}
         if @flux_pars
           @flux_pars.each do |par, val|
             if val.kind_of? Hash
@@ -215,8 +200,8 @@ class CodeRunner
                   range = n..n
                 end
                 for i in range
-                  gs2_parameter_hashes[i] ||= {}
-                  gs2_parameter_hashes[i][par] = v
+                  flux_parameter_hashes[i] ||= {}
+                  flux_parameter_hashes[i][par] = v
                 end
                 #gs2_parameter_hashes[n] ||= {}
                 #gs2_parameter_hashes[n][par] = v
@@ -224,15 +209,15 @@ class CodeRunner
             else
               for i in 0...n_flux_tubes
                 #gs2_runs.each{|r| r.set(par, val)}
-                gs2_parameter_hashes[i] ||= {}
-                gs2_parameter_hashes[i][par] = val
+                flux_parameter_hashes[i] ||= {}
+                flux_parameter_hashes[i][par] = val
               end
             end
           end
         end
         for i in 0...n_flux_tubes
-          gs2_runs[i].parameter_hash = (gs2_parameter_hashes[i] || {}).inspect
-          gs2_runs[i].update_submission_parameters(gs2_runs[i].parameter_hash, false)
+          flux_runs[i].parameter_hash = (flux_parameter_hashes[i] || {}).inspect
+          flux_runs[i].update_submission_parameters(flux_runs[i].parameter_hash, false)
         end
       end
       self
@@ -286,14 +271,14 @@ class CodeRunner
 
     # Writes the gs2 input files, creating separate subfolders
     # for them if @subfolders is .true.
-    def generate_gs2_input_files
+    def generate_flux_input_files
       # At the moment we must use subfolders
       for i in 0...n_flux_tubes
         #gs2run = gs2_run(:base).dup
         #gs2_run(i).instance_variables.each do |var|
           #gs2run.instance_variable_set(var, gs2_run(i).instance_variable_get(var))
         #end
-        gs2run = gs2_runs[i]
+        fluxrun = flux_runs[i]
         #ep ['gs2_runs[i] in generate', gs2_runs[i].nwrite]
         #p ['i',i]
         #if i >= n_flux_tubes_jac
@@ -306,20 +291,20 @@ class CodeRunner
           #folder = "flux_tube_#{jn}"
         #end
 
-        folder = gs2_folder_name(i)
-        run_name = gs2_run_name(i)
+        folder = flux_folder_name(i)
+        run_name = flux_run_name(i)
 
         if @subfolders and @subfolders.fortran_true?
-          gs2run.directory = @directory + "/" + folder
-          FileUtils.makedirs(gs2run.directory)
-          gs2run.relative_directory = @relative_directory + "/" + folder
-          gs2run.restart_dir = gs2run.directory + "/nc"
+          fluxrun.directory = @directory + "/" + folder
+          FileUtils.makedirs(fluxrun.directory)
+          fluxrun.relative_directory = @relative_directory + "/" + folder
+          fluxrun.restart_dir = fluxrun.directory + "/nc"
         else
-          gs2run.directory = @directory
-          gs2run.relative_directory = @relative_directory
+          fluxrun.directory = @directory
+          fluxrun.relative_directory = @relative_directory
         end
-        gs2run.run_name = run_name
-        gs2run.nprocs = @nprocs
+        fluxrun.run_name = run_name
+        fluxrun.nprocs = @nprocs
         if i==0
           block = Proc.new{check_parameters}
         else
@@ -327,15 +312,15 @@ class CodeRunner
         end
         #if @restart_id
           #gs2run.restart_id =
-        Dir.chdir(gs2run.directory) do
-          gs2run.generate_input_file(&block)
-          gs2run.write_info
+        Dir.chdir(fluxrun.directory) do
+          fluxrun.generate_input_file(&block)
+          fluxrun.write_info
         end
 
         ### Hack the input file so that gs2 gets the location of
         # the restart dir correctly within trinity
-        if @subfolders and @subfolders.fortran_true?
-          infile = gs2run.directory + "/" + gs2run.run_name + ".in"
+        if @subfolders and @subfolders.fortran_true? 
+          infile = fluxrun.directory + "/" + fluxrun.run_name + ".in"
           text = File.read(infile)
           File.open(infile, 'w'){|f| f.puts text.sub(/restart_dir\s*=\s*"nc"/, "restart_dir = \"#{folder}/nc\"")}
         end
@@ -377,11 +362,8 @@ class CodeRunner
     def generate_component_runs
       #puts "HERE"
       @component_runs ||= []
-      if @flux_option == "gs2"
-      #puts "HERE"
-      #puts "generate_component_runs", @component_runs.size, @runner.run_list.size, caller.to_a.slice(0..9)
-      #puts @component_runs[1].ginit_option if @component_runs.size > 0
-      #STDIN.gets
+      if flux_gryfx? or flux_gs2?
+        fclass = flux_class
 
         for i in 0...n_flux_tubes
           component = @component_runs[i]
@@ -389,7 +371,7 @@ class CodeRunner
           if not component
             #p "HEELO"
             #p [i, '3,', component, '4', @component_runs.size]
-            component = @component_runs[i] =  Gs2::TrinityComponent.new(@runner, self).create_component
+            component = @component_runs[i] =  fclass.new(@runner, self).create_component
             #component.instance_variable_set(:@output_file, output_file)
             #p [i, '3,', component, '4', @component_runs.size]
             if false
@@ -417,7 +399,7 @@ class CodeRunner
           #component.status = @status
       #p ["HERE2", @component_runs.size, @component_runs[i]]
           #Dir.chdir(@directory) {
-            compdir = gs2_folder_name(i) #  "flux_tube_#{i+1}"
+            compdir = flux_folder_name(i) #  "flux_tube_#{i+1}"
             Dir.chdir(compdir){component.process_directory} if FileTest.exist? compdir
           #}
           component.component_runs = []
@@ -435,27 +417,6 @@ class CodeRunner
     end
 
 
-    def save
-      #@gs2_run_list.values.each{|r| r.runner = nil; r.component_runs = []} if @gs2_run_list.kind_of? Hash
-      super
-      #@gs2_run_list.values.each{|r| r.runner = @runner} if @gs2_run_list.kind_of? Hash
-
-      #logf(:save)
-      #raise CRFatal.new("Something has gone horribly wrong: runner.class is #{@runner.class} instead of CodeRunner") unless @runner.class.to_s == "CodeRunner"
-      #runner, @runner = @runner, nil
-      #@system_triers, old_triers = nil, @system_triers
-      #@component_runs.each{|run| run.runner = nil; run.component_runs = []} if @component_runs
-      ##@component_runs.each{|run| run.runner = nil} if @component_runs
-    ##   logi(self)
-      ##pp self
-      ##@component_runs.each{|ph| ph.instance_variables.each{|var| puts var; pp ph.instance_variable_get(var); STDIN.gets;  puts ph.Marshal.dump(instance_variable_get(var))}} if @component_runs
-      ##instance_variables.each{|var| puts var;  instance_variable_get(var);  puts Marshal.dump(instance_variable_get(var)); STDIN.gets}
-      #Dir.chdir(@directory){File.open(".code_runner_run_data", 'w'){|file| file.puts Marshal.dump(self)}}
-      #@runner = runner
-      #@component_runs.each{|run| run.runner = runner} if @component_runs
-      #@system_triers = old_triers
-    end
-
     @source_code_subfolders = []
 
     # This method, as its name suggests, is called whenever CodeRunner is asked to analyse a run directory. This happens if the run status is not :Complete, or if the user has specified recalc_all(-A on the command line) or reprocess_all (-a on the command line).

data/lib/trinitycrmod/trinity_gs2.rb

@@ -7,8 +7,8 @@
 	#end
 #end
 class CodeRunner
-	class Gs2
-		class TrinityComponent < Gs2
+	class Trinity
+		module TrinityComponent 
 			attr_accessor :trinity_run
 			def initialize(runner, trinity_run)
 				super(runner)
@@ -40,30 +40,37 @@ class CodeRunner
 				@trinity_run = trinrun
 			end
 		end
-	end
-	class Trinity
+
+    class TrinityComponent::Gs2 < CodeRunner::Gs2
+      include TrinityComponent
+    end
+
+    class TrinityComponent::Gryfx < CodeRunner::Gryfx
+      include TrinityComponent
+    end
 
 		# This function creates a new Trinity defaults file, with Trinity parameters taken from 
 		# trinity_input_file, and GS2 parameters taken from gs2_input_file. The file is then moved
 		# to the CodeRunner central defaults location, the current folder is configured to use 
 		# the defaults file.
-		def self.use_new_defaults_file_with_gs2(name = ARGV[-3], trinity_input_file = ARGV[-2], gs2_input_file = ARGV[-1])
-	    raise "Please specify a name, a trinity input file and a gs2 input file" if name == "use_new_gs2_defaults_file"
+		def self.use_new_defaults_file_with_flux(name = ARGV[-4], trinity_input_file = ARGV[-3], flux_input_file = ARGV[-2], fluxcode=ARGV[-1])
+	    raise "Please specify a name, a trinity input file and a flux code input file" if name == "use_new_defaults_file_with_flux"
 	    defaults_filename = "#{name}_defaults.rb"
-			tmp_filename = "#{name}_gs2tmp_defaults.rb"
+			tmp_filename = "#{name}_flxtmp_defaults.rb"
 			central_defaults_filename = rcp.user_defaults_location + "/" + defaults_filename
-			FileUtils.rm(name + '_defaults.rb') if FileTest.exist?(name + '_defaults.rb')
-			FileUtils.rm(central_defaults_filename) if FileTest.exist?(central_defaults_filename)
+			#FileUtils.rm(name + '_defaults.rb') if FileTest.exist?(name + '_defaults.rb')
+			#FileUtils.rm(central_defaults_filename) if FileTest.exist?(central_defaults_filename)
 			FileUtils.rm(tmp_filename) if FileTest.exist?(tmp_filename)
 			raise "Defaults file: #{central_defaults_filename} already exists" if FileTest.exist? central_defaults_filename
 
+      flxclass = flux_class(fluxcode)
 
 			make_new_defaults_file(name, trinity_input_file)
-			CodeRunner::Gs2.make_new_defaults_file(name + '_gs2tmp', gs2_input_file)
+			flxclass.make_new_defaults_file(name + '_flxtmp', flux_input_file)
 
 			File.open(defaults_filename, 'a'){|file| file.puts <<EOF2
 @set_flux_defaults_procs.push(Proc.new do
-gs2_runs.each do |run|
+flux_runs.each do |run|
 run.instance_eval do
 #{File.read(tmp_filename).gsub(/\A|\n/, "\n  ")}
 end
@@ -82,8 +89,9 @@ EOF2
 
 		# Generates the component runs for GS2 and returns the hash
 		# Raises an error if flux_option != "gs2"
-		def gs2_runs
-			raise FluxOptionError.new("gs2_runs called and flux_option != gs2") if not flux_gs2?
+		def flux_runs
+			raise FluxOptionError.new("flux_runs called and flux_option != gs2 or gryfx") if not flux_gs2? or flux_gryfx?
+     
 
 			#puts "2@COMMMMMMMMMMMMMPOOOOOOOOOOOOOONNNETN", @component_runs
 			generate_component_runs if not (@component_runs and @component_runs.size == n_flux_tubes)
@@ -99,14 +107,14 @@ EOF2
 			#@gs2_run_list[key]
 		end
 
-    # Override standard CodeRunner method to allow for Gs2 variables
+    # Override standard CodeRunner method to allow for flux code variables
 		def evaluate_defaults_file(filename)
 			text = File.read(filename)
 			instance_eval(text)
 			text.scan(/^\s*@(\w+)/) do
 				var_name = $~[1].to_sym
 				next if var_name == :defaults_file_description
-				unless rcp.variables.include? var_name or (flux_gs2? and Gs2.rcp.variables.include? var_name)
+				unless rcp.variables.include? var_name or (flux_gs2? and Gs2.rcp.variables.include? var_name) or (flux_gryfx? and Gryfx.rcp.variables.include? var_name)
 					warning("---#{var_name}---, specified in #{File.expand_path(filename)}, is not a variable. This could be an error")
 				end
 			end
@@ -123,12 +131,27 @@ EOF2
 
 		end
 
+    def self.flux_class(code)
+      case code
+      when "gs2"
+        CodeRunner::Trinity::TrinityComponent::Gs2
+      when "gryfx"
+        CodeRunner::Trinity::TrinityComponent::Gryfx
+      end
+    end
+    def flux_class
+      self.class.flux_class(@flux_option)
+    end
 		# Is the flux tube code being used gs2?
 		def flux_gs2?
 			@flux_option == "gs2"
 		end
+		# Is the flux tube code being used gryfx?
+		def flux_gryfx?
+			@flux_option == "gryfx"
+		end
 
-    def gs2_run_name(i)
+    def flux_run_name(i)
       if i >= n_flux_tubes_jac
         jn = i - n_flux_tubes_jac + 1
         run_name = "calibrate_" + @run_name + (jn).to_s
@@ -138,7 +161,7 @@ EOF2
       end 
       run_name
     end
-    def gs2_folder_name(i)
+    def flux_folder_name(i)
       if i >= n_flux_tubes_jac
         jn = i - n_flux_tubes_jac + 1
         folder = "calibrate_#{jn}"

data/trinitycrmod.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.7.3 ruby lib
+# stub: trinitycrmod 0.7.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<coderunner>, [">= 0.16.10"])
       s.add_runtime_dependency(%q<text-data-tools>, [">= 1.1.6"])
       s.add_runtime_dependency(%q<gs2crmod>, [">= 0.11.76"])
+      s.add_runtime_dependency(%q<gryfxcrmod>, [">= 0.1.9"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<coderunner>, [">= 0.16.10"])
       s.add_dependency(%q<text-data-tools>, [">= 1.1.6"])
       s.add_dependency(%q<gs2crmod>, [">= 0.11.76"])
+      s.add_dependency(%q<gryfxcrmod>, [">= 0.1.9"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
@@ -71,6 +73,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<coderunner>, [">= 0.16.10"])
     s.add_dependency(%q<text-data-tools>, [">= 1.1.6"])
     s.add_dependency(%q<gs2crmod>, [">= 0.11.76"])
+    s.add_dependency(%q<gryfxcrmod>, [">= 0.1.9"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Edmund Highcock
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.76
+- !ruby/object:Gem::Dependency
+  name: gryfxcrmod
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement