etna 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e3987a14cd4cb5eb805c4573eb09a8a64a50c2e34e1c5ae011c8efb946ab3d
-  data.tar.gz: 611e0df9d6f931adc14442c99adad44ebf899c16695d033618c094704e538126
+  metadata.gz: 4e4db6a6c798917fe8a1e96d7f02a2d604d259d3e2da08f083899655b2638b55
+  data.tar.gz: 989a69710cad57444da6ac526fc4728e706e0b4c891b720a8307b8207949453d
 SHA512:
-  metadata.gz: 93deb61017df46773b3449424589f7db51c65b4543c3203bf1a35fc2815bd6140bd04981e55413e0e91e47110b58d9f0a4d8f4566ab1bad99cd111e96d44bc76
-  data.tar.gz: bda7d6c202366ddb2c5805091758aa2e978ab9bffb9fd364fdd12235567169453a7dfd97fddaf2e9a468b1ce025effa9ae79c8c0e97d46a7cf7315482ba9872c
+  metadata.gz: bb98337dd93af44ae0bda211a413178f25ba6ad08b39c34dde855d6288ee291f26b8c629b67f24e2be56667405a93662308dca804fcf2b70aefbd41da3c8ea13
+  data.tar.gz: aed1a1f77965ef30eb67bffe021547fb92ad03b836dcd940bd98c55020309bee568981f058e5365580d29462f03dd41efb645c3b3f5575682d06e9af927e51a1

data/bin/etna

@@ -9,55 +9,10 @@ require 'yaml'
 require_relative '../lib/etna'
 require_relative '../lib/commands'
 
-config = (
-         if File.exists?(EtnaApp.config_file_path)
-           YAML.load(File.read(EtnaApp.config_file_path))
-         else
-           {}
-         end).update({
-    production: {
-        docker: {
-            default_tag: 'latest',
-        },
-        magma: {
-            host: 'https://magma.ucsf.edu'
-        },
-        metis: {
-            host: 'https://metis.ucsf.edu',
-        },
-        janus: {
-            host: 'https://janus.ucsf.edu',
-        },
-        timur: {},
-        polyphemus: {},
-        auth_redirect: 'https://janus.ucsf.edu',
-        ignore_ssl: false,
-    },
-    stage: {
-        docker: {
-            default_tag: 'latest',
-        },
-        magma: {
-            host: 'https://magma-stage.ucsf.edu'
-        },
-        metis: {
-            host: 'https://metis-stage.ucsf.edu',
-        },
-        janus: {
-            host: 'https://janus-stage.ucsf.edu',
-        },
-        timur: {},
-        polyphemus: {},
-        auth_redirect: 'https://janus-stage.ucsf.edu',
-        ignore_ssl: true,
-    },
-})
-
-EtnaApp.instance.run_command(config, *ARGV) do |cmd, args|
-  if cmd.class.included_modules.include?(RequireConfirmation)
-    puts "Attempting to run #{cmd.program_name} in environment #{EtnaApp.instance.environment} with args #{args}"
-    StrongConfirmation.confirm
-  else
-    true
-  end
+config = if File.exists?(EtnaApp.config_file_path)
+  YAML.load(File.read(EtnaApp.config_file_path))
+else
+  {}
 end
+
+EtnaApp.instance.run_command(config, *ARGV)

data/etna.completion

@@ -23,23 +23,6 @@ return
 fi
 COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
 return
-elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
-return
-elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
-all_flag_completion_names="${all_flag_completion_names//$1\ /}"
-a=$1
-shift
-if [[ "$string_flag_completion_names" =~ $a\  ]]; then
-if [[ "$#" == "1" ]];  then
-a="${a//--/}"
-a="${a//-/_}"
-i="_completions_for_$a"
-all_completion_names="${!i}"
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
-return
-fi
-shift
-fi
 elif [[ "$1" == "administrate" ]]; then
 shift
 all_flag_completion_names="$all_flag_completion_names  "
@@ -53,23 +36,6 @@ return
 fi
 COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
 return
-elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
-return
-elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
-all_flag_completion_names="${all_flag_completion_names//$1\ /}"
-a=$1
-shift
-if [[ "$string_flag_completion_names" =~ $a\  ]]; then
-if [[ "$#" == "1" ]];  then
-a="${a//--/}"
-a="${a//-/_}"
-i="_completions_for_$a"
-all_completion_names="${!i}"
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
-return
-fi
-shift
-fi
 elif [[ "$1" == "help" ]]; then
 shift
 all_flag_completion_names="$all_flag_completion_names  "
@@ -118,23 +84,6 @@ return
 fi
 COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
 return
-elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
-return
-elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
-all_flag_completion_names="${all_flag_completion_names//$1\ /}"
-a=$1
-shift
-if [[ "$string_flag_completion_names" =~ $a\  ]]; then
-if [[ "$#" == "1" ]];  then
-a="${a//--/}"
-a="${a//-/_}"
-i="_completions_for_$a"
-all_completion_names="${!i}"
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
-return
-fi
-shift
-fi
 elif [[ "$1" == "apply_template" ]]; then
 shift
 if [[ "$#" == "1" ]];  then
@@ -194,23 +143,6 @@ return
 fi
 COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
 return
-elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
-return
-elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
-all_flag_completion_names="${all_flag_completion_names//$1\ /}"
-a=$1
-shift
-if [[ "$string_flag_completion_names" =~ $a\  ]]; then
-if [[ "$#" == "1" ]];  then
-a="${a//--/}"
-a="${a//-/_}"
-i="_completions_for_$a"
-all_completion_names="${!i}"
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
-return
-fi
-shift
-fi
 elif [[ "$1" == "help" ]]; then
 shift
 all_flag_completion_names="$all_flag_completion_names  "
@@ -308,6 +240,23 @@ return
 fi
 done
 return
+elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
+return
+elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
+all_flag_completion_names="${all_flag_completion_names//$1\ /}"
+a=$1
+shift
+if [[ "$string_flag_completion_names" =~ $a\  ]]; then
+if [[ "$#" == "1" ]];  then
+a="${a//--/}"
+a="${a//-/_}"
+i="_completions_for_$a"
+all_completion_names="${!i}"
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+return
+fi
+shift
+fi
 else
 return
 fi
@@ -393,23 +342,6 @@ return
 fi
 done
 return
-else
-return
-fi
-done
-elif [[ "$1" == "project" ]]; then
-shift
-all_flag_completion_names="$all_flag_completion_names  "
-string_flag_completion_names="$string_flag_completion_names  "
-while [[ "$#" != "0" ]]; do
-if [[ "$#" == "1" ]];  then
-all_completion_names="create help"
-all_completion_names="$all_completion_names $all_flag_completion_names"
-if [[ -z "$(echo $all_completion_names | xargs)" ]]; then
-return
-fi
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
-return
 elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
 return
 elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
@@ -427,6 +359,23 @@ return
 fi
 shift
 fi
+else
+return
+fi
+done
+elif [[ "$1" == "project" ]]; then
+shift
+all_flag_completion_names="$all_flag_completion_names  "
+string_flag_completion_names="$string_flag_completion_names  "
+while [[ "$#" != "0" ]]; do
+if [[ "$#" == "1" ]];  then
+all_completion_names="create help"
+all_completion_names="$all_completion_names $all_flag_completion_names"
+if [[ -z "$(echo $all_completion_names | xargs)" ]]; then
+return
+fi
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+return
 elif [[ "$1" == "create" ]]; then
 shift
 if [[ "$#" == "1" ]];  then
@@ -515,27 +464,27 @@ return
 fi
 done
 return
-else
-return
-fi
-done
-else
+elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
 return
-fi
-done
-elif [[ "$1" == "config" ]]; then
+elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
+all_flag_completion_names="${all_flag_completion_names//$1\ /}"
+a=$1
 shift
-all_flag_completion_names="$all_flag_completion_names  "
-string_flag_completion_names="$string_flag_completion_names  "
-while [[ "$#" != "0" ]]; do
+if [[ "$string_flag_completion_names" =~ $a\  ]]; then
 if [[ "$#" == "1" ]];  then
-all_completion_names="help set show"
-all_completion_names="$all_completion_names $all_flag_completion_names"
-if [[ -z "$(echo $all_completion_names | xargs)" ]]; then
+a="${a//--/}"
+a="${a//-/_}"
+i="_completions_for_$a"
+all_completion_names="${!i}"
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
 return
 fi
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+shift
+fi
+else
 return
+fi
+done
 elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
 return
 elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
@@ -553,6 +502,23 @@ return
 fi
 shift
 fi
+else
+return
+fi
+done
+elif [[ "$1" == "config" ]]; then
+shift
+all_flag_completion_names="$all_flag_completion_names  "
+string_flag_completion_names="$string_flag_completion_names  "
+while [[ "$#" != "0" ]]; do
+if [[ "$#" == "1" ]];  then
+all_completion_names="help set show"
+all_completion_names="$all_completion_names $all_flag_completion_names"
+if [[ -z "$(echo $all_completion_names | xargs)" ]]; then
+return
+fi
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+return
 elif [[ "$1" == "help" ]]; then
 shift
 all_flag_completion_names="$all_flag_completion_names  "
@@ -634,7 +600,7 @@ done
 return
 elif [[ "$1" == "show" ]]; then
 shift
-all_flag_completion_names="$all_flag_completion_names --all "
+all_flag_completion_names="$all_flag_completion_names  "
 string_flag_completion_names="$string_flag_completion_names  "
 while [[ "$#" != "0" ]]; do
 if [[ "$#" == "1" ]];  then
@@ -667,6 +633,23 @@ return
 fi
 done
 return
+elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
+return
+elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
+all_flag_completion_names="${all_flag_completion_names//$1\ /}"
+a=$1
+shift
+if [[ "$string_flag_completion_names" =~ $a\  ]]; then
+if [[ "$#" == "1" ]];  then
+a="${a//--/}"
+a="${a//-/_}"
+i="_completions_for_$a"
+all_completion_names="${!i}"
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+return
+fi
+shift
+fi
 else
 return
 fi
@@ -719,23 +702,6 @@ return
 fi
 COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
 return
-elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
-return
-elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
-all_flag_completion_names="${all_flag_completion_names//$1\ /}"
-a=$1
-shift
-if [[ "$string_flag_completion_names" =~ $a\  ]]; then
-if [[ "$#" == "1" ]];  then
-a="${a//--/}"
-a="${a//-/_}"
-i="_completions_for_$a"
-all_completion_names="${!i}"
-COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
-return
-fi
-shift
-fi
 elif [[ "$1" == "attribute_actions" ]]; then
 shift
 all_flag_completion_names="$all_flag_completion_names  "
@@ -806,6 +772,23 @@ return
 fi
 done
 return
+elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
+return
+elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
+all_flag_completion_names="${all_flag_completion_names//$1\ /}"
+a=$1
+shift
+if [[ "$string_flag_completion_names" =~ $a\  ]]; then
+if [[ "$#" == "1" ]];  then
+a="${a//--/}"
+a="${a//-/_}"
+i="_completions_for_$a"
+all_completion_names="${!i}"
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+return
+fi
+shift
+fi
 else
 return
 fi
@@ -916,6 +899,23 @@ return
 fi
 done
 return
+elif [[ -z "$(echo $all_flag_completion_names | xargs)" ]]; then
+return
+elif [[ "$all_flag_completion_names" =~ $1\  ]]; then
+all_flag_completion_names="${all_flag_completion_names//$1\ /}"
+a=$1
+shift
+if [[ "$string_flag_completion_names" =~ $a\  ]]; then
+if [[ "$#" == "1" ]];  then
+a="${a//--/}"
+a="${a//-/_}"
+i="_completions_for_$a"
+all_completion_names="${!i}"
+COMPREPLY=($(compgen -W "$all_completion_names" -- "$1"))
+return
+fi
+shift
+fi
 else
 return
 fi

data/lib/commands.rb

@@ -5,10 +5,6 @@ require 'tempfile'
 require_relative 'helpers'
 require 'yaml'
 
-# /bin/etna will confirm execution before running any command that includes this module.
-module RequireConfirmation
-end
-
 class EtnaApp
   def self.config_file_path
     File.join(Dir.home, 'etna.yml')
@@ -27,9 +23,9 @@ class EtnaApp
     elsif @config && @config.is_a?(Hash) && @config.keys.length == 1
       @config.keys.last.to_sym
     elsif @config && @config.is_a?(Hash) && @config.keys.length > 1
-      raise "You have multiple environments configured, please specify your environment by adding --environment #{@config.keys.join("|")}"
+      :many
     else
-      raise "You do not have a successfully configured environment, please run #{program_name} config set https://polyphemus.ucsf.edu"
+      :none
     end
   end
 
@@ -41,11 +37,8 @@ class EtnaApp
     include Etna::CommandExecutor
 
     class Show < Etna::Command
-
-      boolean_flags << '--all'
-
-      def execute(all: false)
-        if all
+      def execute
+        if EtnaApp.instance.environment == :many
           File.open(EtnaApp.config_file_path, 'r') { |f| puts f.read }
         else
           puts "Current environment: #{EtnaApp.instance.environment}"
@@ -253,7 +246,6 @@ class EtnaApp
         class UpdateFromCsv < Etna::Command
           include WithEtnaClients
           include WithLogger
-          include RequireConfirmation
 
           def magma_crud
             @magma_crud ||= Etna::Clients::Magma::MagmaCrudWorkflow.new(

data/lib/etna/generate_autocompletion_script.rb

@@ -72,7 +72,6 @@ module Etna
       enable_flags(scope.class)
       write 'while [[ "$#" != "0" ]]; do'
       generate_start_match(scope.subcommands.keys)
-      generate_flag_handling
 
       scope.subcommands.each do |name, command|
         write %Q(elif [[ "$1" == "#{name}" ]]; then)
@@ -84,6 +83,8 @@ module Etna
         end
       end
 
+      generate_flag_handling
+
       write "else"
       write "return"
       write "fi"

data/lib/helpers.rb

@@ -7,6 +7,12 @@ module WithEtnaClients
   end
 
   def token
+    if environment == :many
+      raise "You have multiple environments configured, please specify your environment by adding --environment #{@config.keys.join("|")}"
+    elsif environment == :none
+      raise "You do not have a successfully configured environment, please run #{program_name} config set https://polyphemus.ucsf.edu"
+    end
+
     env_token = ENV['TOKEN']
     if !env_token
       puts "No environment variable TOKEN is set.  You should set your token with `export TOKEN=<your.janus.token>` before running."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -175,7 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Base classes for Mount Etna applications