coderunner 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8c971e211d6f79859ff5a6d29a06545a4317a9
-  data.tar.gz: cd0cbb15a2282d5fcc1a35f03b2309615ea208da
+  metadata.gz: c4523bd885a2ccf5d75df6caf448f0a70e2e1ded
+  data.tar.gz: 6b7bb1c1c707ceb8ab64638a837a4fab4c4aa39a
 SHA512:
-  metadata.gz: 9f9808ef91f73a312b81bb053fafc5a994d72b7096c0e433867839bde517bdd5906688bce1a0656a6130a3026e96cc4b42a7429008c5be91597a8367bd1be301
-  data.tar.gz: 0662b454a75c0717e98b85b9382866ae371dfd1dcfb973c2c5b038e4533c0372d614e0015902a8a7b3b19081907834651ae3e8833f3133f270f10744bdfece97
+  metadata.gz: 688cacb761e7a040fbc956ed09c4615adf5648b995613b697f2f89e98842f7c683d5bffa8a926ae3e33c09ff592a8b89787861ad657073a462c6aff77f85edba
+  data.tar.gz: b64b6c69f683c408a3d12ec38031ae46388b31ba436bc47d99470fc1d5115cc1b192b49791d718d6b977f5aecf43d847f49dc4e914002c6d98df581b402dd79b

data/VERSION

@@ -1 +1 @@
-0.16.1
+0.16.2

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.16.1 ruby lib
+# stub: coderunner 0.16.2 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.1"
+  s.version = "0.16.2"
 
   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-13"
+  s.date = "2015-05-17"
   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/repository.rb

@@ -24,7 +24,29 @@ class CodeRunner
   # slightly customised git repository. It contains 
   # methods for initializing standard files, and maintains
   # a small amount of metadata about the repository.
+  # In addition, every clone of coderunner repository
+  # comes in a pair: one bare repository, and one local 
+  # repository, which is a clone of the bare repository.
+  # This allows easy synchronisation of working directories
+  # without the need for a central server which all 
+  # working directories have access to.
   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'
+    #
+    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"
+      end
+      super(folder + '.git', bare: true)
+      repo = clone(folder + '.git', folder)
+      repo.init_metadata
+      repo.init_readme
+      repo.init_defaults_folder
+      p 'remotes', repo.remotes.map{|r| r.name}
+      repo.simple_push(repo.remote("origin"))
+    end
     # If the folder is within a coderunner repository
     # return the root folder of the repository; else 
     # return nil
@@ -34,7 +56,7 @@ class CodeRunner
             Dir.entries(f2).include?('.code_runner_repo_metadata'))
         f2 = File.expand_path(f2 + '/..')
         (f2=nil; break) if f2 == '/' 
-        p 'f2 is ', f2
+        #p 'f2 is ', f2
       end
       return f2
     end
@@ -46,6 +68,11 @@ class CodeRunner
       raise "#{folder} is not a coderunner repository " if not f2
       return open(f2)
     end
+    # Returns a Git::Base object referring to the bare twin 
+    # repository.
+    def bare_repo
+      @bare_repo ||= Git::Base.open(dir.to_s + '.git')
+    end
     def relative_path(folder=Dir.pwd)
       File.expand_path(folder).sub(File.expand_path(dir.to_s) + '/', '')
     end
@@ -125,7 +152,7 @@ Created on: #{Time.now.to_s}
 EOF
     end
     def split_url(remote_name)
-      remote(remote_name).url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
+      bare_repo.remote(remote_name).url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
       namehost = $~[:namehost]
       folder = $~[:folder]
       return [namehost, folder]
@@ -181,6 +208,63 @@ EOF
       puts string
       system string
     end
+
+    def add_remote(name, url)
+      url =~ (/ssh:\/\/(?<namehost>[^\/]+)(?<folder>.*$)/)
+      barefolder = $~[:folder]
+      unless barefolder =~ /\.git$/
+        raise "All remotes must end in .git for coderunnerrepo"
+      end
+      super(name, url)
+    end
+
+    alias :simple_pull :pull
+
+    # Pull from the given remote object. remote must be a remote
+    # object from the twin bare repo, i.e. a member of bare_repo.remotes
+    # 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
+      try_system %[ssh #{namehost} "cd #{folder} && git push origin"]
+      bare_repo.pull(remote)
+      simple_pull(remote('origin'))
+    end
+    # A simple git push... does not try to push to local 
+    # bare repo or pull remote working repos
+    alias :simple_push :push
+
+    # Push to the given remote object. remote must be a remote
+    # object from the twin bare repo, i.e. a member of bare_repo.remotes
+    # NOT a remote from the coderunner repo (which only ever has
+    # one remote: origin, corresponding to the bare repo).
+    #
+    # First push to the bare '.git' twin repo, then push that
+    # 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
+      simple_push(remote('origin'))
+      bare_repo.push(remote)
+      try_system %[ssh #{namehost} "cd #{folder} && git pull origin"]
+    end
+    def try_system(str)
+      RepositoryManager.try_system(str)
+    end
   end
 
 end

data/lib/coderunner/repository_manager.rb

@@ -50,7 +50,7 @@ EXAMPLES
 EOF
 
   COMMANDS_WITH_HELP = [
-    ['add_remote', 'adrm', 2,  'Add a remote url to the repository.', ['name', 'url'], [:Y]],
+    ['add_remote', 'adrm', 2,  'Add a remote url to the repository. The url must not 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]],
@@ -114,43 +114,55 @@ class CodeRunner
         2
       end
       def init_repository(name, copts)
-        repo = Repository.init(name)
-        repo.init_metadata
-        repo.init_readme
-        repo.init_defaults_folder
+        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"
+        end
         Dir.chdir(copts[:Y]){
-          repo = Repository.open(Dir.pwd)
-          repo.add_remote(name, url)
+          repo = Repository.open_in_subfolder(Dir.pwd)
+          repo.bare_repo.add_remote(name, url)
         }
       end
       def try_system(str)
+        puts str
         raise "Failed command: #{str}" unless system str
       end
       def push_and_create_repository(copts)
         Dir.chdir(copts[:Y]){
-          repo = Repository.open(Dir.pwd)
+          repo = Repository.open_in_subfolder(Dir.pwd)
+          bare_repo = repo.bare_repo
           if copts[:r]
-            rems = copts[:r].split(/,/).map{|rname| repo.remote(rname)} 
+            rems = copts[:r].split(/,/).map{|rname| bare_repo.remote(rname)} 
           else
             raise "Must specify remotes using the -r flag when calling push_and_create_repository"
           end
+          repo.simple_push(repo.remote("origin"))
           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]
+            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]
+            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} && git clone ../.tmpbundle ."]
             #try_system %[ssh #{namehost} "cd #{folder}/#{repname} && git remote rm origin"]
-            try_system %[ssh #{namehost} "cd #{folder} && 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|
+            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}"]
@@ -162,20 +174,20 @@ class CodeRunner
         Dir.chdir(copts[:Y]){
           repo = Repository.open(Dir.pwd)
           if copts[:r]
-            rems = copts[:r].split(/,/).map{|rname| repo.remote(rname)} 
+            rems = copts[:r].split(/,/).map{|rname| repo.bare_repo.remote(rname)} 
           else
-            rems = repo.remotes
+            rems = repo.bare_repo.remotes
           end
           rems.each{|r| repo.push(r)}
         }
       end
       def pull_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.remote(rname)} 
+            rems = copts[:r].split(/,/).map{|rname| repo.bare_repo.remote(rname)} 
           else
-            rems = repo.remotes
+            rems = repo.bare_repo.remotes
           end
           rems.each{|r| repo.pull(r)}
         }

data/test/test_coderunnerrepo.rb

@@ -32,17 +32,19 @@ class TestCreate < MiniTest::Test
     FileUtils.makedirs(tfolder)
 		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
 		Dir.chdir('test'){CodeRunner.generate_cubecalc}
-		Dir.chdir(tfolder){assert_system string}
+		Dir.chdir(tfolder){assert_system string; FileUtils.rm('../cubecalc.cc')}
   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 local ssh://#{ENV['USER']}@localhost/#{Dir.pwd}/remote -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 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("cd myrepo.git; git remote rm dummy")
       assert_system("#$coderunnerrepo_command pull -Y myrepo")
+      assert_system("#$coderunnerrepo_command push -Y myrepo")
       FileUtils.makedirs(dffolder)
       FileUtils.touch(dffolder + '/code_runner_info.rb')
       FileUtils.touch(dffolder + '/code_runner_results.rb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit