coderunner 0.11.23 → 0.12.0

data/VERSION

@@ -1 +1 @@
-0.11.23
+0.12.0

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.11.23"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-03-01"
+  s.date = "2013-03-08"
   s.description = "CodeRunner is a framework for the automated running and analysis of simulations. It automatically generates any necessary input files, organises the output data and analyses it. Because it is a modular system, it can easily be customised to work with any system and any simulation code. One of its greatest strengths is that it is independent of any one simulation code; thus it can easily plot and compare the data from different codes."
   s.email = "edmundhighcock@sourceforge.net"
   s.executables = ["coderunner"]

data/lib/coderunner.rb

@@ -203,6 +203,7 @@ EOF
 		["code_runner_execute", "crex",  1, 'Run (within the CodeRunner class) the fragment of Ruby code given.', ['Ruby fragment'], []],	
 		["delete", "del", 0, 'Permanently erase all filtered runs.', [], [:j, :F, :U, :N]],
 		["directory", "dir", 1, 'Print out the directory for the given run.', ['id'], []],
+		['dumb_film', "dfm", 0, 'Create a film of the specified graphkits using gnuplot "dumb" ASCII terminal.', [], [:F, :G, :g, :U, :N, :j, :f]],
 		["execute", "ex",  1, 'Run (at the top level) the fragment of Ruby code given.', ['Ruby fragment'], []],	
 		['film', "fm", 0, 'Create a film of the specified graphkits.', [], [:F, :G, :g, :U, :N, :j, :f]],
 		["generate_modlet_from_input_file", "gm", 1, 'Deprecated', [], []],

data/lib/coderunner/class_methods.rb

@@ -77,6 +77,28 @@ class CodeRunner
 		runner.destroy
 	end
 	
+	def self.dumb_film(copts = {})
+# 		process_copts(copts)
+		#old_term = GraphKit::GNUPLOT_DEFAULT_TERM
+		size = Terminal.terminal_size
+		size[0] -= 2
+		term = "dumb #{size.reverse.join(' ')}"
+		string = "\n" * size[0]
+
+		runner = fetch_runner(copts)
+		string_to_eval = copts[:w]
+		frame_array = copts[:F][:frame_array] || copts[:F][:fa]
+		index_name = copts[:F][:index_name] || copts[:F][:in]
+		#options = (options and options =~ /\S/) ? eval(options): {}
+		puts string
+		for index in frame_array[0]..frame_array[1]
+			string.true_lines.times{print "\033[A"}
+			kit = runner.graphkit_from_lists(copts[:G], copts[:g], index_name => index)
+      kit.gp.term =  term
+			kit.gnuplot(eval: string_to_eval)
+			sleep(copts[:F][:fr] ? 1.0/copts[:F][:fr] :  0.1)
+		end 
+	end
 # 	def self.executable_name # :nodoc:
 # 		""
 # 	end
@@ -205,13 +227,17 @@ EOF
 	
 	end
   
+	def self.launcher_directory
+		ENV['HOME'] + "/.coderunner/to_launch/#{ENV['CODE_RUNNER_LAUNCHER']}"
+	end
   def self.start_launcher(refresh, max_queue, copts={})
 		raise "Raise refresh is #{refresh}: it must be >= 1" if refresh.to_i < 1
 		raise "Raise max_queue is #{max_queue}: it must be >= 5" if max_queue.to_i < 5
     #raise "Launcher already running" if %x[ps -e -o cmd].split("\n").grep(/coderunner\s+launch/).size > 0
     require 'thread'
-    tl = ENV['HOME'] + "/.coderunner_to_launch_#{ENV['CODE_RUNNER_LAUNCHER']}" #SCRIPT_FOLDER + '/to_launch'
-		exit unless Feedback.get_boolean( "Launch directory #{tl} already exists: it is suggested that you change the prefix by changing the environment variable CODE_RUNNER_LAUNCHER. Do you wish to continue (don't select yes unless you know what you are doing)?") if FileTest.exist? tl
+    tl = launcher_directory #SCRIPT_FOLDER + '/to_launch'
+		#exit unless Feedback.get_boolean( "Launch directory #{tl} already exists: it is suggested that you change the prefix by changing the environment variable CODE_RUNNER_LAUNCHER. Do you wish to continue (don't select yes unless you know what you are doing)?") if FileTest.exist? tl
+		raise "Launch directory #{tl} already exists: it is suggested that you change the prefix by changing the environment variable CODE_RUNNER_LAUNCHER. Do you wish to continue (don't select yes unless you know what you are doing)?" if FileTest.exist? tl
 #     FileUtils.rm_r tl if FileTest.exist? tl
     eputs "Starting launcher\n"
 		at_exit{FileUtils.rm_r tl}

data/lib/coderunner/instance_methods.rb

@@ -240,17 +240,25 @@ class CodeRunner
 	
 	def read_folder_defaults
 # 		p @root_folder + '/.code_runner_script_defaults.rb'
-		Hash.phoenix(@root_folder + '/.code_runner_script_defaults.rb') do |hash|
-# 			ep hash
+		if ENV['CODE_RUNNER_READONLY_DEFAULTS']
+			hash = eval(File.read(@root_folder + '/.code_runner_script_defaults.rb'))
 			FOLDER_DEFAULTS.each do |var|
-# 				p send(var), hash[var]
-				hash[var] = (send(var) or hash[var])
-				hash[:code_runner_version] ||= CodeRunner::CODE_RUNNER_VERSION.to_s
-				set(var, hash[var])
+				set(var, hash[var]) if hash[var]
+			end
+		else
+
+			Hash.phoenix(@root_folder + '/.code_runner_script_defaults.rb') do |hash|
+	# 			ep hash
+				FOLDER_DEFAULTS.each do |var|
+	# 				p send(var), hash[var]
+					hash[var] = (send(var) or hash[var])
+					hash[:code_runner_version] ||= CodeRunner::CODE_RUNNER_VERSION.to_s
+					set(var, hash[var])
+				end
+				@start_id = hash[:start_id] if hash[:start_id]
+	# 			ep "start_id: #@start_id"
+				hash
 			end
-			@start_id = hash[:start_id] if hash[:start_id]
-# 			ep "start_id: #@start_id"
-			hash
 		end
 		
 		raise "No default information exists for this folder. If you are running CodeRunner from the commmand line please run again with the -C <code> and -X <executable> (and -m <modlet>, if required) flag (you only need to specify these flags once in each folder). Else, please specify :code and :executable (and :modlet if required) as options in CodeRunner.new(folder, options)" unless @code and @executable

data/lib/coderunner/system_modules/generic_linux.rb

@@ -41,7 +41,7 @@ def execute
 # 	pid = spawn("trap '' 2 && trap '' 0 && " + run_command + " & ")
   if prefix = ENV['CODE_RUNNER_LAUNCHER']
     launch_id = "#{Time.now.to_i}#{$$}"
-    fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
+    fname = CodeRunner.launcher_directory + "/#{launch_id}"
     File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
     sleep 1 until FileTest.exist? fname + '.pid'
     pid = File.read(fname + '.pid').to_i

data/lib/coderunner/system_modules/moab.rb

@@ -14,8 +14,8 @@ EOF
 				
 	def queue_status
 		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status.txt | grep sh]  +
-			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status2.txt | grep sh] 
+			%x[cat #{CodeRunner.launcher_directory}/queue_status.txt | grep sh]  +
+			%x[cat #{CodeRunner.launcher_directory}/queue_status2.txt | grep sh] 
 		else
 			%x[qstat | grep $USER]
 		end
@@ -48,7 +48,7 @@ EOF
 	def execute
 		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
 			launch_id = "#{Time.now.to_i}#{$$}"
-			fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
+			fname = "#{CodeRunner.launcher_directory}/#{launch_id}"
 			File.open(fname + '.start', 'w'){|file| file.print "cd #{Dir.pwd};", run_command, "\n"}
 			sleep 2 until FileTest.exist? fname + '.pid'
 			pid = File.read(fname + '.pid').to_i
@@ -107,7 +107,7 @@ EOF
 
 	def cancel_job
 		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-			 fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{$$}.stop"
+			 fname = CodeRunner.launcher_directory + "/#{$$}.stop"
 			 File.open(fname, 'w'){|file| file.puts "\n"}
 		else
 			`qdel #{@job_no}`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.11.23
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit