miga-base 0.5.3.0 → 0.5.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d51a2778df35e38e9396c342db79907aa8b63019e33d62f08a745664c01fc14b
4
- data.tar.gz: 2e553ce8b5fc59aee8aa74f5262d34175c19bbf52c41efa6817353e8e20dbff5
3
+ metadata.gz: d7b5a581810fbc79f9808fea7353882960f26f005ff9cc37ccad7483db96f1a4
4
+ data.tar.gz: dc4d7163c3b6a396e0ca71325d2cb995001b65a467305c918bfc810e161ddae7
5
5
  SHA512:
6
- metadata.gz: 0c2ebed3117669c8dce789d731dd478a9eaf8dd8ca9a14e89cf1692908264bca6541073407f7d922a3f72e1edd47d5128275a391b5acc798687edb6302d0b66d
7
- data.tar.gz: 64f0d0fc5af1bca2a3d2fb3ad3a79fdb31a91c95ef346e2cd2b89cc4342a0189ee7a814adae6b7cf5b80b5ce4a80e99cd1196c71afe1138f769fd0f0d91cf3d7
6
+ metadata.gz: 71e0e8fa7a6e10ac0396a7e19580e66cd8561979234ffb565c0727e02e9050fd04b94c416d56ce35c8b4c618eeb69fb781d52914df26182c01a295b8481cfad9
7
+ data.tar.gz: 359ad12300c7a1aa14b3f66a2bef2d875c24ea689ab66f1f16990f35618ec03b3126f849039ffcb5ef0a0f52c328eaa5e81edf0bc862aa78104652a9cf73216a
@@ -12,8 +12,17 @@ class MiGA::Cli::Action::Run < MiGA::Cli::Action
12
12
  cli.opt_object(opt, [:project, :dataset_opt, :result])
13
13
  opt.on(
14
14
  '-t', '--threads INT', Integer,
15
- "Threads to use in the local run (by default: #{cli[:thr]})."
16
- ){ |v| cli[:thr] = v }
15
+ "Threads to use in the local run (by default: #{cli[:thr]})"
16
+ ) { |v| cli[:thr] = v }
17
+ opt.on(
18
+ '-R', '--remote STR',
19
+ 'Description of remote SSH node to launch the job, as "user@hostname"',
20
+ 'By default, the job is executed locally'
21
+ ) { |v| cli[:remote] = v }
22
+ opt.on(
23
+ '-l', '--log PATH',
24
+ 'Path to the output log file to be created. If not set, STDOUT'
25
+ ) { |v| cli[:log] = v }
17
26
  end
18
27
  end
19
28
 
@@ -21,18 +30,23 @@ class MiGA::Cli::Action::Run < MiGA::Cli::Action
21
30
  virtual_task = false
22
31
  miga = MiGA.root_path
23
32
  p = cli.load_project
24
- cmd = ["PROJECT=#{p.path.shellescape}", 'RUNTYPE=bash',
33
+
34
+ cmd = ["PROJECT=#{p.path.shellescape}",
35
+ "RUNTYPE=#{cli[:remote] ? 'ssh' : 'bash'}",
25
36
  "MIGA=#{miga.shellescape}", "CORES=#{cli[:thr]}"]
26
-
27
37
  obj = cli.load_project_or_dataset
28
38
  klass = obj.class
29
39
  virtual_task = true if [:p, :d].include? cli[:result]
30
40
  cmd << "DATASET=#{obj.name.shellescape}" if obj.is_a? MiGA::Dataset
31
-
32
41
  if klass.RESULT_DIRS[cli[:result]].nil? and not virtual_task
33
- raise "Unsupported #{klass.to_s.gsub(/.*::/, '')} result: #{cli[:result]}."
42
+ raise "Unsupported #{klass.to_s.sub(/.*::/, '')} result: #{cli[:result]}."
34
43
  end
35
44
  cmd << MiGA.script_path(cli[:result], miga: miga, project: p).shellescape
45
+ if cli[:remote]
46
+ cmd.unshift '.', '/etc/profile', ';'
47
+ cmd = ['ssh', cli[:remote].shellescape, cmd.join(' ').shellescape]
48
+ end
49
+ cmd << ['&>', cli[:log].shellescape] if cli[:log]
36
50
  pid = spawn cmd.join(' ')
37
51
  Process.wait pid
38
52
  end
data/lib/miga/version.rb CHANGED
@@ -10,7 +10,7 @@ module MiGA
10
10
  # - Float representing the major.minor version.
11
11
  # - Integer representing gem releases of the current version.
12
12
  # - Integer representing minor changes that require new version number.
13
- VERSION = [0.5, 3, 0]
13
+ VERSION = [0.5, 4, 0]
14
14
 
15
15
  ##
16
16
  # Nickname for the current major.minor version.
@@ -18,7 +18,7 @@ module MiGA
18
18
 
19
19
  ##
20
20
  # Date of the current gem release.
21
- VERSION_DATE = Date.new(2020, 1, 11)
21
+ VERSION_DATE = Date.new(2020, 1, 22)
22
22
 
23
23
  ##
24
24
  # Reference of MiGA.
data/scripts/cds.bash CHANGED
@@ -46,7 +46,7 @@ case "$TYPE" in
46
46
  rm "$DATASET".*."$ct"
47
47
  fi
48
48
  done
49
- echo "# Selected table: $BEST_CT"
49
+ echo "Selected codon table: $BEST_CT"
50
50
  ;;
51
51
  esac
52
52
 
data/scripts/miga.bash CHANGED
@@ -1,8 +1,9 @@
1
1
  #!/bin/bash
2
2
  set -e
3
3
  #MIGA=${MIGA:-$(cd "$(dirname "$0")/.."; pwd)}
4
+ MIGA_HOME=${MIGA_HOME:-"$HOME"}
4
5
  # shellcheck source=/dev/null
5
- . "$HOME/.miga_rc"
6
+ . "$MIGA_HOME/.miga_rc"
6
7
  export PATH="$MIGA/bin:$MIGA/utils/enveomics/Scripts:$PATH"
7
8
  SCRIPT=${SCRIPT:-$(basename "$0" .bash)}
8
9
 
@@ -15,7 +16,9 @@ for i in $(miga plugins -P "$PROJECT") ; do
15
16
  done
16
17
 
17
18
  if [[ "$SCRIPT" != "d" && "$SCRIPT" != "p" ]] ; then
19
+ echo '############'
18
20
  echo -n "Date: " ; miga date
21
+ echo "Hostname: $(hostname)"
19
22
  echo "MiGA: $MIGA"
20
23
  echo "Task: $SCRIPT"
21
24
  echo "Project: $PROJECT"
@@ -23,6 +26,7 @@ if [[ "$SCRIPT" != "d" && "$SCRIPT" != "p" ]] ; then
23
26
  echo "Dataset: $DATASET"
24
27
  miga edit -P "$PROJECT" -D "$DATASET" -m "_step=$SCRIPT"
25
28
  fi
29
+ echo '------------'
26
30
  fi
27
31
 
28
32
  true
@@ -1 +1 @@
1
- ../../Scripts/FastA.N50.pl
1
+ utils/enveomics/Pipelines/assembly.pbs/../../Scripts/FastA.N50.pl
@@ -1 +1 @@
1
- ../../Scripts/FastA.filterN.pl
1
+ utils/enveomics/Pipelines/assembly.pbs/../../Scripts/FastA.filterN.pl
@@ -1 +1 @@
1
- ../../Scripts/FastA.length.pl
1
+ utils/enveomics/Pipelines/assembly.pbs/../../Scripts/FastA.length.pl
@@ -1 +1 @@
1
- ../../Scripts/FastA.split.pl
1
+ utils/enveomics/Pipelines/blast.pbs/../../Scripts/FastA.split.pl
@@ -1 +1 @@
1
- ../../enveomics.R
1
+ utils/enveomics/Scripts/lib/../../enveomics.R
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: miga-base
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3.0
4
+ version: 0.5.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Luis M. Rodriguez-R
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-01-11 00:00:00.000000000 Z
11
+ date: 2020-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: daemons
@@ -515,7 +515,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
515
515
  - !ruby/object:Gem::Version
516
516
  version: '0'
517
517
  requirements: []
518
- rubygems_version: 3.0.3
518
+ rubyforge_project:
519
+ rubygems_version: 2.7.6
519
520
  signing_key:
520
521
  specification_version: 4
521
522
  summary: MiGA