coderunner 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4523bd885a2ccf5d75df6caf448f0a70e2e1ded
-  data.tar.gz: 6b7bb1c1c707ceb8ab64638a837a4fab4c4aa39a
+  metadata.gz: e194fbfceec78cdf510ade9ff65ecde56149569c
+  data.tar.gz: 91ea94d407b0ce5cb14d119f33edd31b4036780b
 SHA512:
-  metadata.gz: 688cacb761e7a040fbc956ed09c4615adf5648b995613b697f2f89e98842f7c683d5bffa8a926ae3e33c09ff592a8b89787861ad657073a462c6aff77f85edba
-  data.tar.gz: b64b6c69f683c408a3d12ec38031ae46388b31ba436bc47d99470fc1d5115cc1b192b49791d718d6b977f5aecf43d847f49dc4e914002c6d98df581b402dd79b
+  metadata.gz: 6571b626cb20ed104a0110a12f5e22f15d94f3e6fd25633300e62078df211ec2c745264a40e9305a2b7da67bc128c808ffa757af37e2c18e42ea60a53c032eba
+  data.tar.gz: 3a730a25cdb803041787252aeb915c9cef0c9ddd482168377a08d5a606fdd741148681c86334e6cef27a6307607729c1da624c8a0fb0e301409e5bae0129d4f3

data/VERSION

@@ -1 +1 @@
-0.16.2
+0.16.3

data/bin/coderunnerrepo

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'coderunner/repository_manager.rb'
+rescue LoadError
+  require 'rubygems'
+  require 'coderunner/repository_manager.rb'
+end
+
+CommandLineFlunky.run_script

data/coderunner.gemspec

@@ -2,20 +2,20 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.16.2 ruby lib
+# stub: coderunner 0.16.3 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.2"
+  s.version = "0.16.3"
 
   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-05-17"
+  s.date = "2015-05-19"
   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"]
+  s.executables = ["coderunner", "coderunnerrepo"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/coderunner",
+    "bin/coderunnerrepo",
     "coderunner.gemspec",
     "ext/code_runner_ext.c",
     "ext/extconf.rb",

data/lib/coderunner/fortran_namelist.rb

@@ -761,10 +761,19 @@ end
 def self.use_new_defaults_file(name=ARGV[-2], input_file=ARGV[-1])
 	raise "Please specify a name and an input file" if name == "use_new_defaults_file"
 	defaults_filename = "#{name}_defaults.rb"
-	central_defaults_filename = rcp.user_defaults_location + "/" + defaults_filename
+
+	central_defaults_filename = defaults_location_list[0] + "/" + defaults_filename
 	raise "Defaults file: #{central_defaults_filename} already exists" if FileTest.exist? central_defaults_filename
 	make_new_defaults_file(name, input_file)
 	FileUtils.mv(defaults_filename, central_defaults_filename)
+  if Repository.repo_folder
+    repo = Repository.open_in_subfolder(Dir.pwd)
+    repo.add(central_defaults_filename)
+    repo.autocommit("Added defaults file #{defaults_filename}")
+  end #{defaults_filename}")
+#end #{defaults_filename}")
+  #end
+
 	#modlet = rcp.modlet? ? rcp.modlet : nil
 	#executable = rcp.executable? ? rcp.executable : CodeRunner::DEFAULT_RUNNER_OPTIONS
 	CodeRunner.fetch_runner(D: name) #(C: rcp.code, m: rcp.modlet, D: name, CodeRunner)

data/lib/coderunner/instance_methods.rb

@@ -175,7 +175,7 @@ class CodeRunner
       repo = Repository.open_in_subfolder(@root_folder)
       Dir.chdir(@root_folder) do
         repo.add('.code_runner_script_defaults.rb')
-        repo.autocommit("Updated script defaults in #{repo.relative_path}")
+        repo.autocommit("Updated script defaults in #{repo.relative_path}") if repo.modified? '.code_runner_script_defaults'
         #repo.add('.code-runner-irb-save-history')
       end
     end
@@ -1204,7 +1204,7 @@ Conditions contain a single = sign: #{conditions}
 				Dir.chdir(run.directory){traverse_directories}
 
 			end
-      if is_in_repo? @root_folder
+      if is_in_repo? @root_folder and not @test_submission
         runs.each do |run| 
           Dir.chdir(run.directory){run.add_to_repo}
         end
@@ -1571,6 +1571,13 @@ EOF
 		ids.each{|id| 
 			FileUtils.rm_r @run_list[id].directory if @run_list[id].directory and not ["", ".", ".."].include? @run_list[id].directory
 			@run_list.delete(id); @ids.delete(id); generate_combined_ids}
+    if is_in_repo?
+      repo = Repository.open_in_subfolder(@root_folder)
+      Dir.chdir(@root_folder){ 
+        repo.deleted_in_folder(Dir.pwd).each{|k,f| repo.add(repo.dir.to_s + '/' + f.path)}
+      }
+      repo.autocommit("Deleted simulations with ids #{ids} in folder #{repo.relative_path(@root_folder)}")
+    end
 		set_max_id(@ids.max || 0)
 		save_large_cache
 		generate_combined_ids

data/lib/coderunner/interactive_methods.rb

@@ -18,11 +18,12 @@ class CodeRunner
 			@runner = CodeRunner.fetch_runner(CodeRunner::DEFAULT_COMMAND_OPTIONS.dup) unless CodeRunner::DEFAULT_COMMAND_OPTIONS[:q]
 			@r = @runner
       if @r
-        if FileTest.exist?(@r.root_folder + '/.code-runner-irb-save-history')
+        histfile = @r.root_folder + '/.code-runner-irb-save-history'
+        if FileTest.exist?(histfile)
           if @r.is_in_repo?
             repo = Repository.open_in_subfolder(@r.root_folder)
-            repo.add(@r.root_folder + '/.code-runner-irb-save-history')
-            repo.autocommit("--Updated save history in #{repo.relative_path(@r.root_folder)}")
+            repo.add(histfile)
+            repo.autocommit("Updated save history in #{repo.relative_path(@r.root_folder)}") if repo.modified? histfile
           end
         end
       end

data/lib/coderunner/repository.rb

@@ -33,14 +33,21 @@ class CodeRunner
   class Repository < Git::Base
     # Create a coderunner repo, which consists of a
     # twin set of a bare repo and a clone of that
-    # repo. folder must end in '.git'
+    # repo. folder must end in '.cr.git'
     #
+    def self.url_regex
+      (/(?:ssh:\/\/)?(?<namehost>[^\/:]+):?(?<folder>.*$)/)
+    end
+    def self.bare_ext_reg
+      /\.cr\.git$/
+    end
+
     def self.init(folder)
       if folder =~ /\.git$/
-        raise "Please do not add '.git' to the end of #{folder}. Two repositories will be created: a bare repo ending in .git and a clone of this bare repo"
+        raise "Please do not add '.git' to the end of #{folder}. Two repositories will be created: a bare repo ending in .cr.git and a clone of this bare repo"
       end
-      super(folder + '.git', bare: true)
-      repo = clone(folder + '.git', folder)
+      super(folder + '.cr.git', bare: true)
+      repo = clone(folder + '.cr.git', folder)
       repo.init_metadata
       repo.init_readme
       repo.init_defaults_folder
@@ -71,7 +78,7 @@ class CodeRunner
     # Returns a Git::Base object referring to the bare twin 
     # repository.
     def bare_repo
-      @bare_repo ||= Git::Base.open(dir.to_s + '.git')
+      @bare_repo ||= Git::Base.open(dir.to_s + '.cr.git')
     end
     def relative_path(folder=Dir.pwd)
       File.expand_path(folder).sub(File.expand_path(dir.to_s) + '/', '')
@@ -152,34 +159,33 @@ Created on: #{Time.now.to_s}
 EOF
     end
     def split_url(remote_name)
-      bare_repo.remote(remote_name).url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
+      bare_repo.remote(remote_name).url =~ Repository.url_regex
       namehost = $~[:namehost]
-      folder = $~[:folder]
-      return [namehost, folder]
+      barefolder = $~[:folder]
+      self.class.check_bare_ext(barefolder)
+      folder = barefolder.sub(/\.cr\.git$/, '')
+      return [namehost, folder, barefolder]
+    end
+    def modified_in_folder(folder)
+      (status.changed + status.added + status.deleted).find_all{|k,f| File.expand_path(dir.to_s + '/' + f.path).include?(File.expand_path(folder))}
     end
-    def changed_in_folder(folder)
-      status.changed.find_all{|k,f| File.expand_path(dir.to_s + '/' + f.path).include?(File.expand_path(folder))}
+    alias :changed_in_folder :modified_in_folder
+    def deleted_in_folder(folder)
+      (status.deleted).find_all{|k,f| File.expand_path(dir.to_s + '/' + f.path).include?(File.expand_path(folder))}
+    end
+    def modified?(file)
+      (status.changed + status.added).find{|k,f| File.expand_path(dir.to_s + '/' + f.path).include?(File.expand_path(file))}
     end
     # Bring all files in the given folder from 
     # the given remote. (Obviously folder must 
     # be a subfolder within the repository).
     def rsyncd(remote_name, folder)
-      #f2 = File.expand_path(folder)
-      namehost, remote_folder = split_url(remote_name)
+      namehost, remote_folder, _barefolder = split_url(remote_name)
       rpath = relative_path(folder)
       if File.expand_path(folder) == File.expand_path(dir.to_s)
         raise "Cannot run rsyncd in the top level of a repository"
       end 
       string =  "rsync -av #{namehost}:#{remote_folder}/#{rpath}/ #{folder}/"
-      #Dir.chdir(folder) do
-        #FileUtils.touch('dummyfile')
-        #add('dummyfile')
-        #autocommit_all('--Added dummyfile')
-        #system "echo 'Hello' >> dummyfile"
-        ##add('dummyfile')
-      #end
-      #p status.changed.map{|k,f| [p1=File.expand_path(folder), p2=File.expand_path(dir.to_s + '/' + f.path), p2.include?(p1), p1.include?(p2)]}
-      #p changed_in_folder(folder).map{|k,f| f.path}
       if changed_in_folder(folder).size > 0
         raise "You have some uncommitted changes in the folder #{folder}. Please commit these changes before calling rsyncd"
       end
@@ -190,34 +196,41 @@ EOF
     # the given remote. (Obviously folder must 
     # be a subfolder within the repository).
     def rsyncu(remote_name, folder)
-      #f2 = File.expand_path(folder)
-      namehost, remote_folder = split_url(remote_name)
+      namehost, remote_folder, _barefolder = split_url(remote_name)
       rpath = relative_path(folder)
       if File.expand_path(folder) == File.expand_path(dir.to_s)
         raise "Cannot run rsyncd in the top level of a repository"
       end 
       string =  "rsync -av  #{folder}/ #{namehost}:#{remote_folder}/#{rpath}/"
-      #p status.changed.map{|k,f| [p1=File.expand_path(folder), p2=File.expand_path(dir.to_s + '/' + f.path), p2.include?(p1), p1.include?(p2)]}
-      #p changed_in_folder(folder).map{|k,f| f.path}
 
       cif = `ssh #{namehost} "cd #{remote_folder}/#{rpath} && echo "START" && git status"`
-      #p cif
       if cif =~ /START.*modified/m
         raise "You have some uncommitted changes in the remote folder #{rpath}. Please commit these changes before calling rsyncu"
       end
       puts string
       system string
     end
-
+    
     def add_remote(name, url)
-      url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
+      url =~ Repository.url_regex
       barefolder = $~[:folder]
-      unless barefolder =~ /\.git$/
-        raise "All remotes must end in .git for coderunnerrepo"
+      unless barefolder =~ Repository.bare_ext_reg
+        raise "All remotes must end in .cr.git for coderunnerrepo"
       end
       super(name, url)
     end
 
+    # Check that barefolder ends in .cr.git
+    def self.check_bare_ext(barefolder)
+      unless barefolder =~ bare_ext_reg
+        raise "Remotes must end in .cr.git for coderunnerrepo"
+      end
+    end
+
+    def bare_ext_reg
+      self.class.bare_ext_reg
+    end
+
     alias :simple_pull :pull
 
     # Pull from the given remote object. remote must be a remote
@@ -225,14 +238,7 @@ EOF
     # NOT a remote from the coderunner repo (which only ever has
     # one remote: origin, corresponding to the bare repo).
     def pull(remote)
-      remote.url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
-      namehost = $~[:namehost]
-      folder = $~[:folder]
-      barefolder = folder + '.git'
-      p namehost, barefolder
-      if folder =~ /\.git$/
-        raise "Remotes must not end in .git for coderunnerrepo"
-      end
+      namehost, folder, _barefolder = split_url(remote.name)
       try_system %[ssh #{namehost} "cd #{folder} && git push origin"]
       bare_repo.pull(remote)
       simple_pull(remote('origin'))
@@ -250,14 +256,7 @@ EOF
     # bare repo to the remote, then pull remote repos from the 
     # remote bare repos.
     def push(remote)
-      remote.url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
-      namehost = $~[:namehost]
-      folder = $~[:folder]
-      barefolder = folder + '.git'
-      p namehost, barefolder
-      if folder =~ /\.git$/
-        raise "Remotes must not end in .git for coderunnerrepo"
-      end
+      namehost, folder, _barefolder = split_url(remote.name)
       simple_push(remote('origin'))
       bare_repo.push(remote)
       try_system %[ssh #{namehost} "cd #{folder} && git pull origin"]

data/lib/coderunner/repository_manager.rb

@@ -50,13 +50,16 @@ EXAMPLES
 EOF
 
   COMMANDS_WITH_HELP = [
-    ['add_remote', 'adrm', 2,  'Add a remote url to the repository. The url must not end in \'.git\'', ['name', 'url'], [:Y]],
+    ['add_remote', 'adrm', 2,  'Add a remote url to the repository. The url must end in \'.git\'', ['name', 'url'], [:Y]],
     ['add_folder', 'add', 1,  'Add the folder to the repository... this adds the directory tree and all coderunner data files to the repository, e.g. .code_runner_info.rb, script defaults, command histories etc. Note that this command must be issued in the root of the repository, or with the -Y flag giving the root of the repository.', ['folder'], [:Y]],
-    ['init_repository', 'init', 1,  'Create a new repository with the given name.', ['name'], []],
-    ['pull_repository', 'pull', 2,  'Pull repository from all remotes, or from a comma-separated list of remotes given by the -r option.', ['name', 'url'], [:r, :Y]],
-    ['push_and_create_repository', 'pushcr', 2,  'Push to a comma-separated list of remotes given by the -r option; this command assumes that there is no repository on the remote and creates a bundle which is then copied to and cloned on the remote destination to create the repository.', ['name', 'url'], [:r, :Y]],
-    ['push_repository', 'push', 2,  'Push repository to all remotes, or to a comma-separated list of remotes given by the -r option.', ['name', 'url'], [:r, :Y]],
+    ['bare_repo_command', 'brc', 1,  'Execute the given command within the twin bare repository', ['command'], [:Y]],
+    ['init_repository', 'init', 1,  'Create a new repository with the given name. The name must not end in ".git". In fact, two repositories will be created, a working repo and a bare repo ending in cr.git. The bare repo is used to send and receive changes to remotes: the working repo should only push and pull to and from its twin bare repo.', ['name'], []],
+    ['list_remotes', 'lsr', 0,  'List remotes in the bare repository (the working repository should only have one remote: origin.', [], [:Y]],
+    ['pull_repository', 'pull', 0,  'Pull repository from all remotes, or from a comma-separated list of remotes given by the -r option.', [], [:r, :Y]],
+    ['push_and_create_repository', 'pushcr', 0,  'Push to a comma-separated list of remotes given by the -r option; this command assumes that there is no repository on the remote and creates twin pair of a bare repo and a working checkout.', [], [:r, :Y]],
+    ['push_repository', 'push', 0,  'Push repository to all remotes, or to a comma-separated list of remotes given by the -r option.', [], [:r, :Y]],
     ['remote_synchronize_down', 'rsyncd', 2,  'Bring the contents of the remote folder corresponding to the given folder (which must be a subfolder of a local coderunner repository) to the local system. The folder cannot be the top level of the repository. This command uses rsync to actually copy the files. The --delete option is not specified (i.e. files that do not exist on the remote will not be deleted).', ['remote', 'folder'], []],
+    ['remote_synchronize_up', 'rsyncu', 2,  'Send the contents of the given folder (which must be a subfolder of a local coderunner repository) to the remote folder corresponding to it. The folder cannot be the top level of the repository. This command uses rsync to actually copy the files. The --delete option is not specified (i.e. files that do not exist in the folder).', ['remote', 'folder'], []],
     ['set_repo_metadata', 'mdata', 1,  "Give a hash of metadata to modify e.g., '{autocommit: false}. Things that can be modified are: autocommit: true/false, automatically commit repo changes made by CodeRunner, default true'.", ['hash'], [:Y]],
 
   ]
@@ -113,14 +116,22 @@ class CodeRunner
       def verbosity
         2
       end
+      def bare_repo_command(comm, copts)
+        Dir.chdir(copts[:Y]) do
+          repo = Repository.open_in_subfolder(Dir.pwd)
+          Dir.chdir(repo.bare_repo.dir.to_s) do
+            system comm
+          end
+        end
+      end
       def init_repository(name, copts)
         Repository.init(name)
       end
       def add_remote(name, url, copts)
-        url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
-        folder = $~[:folder]
-        if folder =~ /\.git$/
-          raise "Remotes cannot end in .git for coderunnerrepo"
+        url =~ Repository.url_regex
+        barefolder = $~[:folder]
+        unless barefolder =~ Repository.bare_ext_reg
+          raise "Remotes must end in .cr.git for coderunnerrepo"
         end
         Dir.chdir(copts[:Y]){
           repo = Repository.open_in_subfolder(Dir.pwd)
@@ -142,37 +153,28 @@ class CodeRunner
           end
           repo.simple_push(repo.remote("origin"))
           rems.each do |r|
-            r.url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
-            namehost = $~[:namehost]
-            folder = $~[:folder]
-            barefolder = folder + '.git'
-            p namehost, barefolder
-            if folder =~ /\.git$/
-              raise "Remotes must not end in .git for coderunnerrepo"
-            end
-            #barefolder =folder.sub(/\/+$/, '') + '.git'
-            #try_system %[git bundle create .tmpbundle --all]
+            namehost, folder, barefolder = repo.split_url(r.name)
             try_system %[ssh #{namehost} "mkdir -p #{barefolder} && cd #{barefolder} && git init --bare"]
             bare_repo.push(r)
             try_system %[ssh #{namehost} "git clone #{barefolder} #{folder}"]
-            #try_system %[scp .tmpbundle #{namehost}:#{folder}/../.]
-            #try_system %[rm .tmpbundle]
-            #try_system %[ssh #{namehost} "cd #{folder} && git clone .tmpbundle #{repname = File.basename(repo.dir.to_s)} "]
-            #try_system %[ssh #{namehost} "cd #{folder} && git clone ../.tmpbundle ."]
-            #try_system %[ssh #{namehost} "cd #{folder}/#{repname} && git remote rm origin"]
-            #try_system %[ssh #{namehost} "cd #{folder} && git remote rm origin"]
-            #push_repository(copts.dup.absorb(r: r.name))
             bare_repo.remotes.each do |other_remote|
               next if other_remote.name == r.name
-              try_system %[ssh #{namehost} "cd #{folder} && git remote add #{other_remote.name} #{other_remote.url}"]
-              #try_system %[ssh #{namehost} "cd #{folder} && git remote add #{other_remote.name} #{other_remote.url}"]
+              try_system %[ssh #{namehost} "cd #{barefolder} && git remote add #{other_remote.name} #{other_remote.url}"]
             end
           end 
         }
       end
+      def list_remotes(copts)
+        Dir.chdir(copts[:Y]){
+          repo = Repository.open_in_subfolder(Dir.pwd)
+          repo.bare_repo.remotes.each do |r|
+            puts "#{r.name} #{r.url}"
+          end
+        }
+      end
       def push_repository(copts)
         Dir.chdir(copts[:Y]){
-          repo = Repository.open(Dir.pwd)
+          repo = Repository.open_in_subfolder(Dir.pwd)
           if copts[:r]
             rems = copts[:r].split(/,/).map{|rname| repo.bare_repo.remote(rname)} 
           else

data/lib/coderunner/run.rb

@@ -418,18 +418,31 @@ def defaults_file_name
 	end
 end
 
+@code_module_folder = "/dev/null"
+
+# A list of places where defaults files may be found
+
+def self.defaults_location_list
+  locs = [rcp.user_defaults_location, rcp.code_module_folder + "/defaults_files"]
+  if Repository.repo_folder
+    repo = Repository.open_in_subfolder(Dir.pwd)
+    folder = repo.dir.to_s + '/defaults_files/' + rcp.code + 'crmod/'
+    FileUtils.makedirs folder
+    locs.unshift folder
+  end
+  locs
+end
+
+def defaults_location_list
+  self.class.defaults_location_list
+end
+
 # Return the folder where the default defaults file is located.
 
 def defaults_location
-	#if @runner.defaults_file
-		location = [rcp.user_defaults_location, rcp.code_module_folder	+ "/defaults_files"].find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
-		#raise "Defaults file: #{defaults_file_name} not found" unless location
-		raise "Can't find defaults_file #{defaults_file_name} in #{[rcp.user_defaults_location, rcp.code_module_folder	+ "/defaults_files"].join(',')}." unless location
-		location
-		#return location
-	#else
-		#location = [rcp.user_defaults_location, rcp.code_module_folder	+ "/defaults_files"].find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
-	#end
+  location = defaults_location_list.find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
+  raise "Can't find defaults_file #{defaults_file_name} in #{defaults_location_list.join(',')}." unless location
+  location
 end
 
 # Return true if the run is completed, false otherwise
@@ -518,6 +531,14 @@ def update_submission_parameters(parameters, start_from_defaults=true)
 EOF
 			main_defaults_file_text = header + main_defaults_file_text
 			File.open(defaults_file_name, 'w'){|file| file.puts main_defaults_file_text}
+      if @runner.is_in_repo?
+        repo = Repository.open_in_subfolder(Dir.pwd)
+        repo.add(defaults_file_name)
+        repo.autocommit("Added local defaults file #{defaults_file_name} in folder #{Dir.pwd}")
+      end
+                                                                                     #{defaults_file_name} in folder #{Dir.pwd
+                                                                                     ##{defaults_file_name} in folder #{Dir.pwd
+                                                                                     #
 		end
 		#FileUtils.cp("#{defaults_location}/#{defaults_file_name}", defaults_file_name) 
 		

data/test/test_coderunner.rb

@@ -131,12 +131,12 @@ class TestCodeRunner < MiniTest::Test
     p rc
 		assert_equal(@runner.ids.sort, rc.ids.sort)
 		rc.print_out(0)
-		wdvh = rc.graphkit("width:height:depth:volume;;;height")
+		wdvh = rc.graphkit("width:height:depth:volume;;;volume")
 		#wdvh.gnuplot
 		assert_equal(4, wdvh.naxes)
 		assert_equal(1, wdvh.data.size)
-		assert_equal([30.0, 18.0, 24.0, 108.0, 27.0, 198.0], wdvh.data[0].axes[:f].data)
-		sds = rc.run_graphkit('sides;;[1,2].include? id')
+		assert_equal([18.0, 24.0, 27.0, 30.0, 108.0, 198.0], wdvh.data[0].axes[:f].data)
+		_sds = rc.run_graphkit('sides;;[1,2].include? id')
 		str = "A very very very looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooonnnnnnnnnnnnnnnnnnnnnnnnnng string"
 		str2 = rc.retrieve(str.inspect)
 		assert_equal(str, str2)

data/test/test_coderunnerrepo.rb

@@ -37,12 +37,12 @@ class TestCreate < MiniTest::Test
   def test_create
     Dir.chdir(tfolder) {
       assert_system("#$coderunnerrepo_command init myrepo")
-      assert_system("#$coderunnerrepo_command adrm local ssh://#{ENV['USER']}@localhost/#{Dir.pwd}/remote -Y myrepo")
+      assert_system("#$coderunnerrepo_command adrm local ssh://#{ENV['USER']}@localhost/#{Dir.pwd}/remote.cr.git -Y myrepo")
       #assert_system("#$coderunnerrepo_command adrm local ssh://#{ENV['USER']}@#{`hostname`.chomp}.local/#{Dir.pwd}/remote.git -Y myrepo")
-      assert_system("#$coderunnerrepo_command adrm dummy ssh://dummyuser@nohost/#{Dir.pwd}/remote -Y myrepo")
+      assert_system("#$coderunnerrepo_command adrm dummy ssh://dummyuser@nohost/#{Dir.pwd}/remote.cr.git -Y myrepo")
       assert_system("#$coderunnerrepo_command pushcr -r local -Y myrepo")
       #assert_equal(false, system("#$coderunnerrepo_command pushcr -r local -Y myrepo"))
-      assert_system("cd myrepo.git; git remote rm dummy")
+      assert_system("cd myrepo.cr.git; git remote rm dummy")
       assert_system("#$coderunnerrepo_command pull -Y myrepo")
       assert_system("#$coderunnerrepo_command push -Y myrepo")
       FileUtils.makedirs(dffolder)
@@ -53,6 +53,11 @@ class TestCreate < MiniTest::Test
       FileUtils.makedirs('myrepo/sims')
       Dir.chdir('myrepo/sims') do
         CodeRunner.submit(C: 'cubecalc', m: 'empty', X: '../../cubecalc')
+        CodeRunner.submit(C: 'cubecalc', m: 'empty', X: '../../cubecalc')
+        r = CodeRunner.fetch_runner
+        r.conditions = 'id==2'
+        r.destroy no_confirm: true
+        #CodeRunner.delete(j: 2)
         FileUtils.touch('.code-runner-irb-save-history')
         Dummy.new.setup_interactive
       end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: parallelpipes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubyhacks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rb-gsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: gsl_extras
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hostmanager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: command-line-flunky
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: CodeRunner is a framework for the automated running and analysis of simulations.
@@ -187,6 +187,7 @@ description: CodeRunner is a framework for the automated running and analysis of
 email: edmundhighcock@sourceforge.net
 executables:
 - coderunner
+- coderunnerrepo
 extensions:
 - ext/extconf.rb
 extra_rdoc_files:
@@ -194,7 +195,7 @@ extra_rdoc_files:
 - README.md
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -202,6 +203,7 @@ files:
 - Rakefile
 - VERSION
 - bin/coderunner
+- bin/coderunnerrepo
 - coderunner.gemspec
 - ext/code_runner_ext.c
 - ext/extconf.rb
@@ -274,12 +276,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []