coderunner 0.15.13 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdaa33a0e55c8b08f7a428e1437ff88bbfb2098d
-  data.tar.gz: 93fb05648880a150f5bbc3bce9713c64dd97d803
+  metadata.gz: 36a2ab737409ab9ede37d1a6f47e46a04010e9da
+  data.tar.gz: 71e146afb88edc85f38f22383143a2b8f7733de3
 SHA512:
-  metadata.gz: 67d87ac7d6d8793c7dc3ab8deaa3dcb4de405f4cc0388fd625c93c66681e7bf0775664504f1a6f217078cbb6f1cc21603bd457ee6044fab4a5e6063042da7f7d
-  data.tar.gz: 981c6767312f1ed06f6d555a5ef5c74da9cf77a15b6346363593d8d9b51d306e69b712c49ccea4832d548e3d9be8f96c0d5d03823d4e4150a1b56d6f23660626
+  metadata.gz: cee9710214d38427cf1b31e4c7625285a0ca91f0a2fca81f94045fe36f999d88a2829b27ab910971ebfb0d627d1c77ee73905a47dc95ae158169416f1da1b9ce
+  data.tar.gz: df4bf451b827b51a5c76f0520cd7cb8c8999e992abcaa44d56c25b6bb2025cb7a023695bb485bb72b1a2e634a76307454d2e29453cbec9ab7df0b5b1e22af3a2

data/Gemfile

@@ -9,6 +9,8 @@ source "http://rubygems.org"
   gem "gsl_extras", ">= 0.3.0"
   #gem "ruby-netcdf", ">= 0.6.6"
 	gem "hostmanager", "> 0.1.0"
+	gem "command-line-flunky", "> 0.1.0"
+  gem "git", ">= 1.2.9"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.15.13
+0.16.0

data/coderunner.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.15.13 ruby lib
+# stub: coderunner 0.16.0 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.15.13"
+  s.version = "0.16.0"
 
   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-04-09"
+  s.date = "2015-05-13"
   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"]
@@ -50,6 +50,8 @@ Gem::Specification.new do |s|
     "lib/coderunner/long_regexen.rb",
     "lib/coderunner/merged_code_runner.rb",
     "lib/coderunner/remote_code_runner.rb",
+    "lib/coderunner/repository.rb",
+    "lib/coderunner/repository_manager.rb",
     "lib/coderunner/run.rb",
     "lib/coderunner/system_modules/archer.rb",
     "lib/coderunner/system_modules/blue_joule.rb",
@@ -89,13 +91,14 @@ Gem::Specification.new do |s|
     "test/fortran_namelist.in",
     "test/helper.rb",
     "test/old_test.rb",
-    "test/test_coderunner.rb"
+    "test/test_coderunner.rb",
+    "test/test_coderunnerrepo.rb"
   ]
   s.homepage = "http://coderunner.sourceforge.net"
   s.licenses = ["GPLv3"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.rubyforge_project = "coderunner"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "A framework for the automated running and analysis of simulations."
 
   if s.respond_to? :specification_version then
@@ -108,6 +111,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rb-gsl>, [">= 1.12.0"])
       s.add_runtime_dependency(%q<gsl_extras>, [">= 0.3.0"])
       s.add_runtime_dependency(%q<hostmanager>, ["> 0.1.0"])
+      s.add_runtime_dependency(%q<command-line-flunky>, ["> 0.1.0"])
+      s.add_runtime_dependency(%q<git>, [">= 1.2.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"])
@@ -119,6 +124,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rb-gsl>, [">= 1.12.0"])
       s.add_dependency(%q<gsl_extras>, [">= 0.3.0"])
       s.add_dependency(%q<hostmanager>, ["> 0.1.0"])
+      s.add_dependency(%q<command-line-flunky>, ["> 0.1.0"])
+      s.add_dependency(%q<git>, [">= 1.2.9"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
@@ -131,6 +138,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rb-gsl>, [">= 1.12.0"])
     s.add_dependency(%q<gsl_extras>, [">= 0.3.0"])
     s.add_dependency(%q<hostmanager>, ["> 0.1.0"])
+    s.add_dependency(%q<command-line-flunky>, ["> 0.1.0"])
+    s.add_dependency(%q<git>, [">= 1.2.9"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])

data/lib/coderunner.rb

@@ -70,7 +70,7 @@ require "getoptlong"
 require "thread"
 require "fileutils"
 require "drb"
-require "test/unit/assertions"
+#require "test/unit/assertions"
 require 'parallelpipes'
 require 'find'
 
@@ -112,6 +112,8 @@ load CodeRunner::SCRIPT_FOLDER + "/fortran_namelist.rb"
 eprint '.' unless $has_put_startup_message_for_code_runner
 load CodeRunner::SCRIPT_FOLDER + "/fortran_namelist_c.rb"
 eprint '.' unless $has_put_startup_message_for_code_runner
+load CodeRunner::SCRIPT_FOLDER + "/repository.rb"
+eprint '.' unless $has_put_startup_message_for_code_runner
 
 CodeRunner::CODE_RUNNER_VERSION = Version.new(Gem.loaded_specs['coderunner'].version.to_s) rescue "test"
 

data/lib/coderunner/instance_methods.rb

@@ -171,6 +171,15 @@ class CodeRunner
 			key = LONG_TO_SHORT.key(key) if LONG_TO_SHORT.key(key)
 			set(key, value) if value
 		end
+    if is_in_repo?
+      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.add('.code-runner-irb-save-history')
+      end
+    end
+
 # 		ep options
 		
 		log 'modlet in initialize', @modlet
@@ -1193,7 +1202,13 @@ Conditions contain a single = sign: #{conditions}
 			runs.each do |run| 
 # 				ep run.id, run_list.keys		
 				Dir.chdir(run.directory){traverse_directories}
+
 			end
+      if is_in_repo? @root_folder
+        runs.each do |run| 
+          Dir.chdir(run.directory){run.add_to_repo}
+        end
+      end
 			@write_status_dots = wsd	
 			save_large_cache
 			File.delete("submitting")

data/lib/coderunner/interactive_methods.rb

@@ -17,6 +17,14 @@ class CodeRunner
 		def setup_interactive
 			@runner = CodeRunner.fetch_runner(CodeRunner::DEFAULT_COMMAND_OPTIONS.dup) unless CodeRunner::DEFAULT_COMMAND_OPTIONS[:q]
 			@r = @runner
+      if FileTest.exist?(@r.root_folder + '/.code-runner-irb-save-history')
+        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)}")
+        end
+      end
+
 		end
 		def pwd
 			puts Dir.pwd

data/lib/coderunner/repository.rb

@@ -0,0 +1,186 @@
+require 'git'
+class CodeRunner
+  def is_in_repo?(folder=@root_folder)
+    Repository.repo_folder(folder) ?  true : false
+  end
+  class Run
+    # Add CodeRunner files within the run folder to git. If
+    # the run_class for this run defines the run class property
+    # repo_file_match, also add any files which match any of 
+    def add_to_repo
+      Dir.chdir(@directory) do
+        repo = Repository.open_in_subfolder
+        repo.add("code_runner_info.rb")
+        repo.add("code_runner_results.rb")
+        Dir.entries.each do |f|
+          repo.add(f) if rcp.repo_file_match? and f =~ rcp.repo_file_match
+        end
+        repo.autocommit("Submitted simulation id #{id} in folder #{repo.relative_path(@runner.root_folder)}")
+      end
+    end
+  end
+  # This is a class which implements methods 
+  # for managing a CodeRunner repository, which is a
+  # slightly customised git repository. It contains 
+  # methods for initializing standard files, and maintains
+  # a small amount of metadata about the repository.
+  class Repository < Git::Base
+    # If the folder is within a coderunner repository
+    # return the root folder of the repository; else 
+    # return nil
+    def self.repo_folder(folder = Dir.pwd)
+      f2 = File.expand_path(folder)
+      while not (Dir.entries(f2).include?('.git') and 
+            Dir.entries(f2).include?('.code_runner_repo_metadata'))
+        f2 = File.expand_path(f2 + '/..')
+        (f2=nil; break) if f2 == '/' 
+        p 'f2 is ', f2
+      end
+      return f2
+    end
+    # Open a git object from within a subfolder of a repository
+    # Checks to see if the subfolder actually is inside a CodeRunner
+    # repository.
+    def self.open_in_subfolder(folder = Dir.pwd)
+      f2 = repo_folder(folder)
+      raise "#{folder} is not a coderunner repository " if not f2
+      return open(f2)
+    end
+    def relative_path(folder=Dir.pwd)
+      File.expand_path(folder).sub(File.expand_path(dir.to_s) + '/', '')
+    end
+    def repo_file(path)
+      "#{dir}/#{path}"
+    end
+    def init_readme
+      File.open(repo_file("README.md"), "w"){|f| f.puts readme_text}
+      add(repo_file("README.md"))
+      autocommit_all('Added README.md')
+    end
+    def init_metadata
+      Hash.phoenix(repo_file('.code_runner_repo_metadata')) do |hash|
+        hash[:creation_time] = Time.now.to_i
+        hash[:autocommit] = true
+      end
+      add(repo_file('.code_runner_repo_metadata'))
+      autocommit_all('Added metadata')
+    end
+    def metadata
+      Hash.phoenix(repo_file('.code_runner_repo_metadata'))
+    end
+    def add_folder(folder)
+      Dir.chdir(folder) do
+        require 'find'
+        #files = []
+        Find.find('.') { |e| (puts e; add(e)) if
+          e =~ /code_runner_info.rb/ or
+          e =~ /code_runner_results.rb/ or 
+          e =~ /.code-runner-irb-save-history/ or
+          e =~ /.code_runner_script_defaults.rb/ or
+          (Dir.entries(Dir.pwd).include?('.code_runner_script_defaults') and
+           (repo_file_match = (
+             rcp = CodeRunner.fetch_runner(Y: folder, U: true).run_class.rcp; 
+             rcp.repo_file_match? ? rcp.repo_file_match : false); 
+             repo_file_match =~ m
+           )
+          )
+        }
+      end
+      autocommit_all("Added folder #{relative_path(folder)}")
+    end
+    def autocommit(*args)
+      commit(*args) if metadata[:autocommit]
+    end
+    def autocommit_all(*args)
+      commit_all(*args) if metadata[:autocommit]
+    end
+    def init_defaults_folder
+      FileUtils.makedirs(repo_file("defaults_files"))
+      File.open(repo_file("defaults_files/README"), "w"){|f|
+         f.puts  <<EOF
+This folder is where defaults files for codes should be placed, with
+paths such as defaults_files/<code>crmod/my_defaults.rb. This folder 
+will automatically be checked for defaults files when submitting simulations
+within this repository.
+EOF
+      
+      }
+      add(repo_file("defaults_files/README"))
+      autocommit_all('Added defaults folder')
+    end
+    def readme_text
+      return <<EOF
+#{File.basename(dir.path)} CodeRunner Repository
+================================================
+
+This is a coderunner repository, which consists of
+a managed set of simulation folders and defaults files which are 
+synchronised across systems using git. 
+
+This readme is a stub which was created automatically...
+feel free to modify this and describe this repo.
+
+Created on: #{Time.now.to_s}
+
+EOF
+    end
+    def split_url(remote_name)
+      remote(remote_name).url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
+      namehost = $~[:namehost]
+      folder = $~[:folder]
+      return [namehost, 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))}
+    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)
+      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
+      puts string
+      system string
+    end
+    # Send all files in the given folder to 
+    # 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)
+      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
+  end
+
+end

data/lib/coderunner/repository_manager.rb

@@ -0,0 +1,210 @@
+
+
+# A tool for reading, manipulating and converting files containing
+# tokamak data.
+
+require 'getoptlong'
+
+module CommandLineFlunky
+
+  STARTUP_MESSAGE = "\n------CodeRunner Repository Manager------"
+
+  MANUAL_HEADER = <<EOF
+
+-------------CodeRunner Repository Manager Manual---------------
+
+  Written by Edmund Highcock (2014)
+
+NAME
+
+  coderunnerrepo
+
+
+SYNOPSIS
+
+  coderunnerrepo <command> [arguments] [options]
+
+
+DESCRIPTION
+
+  Create and manipulate a coderunner repository: a collection of simulation
+  folders and defaults files that a synchronised across systems using git. 
+
+EXAMPLES
+
+  $ coderunnerrepo init <name>
+
+  $ coderunnerrepo clone <url>
+
+  $ coderunnerrepo pull 
+
+  $ coderunnerrepo pull -r <remote>
+
+  $ coderunnerrepo push 
+
+  $ coderunnerrepo add <folder>
+
+  $ coderunnerrepo adrm <name> <url>
+
+
+EOF
+
+  COMMANDS_WITH_HELP = [
+    ['add_remote', 'adrm', 2,  'Add a remote url to the repository.', ['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]],
+    ['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'], []],
+    ['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]],
+
+  ]
+
+
+
+  COMMAND_LINE_FLAGS_WITH_HELP = [
+    #['--boolean', '-b', GetoptLong::NO_ARGUMENT, 'A boolean option'],
+    ['--remotes', '-r', GetoptLong::REQUIRED_ARGUMENT, 'A comma separated list of remotes.'],
+    ['--other-folder', '-Y', GetoptLong::REQUIRED_ARGUMENT, 'Specify the path of the folder where you want to run this command.'],
+
+    ]
+
+  LONG_COMMAND_LINE_OPTIONS = [
+  #["--no-short-form", "", GetoptLong::NO_ARGUMENT, %[This boolean option has no short form]],
+  ]
+
+  # specifying flag sets a bool to be true
+
+  CLF_BOOLS = []
+
+  CLF_INVERSE_BOOLS = [] # specifying flag sets a bool to be false
+
+  PROJECT_NAME = 'coderunnerrepo'
+
+  def self.method_missing(method, *args)
+#     p method, args
+    CodeRunner::RepositoryManager.send(method, *args)
+  end
+
+  #def self.setup(copts)
+    #CommandLineFlunkyTestUtility.setup(copts)
+  #end
+
+  SCRIPT_FILE = __FILE__
+end
+
+$has_put_startup_message_for_code_runner = true
+require 'coderunner'
+
+class CodeRunner
+  # A class for managing a coderunner repository, which consists of
+  # a managed set of simulation folders and defaults files which are 
+  # synchronised across systems using git. 
+  class RepositoryManager
+    class << self
+      # This function gets called before every command
+      # and allows arbitrary manipulation of the command
+      # options (copts) hash
+      def setup(copts)
+        copts[:Y] ||= Dir.pwd
+        copts[:Y] = File.expand_path(copts[:Y])
+      end
+      def verbosity
+        2
+      end
+      def init_repository(name, copts)
+        repo = Repository.init(name)
+        repo.init_metadata
+        repo.init_readme
+        repo.init_defaults_folder
+      end
+      def add_remote(name, url, copts)
+        Dir.chdir(copts[:Y]){
+          repo = Repository.open(Dir.pwd)
+          repo.add_remote(name, url)
+        }
+      end
+      def try_system(str)
+        raise "Failed command: #{str}" unless system str
+      end
+      def push_and_create_repository(copts)
+        Dir.chdir(copts[:Y]){
+          repo = Repository.open(Dir.pwd)
+          if copts[:r]
+            rems = copts[:r].split(/,/).map{|rname| repo.remote(rname)} 
+          else
+            raise "Must specify remotes using the -r flag when calling push_and_create_repository"
+          end
+          rems.each do |r|
+            r.url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
+            namehost = $~[:namehost]
+            folder = $~[:folder]
+            p namehost, folder
+            try_system %[git bundle create .tmpbundle --all]
+            try_system %[ssh #{namehost} "mkdir -p #{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))
+            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}"]
+            end
+          end 
+        }
+      end
+      def push_repository(copts)
+        Dir.chdir(copts[:Y]){
+          repo = Repository.open(Dir.pwd)
+          if copts[:r]
+            rems = copts[:r].split(/,/).map{|rname| repo.remote(rname)} 
+          else
+            rems = repo.remotes
+          end
+          rems.each{|r| repo.push(r)}
+        }
+      end
+      def pull_repository(copts)
+        Dir.chdir(copts[:Y]){
+          repo = Repository.open(Dir.pwd)
+          if copts[:r]
+            rems = copts[:r].split(/,/).map{|rname| repo.remote(rname)} 
+          else
+            rems = repo.remotes
+          end
+          rems.each{|r| repo.pull(r)}
+        }
+      end
+      def add_folder(folder, copts)
+        repo = Repository.open_in_subfolder(folder)
+        repo.add_folder(folder)
+      end
+      def remote_synchronize_down(remote, folder, copts)
+        repo = Repository.open_in_subfolder(folder)
+        repo.rsyncd(remote, folder)
+      end
+      def remote_synchronize_up(remote, folder, copts)
+        repo = Repository.open_in_subfolder(folder)
+        repo.rsyncu(remote, folder)
+      end
+
+    end
+  end
+end
+
+
+######################################
+# This must be at the end of the file
+#
+require 'command-line-flunky'
+###############################
+#
+
+if $0==__FILE__
+  CommandLineFlunky.run_script
+end

data/lib/cubecalccrmod/cubecalc.rb

@@ -25,9 +25,11 @@ class CodeRunner
 
 @uses_mpi = false
 
+@repo_file_match = /results.txt/
+
 #@readout_list = @variables + @results
 
-@code_module_folder = folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
+@code_module_folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
 
 @namelists_to_print_not_specified = []
 

data/test/helper.rb

@@ -7,7 +7,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest'
+require 'minitest/autorun'
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -17,5 +18,5 @@ require 'cubecalccrmod'
 require 'cubecalccrmod/sleep'
 
 
-class Test::Unit::TestCase
-end
+#class Test::Unit::TestCase
+#end

data/test/test_coderunner.rb

@@ -1,11 +1,11 @@
-
+if true
 require 'helper'
 require 'rbconfig'
 CodeRunner::RemoteCodeRunner::DISPLAY_REMOTE_INVOCATION = true
 
 
 
-module Test::Unit::Assertions
+module MiniTest::Assertions
 	def assert_system(string)
 		assert(system(string), "System Command: '#{string}'")
 	end
@@ -23,7 +23,7 @@ $coderunner_command = "#{$ruby_command}  -I lib/ lib/coderunner.rb"
 #end
 
 if true
-class TestSubmission  < Test::Unit::TestCase
+class TestSubmission  < MiniTest::Test
 	def setup
 		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
 		Dir.chdir('test'){CodeRunner.generate_cubecalc}
@@ -78,7 +78,7 @@ class TestSubmission  < Test::Unit::TestCase
 end
 
 
-class TestCodeRunner < Test::Unit::TestCase
+class TestCodeRunner < MiniTest::Test
 	
 	# Override this method as we want the tests to be run in the order they are defined
 	
@@ -201,17 +201,17 @@ class TestCodeRunner < Test::Unit::TestCase
 		assert_equal(21, @runner3.max_id)
 		#eputs "\ntesting set_start_id complete"
 		@runner3 = CodeRunner.new(tfolder2).update
-		assert_nothing_raised{@mrunner = CodeRunner::Merged.new(@runner, @runner3)}
+		@mrunner = CodeRunner::Merged.new(@runner, @runner3)
 		@mrunner.print_out(0)
     #STDIN.gets
 		assert_equal(@runner.run_list.size + 1, @mrunner.run_list.size)
 		@mrunner2 = @runner.merge(@runner3)
 		assert_equal(@mrunner2.run_list.keys, @mrunner.run_list.keys)
-    assert_nothing_raised{@mrunner.add_runner(@runner)}
+    @mrunner.add_runner(@runner)
     assert_equal(CodeRunner::Run::Merged, @mrunner.run_list[[2, 6]].class)
     assert_equal(6, @mrunner.run_list[[2, 6]].run.id)
     assert_system("#$coderunner_command st -Y #{tfolder} -Y #{tfolder2}")
-    assert_raise(RuntimeError){@mrunner.submit}
+    assert_raises(RuntimeError){@mrunner.submit}
     #STDIN.gets
 		FileUtils.rm_r tfolder2
 	end
@@ -261,6 +261,7 @@ class TestCodeRunner < Test::Unit::TestCase
 		#assert(!FileTest.exist?('results/submitting'))
 	#end
 	
+	if ENV['LATEX']
 	def test_latex_graphkit
 		Dir.chdir('test/results') do
 			#@runner.print_out(0)
@@ -282,7 +283,6 @@ class TestCodeRunner < Test::Unit::TestCase
 		end
 	end
 
-	if ENV['LATEX']
 	
 		def test_graphkit_multiplot
 			unless ENV['SHORT_TEST']
@@ -375,7 +375,7 @@ EOF
 end # class TestCodeRunner
 end # if false/true
 
-#class TestFortranNamelist < Test::Unit::TestCase
+#class TestFortranNamelist < MiniTest::Test
 	##require 'gs2crmod'
 	#def test_make_defaults
 		#Dir.chdir('test') do
@@ -387,7 +387,7 @@ end # if false/true
 #
 #
 ENV['CR_NON_INTERACTIVE'] = 'true'
-class TestFortranNamelistC < Test::Unit::TestCase
+class TestFortranNamelistC < MiniTest::Test
 	def setup
 	end
 	def test_synchronise_variables
@@ -421,3 +421,5 @@ class TestFortranNamelistC < Test::Unit::TestCase
 		FileUtils.rm('test/cubecalc_namelist')
 	end
 end
+
+end

data/test/test_coderunnerrepo.rb

@@ -0,0 +1,95 @@
+
+require 'helper'
+require 'rbconfig'
+require 'coderunner/repository_manager'
+
+unless $cpp_command = ENV['CPP']
+	raise "Please specify the environment variable CPP (the C++ compiler)"
+end
+$coderunner_folder = File.dirname(File.expand_path(__FILE__)) + '/../'
+
+module MiniTest::Assertions
+	def assert_system(string)
+		assert(system(string), "System Command: '#{string}'")
+	end
+end
+
+$ruby_command = "#{RbConfig::CONFIG['bindir']}/#{RbConfig::CONFIG['ruby_install_name']}"
+$coderunnerrepo_command = "#{$ruby_command}  -I #{$coderunner_folder}lib/ #{$coderunner_folder}/lib/coderunner/repository_manager.rb"
+
+class Dummy
+  include CodeRunner::InteractiveMethods
+end
+class TestCreate < MiniTest::Test
+  def tfolder
+    'test/createrepo'
+  end
+  def dffolder
+    'myrepo/crdummyfiles'
+  end
+  def setup
+    FileUtils.rm_r(tfolder) if FileTest.exist? tfolder
+    FileUtils.makedirs(tfolder)
+		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
+		Dir.chdir('test'){CodeRunner.generate_cubecalc}
+		Dir.chdir(tfolder){assert_system string}
+  end
+  def test_create
+    Dir.chdir(tfolder) {
+      assert_system("#$coderunnerrepo_command init myrepo")
+      assert_system("#$coderunnerrepo_command adrm local ssh://#{ENV['USER']}@#{`hostname`.chomp}/#{Dir.pwd}/remote -Y myrepo")
+      assert_system("#$coderunnerrepo_command adrm dummy ssh://dummyuser@nohost/#{Dir.pwd}/remote -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 remote rm dummy")
+      assert_system("#$coderunnerrepo_command pull -Y myrepo")
+      FileUtils.makedirs(dffolder)
+      FileUtils.touch(dffolder + '/code_runner_info.rb')
+      FileUtils.touch(dffolder + '/code_runner_results.rb')
+      #assert_system("#$coderunnerrepo_command add myrepo/crdummyfiles -Y myrepo")
+      CodeRunner::RepositoryManager.add_folder('myrepo/crdummyfiles', {})
+      FileUtils.makedirs('myrepo/sims')
+      Dir.chdir('myrepo/sims') do
+        CodeRunner.submit(C: 'cubecalc', m: 'empty', X: '../../cubecalc')
+        FileUtils.touch('.code-runner-irb-save-history')
+        Dummy.new.setup_interactive
+      end
+      CodeRunner::RepositoryManager.remote_synchronize_up('local', 'myrepo/sims', {})
+      CodeRunner::RepositoryManager.remote_synchronize_down('local', 'myrepo/sims', {})
+      Dir.chdir('remote') do
+        FileUtils.makedirs 'sims'
+        Dir.chdir('sims') do
+          system "echo 'Hello' >> dummyfile"
+          #add('dummyfile')
+          system "git add dummyfile"
+          system "git commit -m 'added dummyfile'"
+          #autocommit_all('--Added dummyfile')
+          system "echo 'Hello' >> dummyfile"
+        end
+        #add('dummyfile')
+      end
+      err = assert_raises(RuntimeError){CodeRunner::RepositoryManager.remote_synchronize_up('local', 'myrepo/sims', {})}
+      p err.message
+      Dir.chdir('remote') do
+        Dir.chdir('sims') do
+          system "git add dummyfile"
+          system "git commit -m 'modified dummyfile'"
+        end
+      end
+      Dir.chdir('myrepo/sims') do
+        system "echo 'Hello' >> dummyfile"
+        #add('dummyfile')
+        system "git add dummyfile"
+        system "git commit -m 'added dummyfile'"
+        #autocommit_all('--Added dummyfile')
+        system "echo 'Hello' >> dummyfile"
+      end
+      err = assert_raises(RuntimeError){CodeRunner::RepositoryManager.remote_synchronize_down('local', 'myrepo/sims', {})}
+      p err.message
+      #CodeRunner::RepositoryManager.remote_synchronize_down('local', 'myrepo/sims', {})
+    }
+  end
+  def teardown
+    #FileUtils.rm_r(testfolder)
+  end
+end

metadata

@@ -1,153 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.15.13
+  version: 0.16.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-05-13 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.
@@ -166,7 +194,7 @@ extra_rdoc_files:
 - README.md
 - README.rdoc
 files:
-- ".document"
+- .document
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -193,6 +221,8 @@ files:
 - lib/coderunner/long_regexen.rb
 - lib/coderunner/merged_code_runner.rb
 - lib/coderunner/remote_code_runner.rb
+- lib/coderunner/repository.rb
+- lib/coderunner/repository_manager.rb
 - lib/coderunner/run.rb
 - lib/coderunner/system_modules/archer.rb
 - lib/coderunner/system_modules/blue_joule.rb
@@ -233,6 +263,7 @@ files:
 - test/helper.rb
 - test/old_test.rb
 - test/test_coderunner.rb
+- test/test_coderunnerrepo.rb
 homepage: http://coderunner.sourceforge.net
 licenses:
 - GPLv3
@@ -243,17 +274,17 @@ 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: []
 rubyforge_project: coderunner
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A framework for the automated running and analysis of simulations.