miga-base 1.2.13.4 → 1.2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb8e809ff19a09d50286683db9d524d203bc0d62ad90d2b760a1244d16cc484
-  data.tar.gz: ca509e431f7c16cf924f895ac37ef33c94ce715460eab42fed0ff5c6c8aca2a8
+  metadata.gz: ae083dbb06efae44846887887e0706b0436340aeb7524846478a68867c602b67
+  data.tar.gz: 78bb2440e073e4d55fe6a439dfa1eddb25c2fa4aad7d06000384de20092ab710
 SHA512:
-  metadata.gz: f118bac8e0588fc07666faf74f4c66d0b4f021dde71a6d75092442d09888ce95341cb3b6780a3143a03ea88598e51926965162be3a64717a69a74ed27cf85ef1
-  data.tar.gz: be23d776d61bbad830d5bff139d725a22f2821eb23bc7a61da9c49c4eff89e560a38d4078a0f44c2d6e1185aea7555aeb1a81e50820e4c704ee11b5ed30c4453
+  metadata.gz: 185667da9d0e7dc3849dc851e2f2c6829901bfaee7975c7b249630b660cc41aa40988fcc9e27c3937a6ad533df3135e4d2f2115e7f16e8bd3f25ed9e0533d9f7
+  data.tar.gz: 77ec658cbfcecda4b32e7a0110b53953220f649f79f4a112c23c510511a4752869af9e3894452335d827311a9b8fedd0c5072860ecff035f1c018aa346c9894f

data/lib/miga/cli/action/download/base.rb

@@ -25,7 +25,7 @@ module MiGA::Cli::Action::Download::Base
 
   def cli_save_actions(opt)
     cli.opt_flag(
-      opt, '--only-metadata',
+      opt, 'only-metadata',
       'Create datasets without input data but retrieve all metadata',
       :only_md
     )

data/lib/miga/cli/action/download/gtdb.rb

@@ -23,6 +23,9 @@ module MiGA::Cli::Action::Download::Gtdb
 
   def sanitize_cli
     cli.ensure_par(taxon: '-T')
+    unless cli[:taxon] =~ /^[a-z]__\S+$/
+      raise 'Taxon (-T) must be in GTDB format: s__Macondimonas_diazotrophica'
+    end
     cli[:save_every] = 1 if cli[:dry]
   end
 

data/lib/miga/cli/action/gtdb_get.rb

@@ -31,6 +31,10 @@ class MiGA::Cli::Action::GtdbGet < MiGA::Cli::Action
       cli_name_modifiers(opt)
       cli_filters(opt)
       cli_save_actions(opt)
+      opt.on(
+        '--ncbi-api-key STRING',
+        'NCBI API key'
+      ) { |v| ENV['NCBI_API_KEY'] = v }
     end
   end
 

data/lib/miga/cli/action/wf.rb

@@ -35,10 +35,18 @@ module MiGA::Cli::Action::Wf
         '-T', '--ncbi-taxon STRING',
         'Download all the genomes in NCBI classified as this taxon'
       ) { |v| cli[:ncbi_taxon] = v }
+      opt.on(
+        '-G', '--gtdb-taxon STRING',
+        'Download all the genomes in GTDB classified as this taxon'
+      ) { |v| cli[:gtdb_taxon] = v }
       opt.on(
         '--no-draft',
-        'Only download complete genomes, not drafts'
+        'Only download complete genomes, not drafts (requires -T)'
       ) { |v| cli[:ncbi_draft] = v }
+      opt.on(
+        '--gtdb-ref',
+        'Only download reference anchor genomes in GTDB (requires -G)'
+      ) { |v| cli[:gtdb_ref] = v }
       opt.on(
         '--max-download INT', Integer,
         'Maximum number of genomes to download (by default: unlimited)'
@@ -136,7 +144,7 @@ module MiGA::Cli::Action::Wf
       p.set_option(i, cli[i])
     end
 
-    # Download datasets
+    # Download datasets from NCBI
     unless cli[:ncbi_taxon].nil?
       what = cli[:ncbi_draft] ? '--all' : '--complete'
       cmd = ['ncbi_get', '-P', cli[:outdir], '-T', cli[:ncbi_taxon], what]
@@ -144,6 +152,14 @@ module MiGA::Cli::Action::Wf
       call_cli(cmd)
     end
 
+    # Download datasets from GTDB
+    unless cli[:gtdb_taxon].nil?
+      cmd = ['gtdb_get', '-P', cli[:outdir], '-T', cli[:gtdb_taxon]]
+      cmd << '--reference' if cli[:gtdb_ref]
+      cmd += ['--max', cli[:ncbi_max]] if cli[:ncbi_max]
+      call_cli(cmd)
+    end
+
     # Add datasets
     call_cli(
       [

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.2, 13, 4].freeze
+  VERSION = [1.2, 14, 1].freeze
 
   ##
   # Nickname for the current major.minor version.
@@ -20,7 +20,7 @@ module MiGA
 
   ##
   # Date of the current gem relese.
-  VERSION_DATE = Date.new(2023, 1, 12)
+  VERSION_DATE = Date.new(2023, 1, 16)
 
   ##
   # References of MiGA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.2.13.4
+  version: 1.2.14.1
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons