coderunner 0.16.14 → 0.16.15

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0d2b92a9760279ae362325ec7aa2bd7805040f73
+  data.tar.gz: d4696663958023e1c1b67810d085647609785fea
+SHA512:
+  metadata.gz: 9cd5eab55adcf53541dc406a0a628b0335eaf1a98f5c5b8b6099e1d87c19297c1ab8fc357b1966eafd637bc8de336388ada0bda15ee95587603493b5750f1d8d
+  data.tar.gz: 7f86c6a1731386b3f1d9364febf5f212aeb8a5efc460776773e68593fe8b700c9a910f6bdd22f3b2bab350718118eef2f55af9dbdd0f4b46a5e71bb0880c5537

data/VERSION

@@ -1 +1 @@
-0.16.14
+0.16.15

data/coderunner.gemspec

@@ -2,14 +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: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.14"
+  s.version = "0.16.15"
 
   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-02"
+  s.date = "2015-07-18"
   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"]
@@ -94,14 +97,13 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://coderunner.sourceforge.net"
   s.licenses = ["GPLv3"]
-  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.rubyforge_project = "coderunner"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.4.8"
   s.summary = "A framework for the automated running and analysis of simulations."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<graphkit>, [">= 0.4.2"])

data/lib/coderunner/graphs_and_films.rb

@@ -706,7 +706,7 @@ class CodeRunner
 		frame_rate = (options[:frame_rate] or options[:fr] || 15)
 		film_name = (options[:film_name] or options [:fn] or graphkit_frame_array[0][1].file_name + '_film').gsub(/\s/, '_')
 		#puts `ffmpeg -y #{options[:bitrate] ? "-b #{options[:bitrate]}" : ""} -r #{frame_rate} -threads #{(@multiple_processes or 1)} -i film_frames/frame_%0#{fd}d#{extension}  #{film_name}.mp4`
-		str =  "avconv  -y -r #{frame_rate} -threads #{(@multiple_processes or 1)} -i film_frames/frame_%0#{fd}d#{extension}  #{film_name}.mp4"
+		str =  "avconv  -y -r #{frame_rate} -threads #{(@multiple_processes or 1)} -i film_frames/frame_%0#{fd}d#{extension}  -r 25 #{film_name}.mp4"
     puts str
     system str
 		end

data/lib/coderunner/repository.rb

@@ -52,18 +52,29 @@ class CodeRunner
     # twin set of a bare repo and a clone of that
     # repo. folder must end in '.cr.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 .cr.git and a clone of this bare repo"
+    class << self
+      alias :simple_init :init
+      def 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 .cr.git and a clone of this bare repo"
+        end
+        super(folder + '.cr.git', bare: true)
+        repo = simple_clone(folder + '.cr.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
+      alias :simple_clone :clone
+      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)  
+        return simple_clone(bflocal, name)  
       end
-      super(folder + '.cr.git', bare: true)
-      repo = clone(folder + '.cr.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
@@ -168,14 +179,17 @@ Created on: #{Time.now.to_s}
 
 EOF
     end
-    def split_url(remote_name)
-      bare_repo.remote(remote_name).url =~ Repository.url_regex
+    def self.split_url(url)
+      url =~ Repository.url_regex
       namehost = $~[:namehost]
       barefolder = $~[:folder]
-      self.class.check_bare_ext(barefolder)
+      check_bare_ext(barefolder)
       folder = barefolder.sub(/\.cr\.git$/, '')
       return [namehost, folder, barefolder]
     end
+    def split_url(remote_name)
+      return self.class.split_url(bare_repo.remote(remote_name).url)
+    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
@@ -274,6 +288,9 @@ EOF
     def try_system(str)
       RepositoryManager.try_system(str)
     end
+    def self.try_system(str)
+      RepositoryManager.try_system(str)
+    end
   end
 
 end

data/lib/coderunner/repository_manager.rb

@@ -53,6 +53,7 @@ EOF
     ['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]],
     ['bare_repo_command', 'brc', 1,  'Execute the given command within the twin bare repository', ['command'], [:Y]],
+    ['clone_repo', 'clone', 2,  'Clone the given url to a working repo with the given name (NB creates both a bare and working repository). Give the url of the bare repository (with a name ending in .cr.git)', ['url', 'name'], []],
     ['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]],
@@ -207,6 +208,13 @@ class CodeRunner
         repo.rsyncu(remote, folder)
       end
 
+      def clone_repo(url, name, copts)
+        Dir.chdir(copts[:Y]){
+          Repository.clone(url, name)
+        }
+      end
+
+
     end
   end
 end

data/test/helper.rb

@@ -7,7 +7,6 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'minitest'
 require 'minitest/autorun'
 require 'shoulda'
 

data/test/test_coderunnerrepo.rb

@@ -36,6 +36,7 @@ class TestCreate < MiniTest::Test
   end
   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.cr.git -Y myrepo")
       #assert_system("#$coderunnerrepo_command adrm local ssh://#{ENV['USER']}@#{`hostname`.chomp}.local/#{Dir.pwd}/remote.git -Y myrepo")
@@ -94,6 +95,8 @@ class TestCreate < MiniTest::Test
       err = assert_raises(RuntimeError){CodeRunner::RepositoryManager.remote_synchronize_down('local', 'myrepo/sims', {})}
       p err.message
       #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")
     }
   end
   def teardown

metadata

@@ -1,206 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.16.14
-  prerelease: 
+  version: 0.16.15
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: parallelpipes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubyhacks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rb-gsl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: gsl_extras
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hostmanager
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: command-line-flunky
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: CodeRunner is a framework for the automated running and analysis of simulations.
@@ -220,7 +195,7 @@ extra_rdoc_files:
 - README.md
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -294,26 +269,25 @@ files:
 homepage: http://coderunner.sourceforge.net
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: coderunner
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A framework for the automated running and analysis of simulations.
 test_files: []