ruby-cute 0.0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134cb9d25b87efcffb16969273bc4485b79a6086
-  data.tar.gz: b2454f6b7878e1e7339bcfd412dd52e431e17f08
+  metadata.gz: f54b6b52751a03c02f575ef8e544f399df99229a
+  data.tar.gz: e2db4b6d5a93a21ec4d19cf238ec05606ee6ab97
 SHA512:
-  metadata.gz: 5e73cc26463f9eafe501ba6b01f9439dcb7cb6874ee35c8ea3692797dcb75f1a73fbef9adce8df8d2ea410267a6be34a3852f968d84db9ae19b5cf3c58a444f5
-  data.tar.gz: d5d5bf2fa5c5d0d99944bbe010fa6456356571487be772b4f9246213a5ade9d21f60ae29b3b4813091b94529c9ef1b5c44de948512c15fac2a7bdf086339ba79
+  metadata.gz: 8a6a3d01f0eb79fa5d66955467529b92bd53add1f597bf88df283f388e53751f2e46980b55a0398f350671b02ae7b68d8f00409fd22defd91dccd9220c2a2e4e
+  data.tar.gz: c4e54ceadd5e0aa271438b195942da1e4cc38bfe97d02db0394d787347c3f6a41be821d173e7cf6c83db2a7caa5b34cbe3d1141d58f6b2cde547a2f3c4f389e7

data/README.md

@@ -141,11 +141,14 @@ g5k.release(job) # Frees resources.
 
 Ruby-Cute is maintained by the Algorille team at LORIA/Inria Nancy - Grand Est, and specifically by:
 
-* Sébastien Badia <sebastien.badia@inria.fr>
-* Tomasz Buchert <tomasz.buchert@inria.fr>
+* Cristian Ruiz <cristian.ruiz@inria.fr>
 * Emmanuel Jeanvoine <emmanuel.jeanvoine@inria.fr>
 * Lucas Nussbaum <lucas.nussbaum@loria.fr>
+
+Past contributors include:
+
+* Sébastien Badia <sebastien.badia@inria.fr>
+* Tomasz Buchert <tomasz.buchert@inria.fr>
 * Luc Sarzyniec <luc.sarzyniec@inria.fr>
-* Cristian Ruiz <cristian.ruiz@inria.fr>
 
 Questions/comments should be directed to Lucas Nussbaum and Emmanuel Jeanvoine.

data/debian/changelog

@@ -1,5 +1,5 @@
-ruby-cute (0.0.1) UNRELEASED; urgency=low
+ruby-cute (0.3) UNRELEASED; urgency=medium
 
-  * Initial release, as a native package for now.
+  * Initial release.
 
- -- Lucas Nussbaum <lucas@debian.org>  Wed, 13 Mar 2013 10:47:08 +0100
+ -- Lucas Nussbaum <lucas@debian.org>  Tue, 10 Mar 2015 15:13:52 +0100

data/debian/control

@@ -2,14 +2,18 @@ Source: ruby-cute
 Section: ruby
 Priority: optional
 Maintainer: Lucas Nussbaum <lucas@debian.org>
-Build-Depends: debhelper (>= 8~), gem2deb (>= 0.3.0~), rake, yard, ruby-redcloth, bc
-Standards-Version: 3.9.3
-Homepage: http://ruby-cute.gforge.inria.fr/
+Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake, yard, ruby-webmock, ruby-simplecov, ruby-rest-client, ruby-ipaddress, ruby-net-ssh-multi
+Standards-Version: 3.9.5
+Vcs-Git: git://github.com/ruby-cute/ruby-cute
+Vcs-Browser: https://github.com/ruby-cute/ruby-cute
+Homepage: http://ruby-cute.github.io/
+Testsuite: autopkgtest
 XS-Ruby-Versions: all
 
 Package: ruby-cute
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rest-client, ruby-json, ruby-ipaddress, ruby-net-ssh-multi
+Recommends: pry
 Description: Critically Useful Tools for Experiments
-
+ Ruby library for controlling experiments

data/debian/copyright

@@ -5,6 +5,13 @@ Source: FIXME <http://example.com/>
 Files: *
 Copyright: <years> <put author's name and email here>
            <years> <likewise for another author>
+License: GPL-2+ (FIXME)
+
+Files: debian/*
+Copyright: 2015 Lucas Nussbaum <lucas@debian.org>
+License: GPL-2+ (FIXME)
+Comment: the Debian packaging is licensed under the same terms as the original package.
+
 License: GPL-2+ (FIXME)
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -26,8 +33,3 @@ License: GPL-2+ (FIXME)
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: 2013 Lucas Nussbaum <lucas@debian.org>
-License:
- [LICENSE TEXT]

data/debian/ruby-cute.examples

@@ -0,0 +1 @@
+examples/*

data/debian/ruby-tests.rake

@@ -0,0 +1,7 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = './spec/*_spec.rb'
+end
+
+task :default => :spec

data/debian/rules

@@ -6,7 +6,7 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+#export DH_RUBY_IGNORE_TESTS=ruby2.1 require-rubygems
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

data/examples/g5k_exp_virt.rb

@@ -26,7 +26,8 @@ G5K_SITES.each{ |site|
       # here, we set wait_time to 200 seconds, like that we would just use the sites that are free.
       begin
       jobs[site] = g5k.reserve(:site => site, :resources => "slash_22=1+{virtual!='none'}/nodes=1",
-                               :walltime =>"01:00:00",:keys => "~/.ssh/id_rsa", :wait_time => 200)
+                               :walltime =>"01:00:00",:keys => "~/.ssh/id_rsa", :wait => false)
+      jobs[site] = g5k.wait_for_job(jobs[site], :wait_time => 200)
       rescue Cute::G5K::EventTimeout
         puts "We waited long enough, releasing job in site #{site}"
         g5k.release(jobs[site]) # we release the job
@@ -40,6 +41,11 @@ G5K_SITES.each{ |site|
 
 threads.each{ |t| t.join}
 
+if jobs.keys.empty? then
+  puts "no sites available"
+  exit
+end
+
 nodes = []
 jobs.each{ |k,v| nodes+=v["assigned_nodes"]}
 
@@ -54,7 +60,7 @@ template = ERB.new(File.read("#{vm_dir}/vm-template.xml"))
 
 vms = []
 
-G5K_SITES.each{ |site|
+jobs.keys.each{ |site|
   subnet  = g5k.get_subnets(jobs[site]).first
   ips = subnet.map{ |ip| ip.to_s }
   num_vm.times{ |n|
@@ -114,7 +120,7 @@ Net::SSH::Multi.start do |session|
 end
 
 puts("Waiting for the machines to start")
-sleep 60
+sleep 100
 
 # Executing some commands on the vms
 

data/lib/cute/g5k_api.rb

@@ -703,7 +703,11 @@ module Cute
       # @return [Array] all the subnets defined in a given job
       # @param job [G5KJSON] as described in {Cute::G5K::G5KJSON job}
       def get_subnets(job)
-        subnets = job.resources["subnets"]
+        if job.resources["subnets"].nil?
+          return nil
+        else
+          subnets = job.resources["subnets"]
+        end
         subnets.map{|s| IPAddress::IPv4.new s }
       end
 
@@ -725,6 +729,7 @@ module Cute
       # Releases all jobs on a site
       # @param site [String] a valid Grid'5000 site name
       def release_all(site)
+        raise ArgumentError, "parameter should be a string" unless site.is_a?(String)
         Timeout.timeout(20) do
           jobs = get_my_jobs(site,"running") + get_my_jobs(site,"waiting")
           break if jobs.empty?
@@ -738,9 +743,11 @@ module Cute
       end
 
       # Releases a resource, it can be a job or a deploy.
-      def release(r)
+      # @param resource [G5KJSON] as described in {Cute::G5K::G5KJSON job}
+      def release(resource)
+        raise ArgumentError, "parameter should be a G5KJSON data type" unless resource.is_a?(Cute::G5K::G5KJSON)
         begin
-          return @g5k_connection.delete_json(r.rel_self)
+          return @g5k_connection.delete_json(resource.rel_self)
         rescue Cute::G5K::RequestFailed => e
           raise unless e.response.include?('already killed')
         end

data/lib/cute/version.rb

@@ -1,3 +1,3 @@
 module Cute
-  VERSION = "0.0.2"
+  VERSION = "0.3"
 end

data/ruby-cute.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry", "~> 0.10"
   s.add_development_dependency "webmock", "~> 1.20"
   s.add_development_dependency "yard", "~> 0.8"
+  s.add_development_dependency "simplecov", "~> 0.7"
 
   s.add_dependency 'rest-client', '1.6.7'
   s.add_dependency 'json', '~> 1.8'

data/spec/g5k_api_spec.rb

@@ -112,8 +112,21 @@ describe Cute::G5K::API do
     expect(subject.get_vlan_nodes(job)).to be_nil
   end
 
+  it "subnet returns nil" do
+    job = Cute::G5K::G5KJSON.new
+    expect(subject.get_subnets(job)).to be_nil
+  end
+
+  it "raises an argument error in release method" do
+    expect{subject.release("string")}.to raise_error(ArgumentError)
+  end
+
+  it "raises an argument error in release_all method" do
+    expect{subject.release_all(["random"])}.to raise_error(ArgumentError)
+  end
+
   it "performs an advanced reservation" do
-    time_schedule = Time.now + 60*30
+    time_schedule = Time.now + 60*20
     job =subject.reserve(:site => @rand_site, :nodes => 1, :reservation => time_schedule.strftime("%Y-%m-%d %H:%M:%S"))
     subject.release(job)
   end

data/test/test_execute.rb

@@ -0,0 +1,243 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'cute'
+
+class Execute_test < Test::Unit::TestCase
+
+  def prepare_file()
+    @file = Tempfile.new("testons")
+    1.upto(100) {|i| @file.puts i}
+    @file.close()
+    @cmd=['cat',@file.path]
+    @cmd2=['bash','-c',"cat #{@file.path} >&2"]
+  end
+  def test_execute()
+    prepare_file()
+    run = Cute::Execute[*@cmd].run!()
+    res = run.wait()
+    file = File.read(@file.path)
+    assert_equal(file,run.stdout)
+    assert(run.emptypipes,"pipes are empty")
+    assert(res[3],"pipes are empty")
+  end
+  def test_execute2()
+    prepare_file()
+    run = Cute::Execute[*@cmd].run!()
+    res = run.wait()
+    file = File.read(@file.path)
+    assert_equal(file,res[1])
+    assert(res[3],"pipes are empty")
+  end
+  def test_execute_err()
+    prepare_file()
+    run = Cute::Execute[*@cmd2].run!()
+    run.wait()
+    file = File.read(@file.path)
+    assert_equal(file,run.stderr)
+    assert(run.emptypipes,"pipes are empty")
+  end
+  def test_execute2_err()
+    prepare_file()
+    run = Cute::Execute[*@cmd2].run!()
+    res = run.wait()
+    file = File.read(@file.path)
+    assert_equal(file,res[2])
+    assert(res[3],"pipes are empty")
+  end
+  def test_execute_limit_stdout()
+    prepare_file()
+    run = Cute::Execute[*@cmd].run!(:stdout_size=>5)
+    run.wait()
+    assert_equal("1\n2\n3",run.stdout)
+    assert(!run.emptypipes,"pipes are not empty")
+  end
+  def test_execute_limit_stderr()
+    prepare_file()
+    run = Cute::Execute[*@cmd2].run!(:stderr_size=>5)
+    run.wait()
+    assert_equal("1\n2\n3",run.stderr)
+    assert(!run.emptypipes,"pipes are not empty")
+  end
+  def test_stdin()
+    run = Cute::Execute['ruby'].run!({:stdin=>true})
+    run.write_stdin('puts 2+2*2;puts Math.cos(Math::PI)')
+    run.wait()
+    assert_equal("6\n-1.0\n",run.stdout)
+  end
+  def test_signaled()
+    run = Cute::Execute["sleep","10"].run!()
+    sleep(0.2)
+    Process.kill("SIGKILL",run.exec_pid)
+    assert_raise(SignalException) do
+      run.wait()
+    end
+  end
+  def test_signaled_multithread()
+    run = Cute::Execute["sleep","10"].run!()
+    sleep(0.2)
+    Process.kill("SIGKILL",run.exec_pid)
+    t1 = Thread.new do
+      assert_raise(SignalException) do
+        run.wait()
+      end
+    end
+    t2 = Thread.new do
+      assert_raise(SignalException) do
+        run.wait()
+      end
+    end
+    t1.join
+    t2.join
+  end
+  # def test_non_null_exit
+  #   run = Cute::Execute["ls","/zoefkzoifjauifhiagier"].run!()
+  #   assert_raise(Exception) do
+  #     run.wait()
+  #   end
+  #   assert_equal(2,run.status.exitstatus)
+  # end
+  def test_non_null_exit_ignored
+    run = Cute::Execute["ls","/zoefkzoifjauifhiagier"].run!()
+    assert_nothing_raised do
+      run.wait({})
+    end
+    assert_equal(2,run.status.exitstatus)
+  end
+  def test_non_null_exit_multithread
+    run = Cute::Execute["ls","/zoefkzoifjauifhiagier"].run!()
+    t1 = Thread.new do
+      assert_raise(RuntimeError) do
+        run.wait()
+      end
+    end
+    t2 = Thread.new do
+      assert_raise(RuntimeError) do
+        run.wait()
+      end
+    end
+    t1.join
+    t2.join
+    assert_equal(2,run.status.exitstatus)
+  end
+  def test_kill()
+    run = Cute::Execute["sleep","3"].run!()
+    run.kill
+    assert_nothing_raised(SignalException) do
+      run.wait()
+    end
+    assert(run.status.signaled?,"The process must be killed")
+  end
+  def test_kill2()
+    run = Cute::Execute["sleep","3"].run!()
+    run.kill
+    res = nil
+    assert_nothing_raised(SignalException) do
+      res = run.wait()
+    end
+    assert(res[0].signaled?,"The process must be killed")
+  end
+
+  def test_kill_multithread()
+    run = Cute::Execute["sleep","3"].run!()
+    t1 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    t2 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    run.kill
+    t1.join
+    t2.join
+    assert(run.status.signaled?,"The process must be killed")
+  end
+  def test_stderr_after_kill()
+    run = Cute::Execute["bash","-c","echo toto >&2;sleep 5"].run!()
+    t1 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    sleep(0.2)
+    t1.kill
+    assert_nothing_raised(SignalException) do
+      t1.join
+    end
+    assert_equal("toto\n",run.stderr)
+    assert(run.status.signaled?,"The process must be killed")
+  end
+  def test_output_after_kill()
+    run = Cute::Execute["bash","-c","echo toto;sleep 5"].run!()
+    t1 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    sleep(0.2)
+    t1.kill
+    assert_nothing_raised(SignalException) do
+      t1.join
+    end
+    assert_equal("toto\n",run.stdout)
+    assert(run.status.signaled?,"The process must be killed")
+  end
+  def test_kill_thread()
+    run = Cute::Execute["sleep","3"].run!()
+    t1 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    sleep(0.2)
+    t1.kill()
+    assert_nothing_raised(SignalException) do
+      t1.join()
+    end
+    assert(run.status.signaled?,"The process must be killed")
+  end
+
+  def test_kill_thread_multithread()
+    run = Cute::Execute["sleep","3"].run!()
+    t1 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    t2 = Thread.new do
+      assert_nothing_raised(SignalException) do
+        run.wait()
+      end
+    end
+    sleep(0.2)
+    t1.kill()
+    assert_nothing_raised(SignalException) do
+      t1.join()
+    end
+    t2.join()
+    assert(run.status.signaled?,"The process must be killed")
+  end
+  def test_nopipe
+    run = Cute::Execute["sleep","100"].run!(:stdout=>false,:stderr=>false,:stdin=>false)
+    sleep(0.2) #wait for fork finish the job
+    assert_equal("/dev/null",File.readlink("/proc/#{run.exec_pid}/fd/0"),"fd0")
+    assert_equal("/dev/null",File.readlink("/proc/#{run.exec_pid}/fd/1"),"fd1")
+    assert_equal("/dev/null",File.readlink("/proc/#{run.exec_pid}/fd/2"),"fd2")
+    run.kill()
+    run.wait()
+  end
+  def test_fd_leak
+    fd=File.open("/dev/urandom")
+    file=Tempfile.new("testpipeleak")
+    file.puts("#!/usr/bin/env ruby")
+    file.puts("exit(IO.new(#{fd.fileno}).closed? ? 0 : 10) rescue Exception")
+    file.close()
+    assert_nothing_raised do
+      Cute::Execute['ruby',file.path].run!().wait()
+    end
+    fd.close()
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cute
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: '0.3'
 platform: ruby
 authors:
 - Algorille team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +185,8 @@ files:
 - debian/control
 - debian/copyright
 - debian/ruby-cute.docs
-- debian/ruby-tests.rb
+- debian/ruby-cute.examples
+- debian/ruby-tests.rake
 - debian/rules
 - debian/source/format
 - debian/watch
@@ -195,6 +210,7 @@ files:
 - spec/spec_helper.rb
 - spec/taktuk_spec.rb
 - test/test_bash.rb
+- test/test_execute.rb
 homepage: http://ruby-cute.gforge.inria.fr/
 licenses:
 - CeCILL-B
@@ -225,4 +241,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/taktuk_spec.rb
 - test/test_bash.rb
+- test/test_execute.rb
 has_rdoc: 

data/debian/ruby-tests.rb

@@ -1,2 +0,0 @@
-$: << 'lib' << '.'
-Dir['{spec,test}/**/*.rb'].each { |f| require f }