coderunner 0.17.11 → 0.18.0

data/lib/coderunner/repository.rb

@@ -1,7 +1,7 @@
 require 'git'
 class CodeRunner
   def is_in_repo?(folder=@root_folder)
-    if ENV['CODE_RUNNER_NO_REPO']
+    if CodeRunner.global_options(:no_repo)
       return false
     else
       Repository.repo_folder(folder) ?  true : false

data/lib/coderunner/run.rb

@@ -732,10 +732,14 @@ def copy_extra_files
 end
 
 def generate_run_name
+  if CodeRunner::GLOBAL_OPTIONS[:short_run_name]
+    @run_name = %[v#{@version}_id_#@id]
+  else
     @run_name = %[v#@version] + @naming_pars.inject("") do |str, par|
       str+="_#{par}_#{send(par).to_s[0...8]}"
     end
     @run_name = @run_name.gsub(/\s+/, "_").gsub(/\//, '') + "_id_#@id"
+  end
 end
 
 def write_info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.17.11
+  version: 0.18.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
@@ -193,18 +193,20 @@ extensions:
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- README.rdoc
 files:
 - ".document"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - VERSION
 - bin/coderunner
 - bin/coderunnerrepo
 - coderunner.gemspec
+- dependencies/Makefile
+- dependencies/README.md
+- dependencies/download_dependencies.sh
 - ext/code_runner_ext.c
 - ext/extconf.rb
 - ext/graph_kit.c
@@ -213,12 +215,14 @@ files:
 - lib/code_runner_extension.rb
 - lib/coderunner.rb
 - lib/coderunner/class_methods.rb
+- lib/coderunner/config.rb
 - lib/coderunner/feedback.rb
 - lib/coderunner/fortran_namelist.rb
 - lib/coderunner/fortran_namelist_c.rb
 - lib/coderunner/graphs_and_films.rb
 - lib/coderunner/heuristic_run_methods.rb
 - lib/coderunner/instance_methods.rb
+- lib/coderunner/interactive_config.rb
 - lib/coderunner/interactive_methods.rb
 - lib/coderunner/long_regexen.rb
 - lib/coderunner/merged_code_runner.rb
@@ -266,7 +270,6 @@ files:
 - test/helper.rb
 - test/old_test.rb
 - test/test_coderunner.rb
-- test/test_coderunnerrepo.rb
 homepage: http://coderunner.sourceforge.net
 licenses:
 - GPLv3

data/README.rdoc

@@ -1,19 +0,0 @@
-= coderunner
-
-Description goes here.
-
-== Contributing to coderunner
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2012 Edmund Highcock. See LICENSE.txt for
-further details.
-

data/test/test_coderunnerrepo.rb

@@ -1,108 +0,0 @@
-
-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; FileUtils.rm('../cubecalc.cc')}
-  end
-  def test_create
-    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")
-      assert_system("#$coderunnerrepo_command pushcr -r local -Y myrepo")
-      #assert_equal(false, system("#$coderunnerrepo_command pushcr -r local -Y myrepo"))
-      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)
-      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')
-        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
-      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', {})
-      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
-    #FileUtils.rm_r(testfolder)
-  end
-end