coderunner 0.16.15 → 0.16.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2b92a9760279ae362325ec7aa2bd7805040f73
-  data.tar.gz: d4696663958023e1c1b67810d085647609785fea
+  metadata.gz: bcacf0cd0ab5c2b02e10fcba1b63b748fac10468
+  data.tar.gz: 5a8b25d8aac82aeda833ed4d5830bae72616769f
 SHA512:
-  metadata.gz: 9cd5eab55adcf53541dc406a0a628b0335eaf1a98f5c5b8b6099e1d87c19297c1ab8fc357b1966eafd637bc8de336388ada0bda15ee95587603493b5750f1d8d
-  data.tar.gz: 7f86c6a1731386b3f1d9364febf5f212aeb8a5efc460776773e68593fe8b700c9a910f6bdd22f3b2bab350718118eef2f55af9dbdd0f4b46a5e71bb0880c5537
+  metadata.gz: cb07dd4609a73ff95fb7c49be65bcbc97266eac74ac2113e5a26daf2cf005deaad388a05cde43c4c1f91fd81447e5b8b940e17c1a74ed0267c448f7bfed167a5
+  data.tar.gz: 08c9be1698ddc24436e42ba22b53918383333bdc922c9e52409c656888a1ec495b21ca12c02578511132d7574e1bf3069240569405a0d05c791a0c8f848770eb

data/VERSION

@@ -1 +1 @@
-0.16.15
+0.16.16

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.15 ruby lib
+# stub: coderunner 0.16.16 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.15"
+  s.version = "0.16.16"
 
   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-07-18"
+  s.date = "2015-07-20"
   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", "coderunnerrepo"]

data/lib/coderunner/repository.rb

@@ -58,8 +58,8 @@ class CodeRunner
         if folder =~ /\.git$/
           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 + '.cr.git', bare: true)
-        repo = simple_clone(folder + '.cr.git', folder)
+        super(bflocal = folder + '.cr.git', bare: true, repository: bflocal)
+        repo = simple_clone(bflocal, folder)
         repo.init_metadata
         repo.init_readme
         repo.init_defaults_folder
@@ -70,7 +70,7 @@ class CodeRunner
       def clone(url, name)
         namehost, folder, _barefolder = split_url(url)
         try_system %[ssh #{namehost} "cd #{folder} && git push origin"]
-        simple_clone(url, bflocal=name+'.cr.git', bare: true)  
+        simple_clone(url, bflocal=name+'.cr.git', bare: true, repository: bflocal)  
         return simple_clone(bflocal, name)  
       end
     end
@@ -84,7 +84,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
@@ -99,7 +99,8 @@ class CodeRunner
     # Returns a Git::Base object referring to the bare twin 
     # repository.
     def bare_repo
-      @bare_repo ||= Git::Base.open(dir.to_s + '.cr.git')
+      #puts 'bare_repo', dir.to_s + '.cr.git'
+      @bare_repo ||= Git::Base.bare(dir.to_s + '.cr.git')
     end
     def relative_path(folder=Dir.pwd)
       File.expand_path(folder).sub(File.expand_path(dir.to_s) + '/', '')
@@ -264,7 +265,7 @@ EOF
     def pull(remote)
       namehost, folder, _barefolder = split_url(remote.name)
       try_system %[ssh #{namehost} "cd #{folder} && git push origin"]
-      bare_repo.pull(remote)
+      bare_repo.fetch(remote)
       simple_pull(remote('origin'))
     end
     # A simple git push... does not try to push to local 
@@ -281,7 +282,9 @@ EOF
     # remote bare repos.
     def push(remote)
       namehost, folder, _barefolder = split_url(remote.name)
+      puts 'simple_push'
       simple_push(remote('origin'))
+      puts 'bare_repo.push'
       bare_repo.push(remote)
       try_system %[ssh #{namehost} "cd #{folder} && git pull origin"]
     end

data/lib/coderunner/repository_manager.rb

@@ -120,7 +120,7 @@ class CodeRunner
       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
+          Dir.chdir(repo.bare_repo.repo.to_s) do
             system comm
           end
         end
@@ -175,12 +175,15 @@ class CodeRunner
       end
       def push_repository(copts)
         Dir.chdir(copts[:Y]){
+          puts 'opening repo'
           repo = Repository.open_in_subfolder(Dir.pwd)
           if copts[:r]
+            puts 'mapping'
             rems = copts[:r].split(/,/).map{|rname| repo.bare_repo.remote(rname)} 
           else
             rems = repo.bare_repo.remotes
           end
+          puts 'pusing'
           rems.each{|r| repo.push(r)}
         }
       end

data/test/test_coderunner.rb

@@ -1,4 +1,4 @@
-if true
+if false
 require 'helper'
 require 'rbconfig'
 CodeRunner::RemoteCodeRunner::DISPLAY_REMOTE_INVOCATION = true

data/test/test_coderunnerrepo.rb

@@ -38,6 +38,7 @@ class TestCreate < MiniTest::Test
     Dir.chdir(tfolder) {
       
       assert_system("#$coderunnerrepo_command init myrepo")
+      #exit
       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.cr.git -Y myrepo")
@@ -97,6 +98,8 @@ class TestCreate < MiniTest::Test
       #CodeRunner::RepositoryManager.remote_synchronize_down('local', 'myrepo/sims', {})
       FileUtils.makedirs('testclone')
       assert_system("#$coderunnerrepo_command clone ssh://#{ENV['USER']}@localhost/#{Dir.pwd}/remote.cr.git myclone -Y testclone")
+      #assert_system("#$coderunnerrepo_command push -r origin -Y testclone/myclone")
+      CodeRunner::RepositoryManager.push_repository(r: 'origin', Y: 'testclone/myclone')
     }
   end
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.16.15
+  version: 0.16.16
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit