wdi_runas 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc34fccab31d8c247bf560b56f53c05e9b0cbe2e
-  data.tar.gz: e9fd612410995e972f2ad670a045ae16e0408c77
+  metadata.gz: d8ecbe7646139e63740d438b5f9139e74f2797d1
+  data.tar.gz: 144ac2590a4d06ce57c13cd4b52d926bf83e3275
 SHA512:
-  metadata.gz: d99d51e732876b3d8038e24b4166454b38158e42e41484c4eb620c2735746a0e3dfb6d141e9d9cd70f809caf8462a80586e806cddb9246a224ea0463134d9003
-  data.tar.gz: bb1651aaa016d43aaf3822352671fdf93d278a2c04103e64a07becfc688eba2712f5878ac7d7f8bfa1c567df644a1e18669dc3aabc1faca062594b8648c2fdfd
+  metadata.gz: 5b78e63381f07ed2b7c059fcdfbf3ca581acffa970e988b4c261d66ebf34c3c3a061a1ced7dc5783e03681ce52b2e298e866f079c8b4843da1440a53b0985411
+  data.tar.gz: b2469db23e2a25554792a8ffebdfbf253b7b459088c64a905bf33fbd7b84dc3f54d5dd7d4c8b6289293a4d75f4427cc0d2512210eb9ae9570736d2e185bbb2cc

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v0.5.2
+
+Fixed the bug where the current PROMPT was not supporting
+shell functions and colors but rather just rendering the old prompt code
+as text. https://github.com/vancluever/aws-runas/issues/13
+
+## 0.5.1
+
+Increase the session timeout from 1 hour to 24 hours.
+Rename from aws_runas to wdi_runas
+
 ## v0.5.0
 
 ### Zsh Support

data/README.md

@@ -74,8 +74,9 @@ shells:
    returns 0 on true and 1 on false, which can be used semantically in shell
    scripts.
  * `aws_session_status_color`, which works off of `aws_session_expired` to
-   render an ANSI numeric color code - red when `aws_session_expired` is `true`,
-   yellow otherwise.
+   render either an ANSI color number (for bash)
+   or a human readable color name (for zsh)
+   - (red or 31) when `aws_session_expired` is `true`, (yellow or 33) otherwise.
 
 #### Skipping the Fancy Prompt
 

data/lib/aws_runas/utils.rb

@@ -37,7 +37,7 @@ module AwsRunAs
       rc_file.write("#{rc_data}\n") unless rc_data.nil?
       rc_file.write(IO.read("#{shell_profiles_dir}/sh.profile"))
       unless skip_prompt
-        rc_file.write("PS1=\"\\[\\e[\\$(aws_session_status_color)m\\](#{message})\\[\\e[0m\\] $PS1\"\n")
+        rc_file.write("PS1=\"\\[\\e[\\$(aws_session_status_color \"bash\")m\\](#{message})\\[\\e[0m\\] $PS1\"\n")
       end
       rc_file.close
       system(env, path, '--rcfile', rc_file.path)
@@ -56,8 +56,8 @@ module AwsRunAs
       rc_file.write(IO.read("#{shell_profiles_dir}/sh.profile"))
       unless skip_prompt
         rc_file.write("setopt PROMPT_SUBST\n")
-        rc_file.write("export OLDPROMPT=\"${PROMPT}\"\n")
-        rc_file.write("PROMPT=$'%{\\e[\\%}$(aws_session_status_color)m(#{message})%{\\e[0m%} $OLDPROMPT'\n")
+        rc_file.write("OLDPROMPT=\"$PROMPT\"\n")
+        rc_file.write("PROMPT=\"%F{$(aws_session_status_color \"zsh\")}(#{message})%f $OLDPROMPT\"\n")
       end
       rc_file.close
       env.store('ZDOTDIR', rc_dir)

data/lib/aws_runas/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module AwsRunAs
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/shell_profiles/sh.profile

@@ -10,14 +10,21 @@ aws_session_expired() {
   return 1
 }
 
-# aws_session_status_color returns an ANSI color number for the specific status
+# aws_session_status_color returns either an ANSI color number (for bash)
+# or a human readable color name (for zsh) for the specific status
 # of the session. Note that if session_expired is not correctly functioning,
 # this will always be yellow. Red is shown when it's verified that the session
 # has expired.
 aws_session_status_color() {
   if aws_session_expired; then
-    echo "31"
+    if [[ "$1" == zsh ]]; then
+      echo "red"
+    fi
+      echo "31"
   else
-    echo "33"
+    if [[ "$1" == zsh ]]; then
+      echo "yellow"
+    fi
+      echo "33"
   fi
 }

data/spec/helpers/utils_spec.rb

@@ -11,10 +11,10 @@ ZSHRC_FILE_CONTENTS = <<EOS.freeze
 bazqux
 EOS
 
-BASHRC_EXPECTED_PROMPT   = "PS1=\"\\[\\e[\\$(aws_session_status_color)m\\](AWS:rspec)\\[\\e[0m\\] $PS1\"\n".freeze
-ZSHRC_EXPECTED_PROMPT    = "PROMPT=$'%{\\e[\\%}$(aws_session_status_color)m(AWS:rspec)%{\\e[0m%} $OLDPROMPT'\n".freeze
+BASHRC_EXPECTED_PROMPT   = "PS1=\"\\[\\e[\\$(aws_session_status_color \"bash\")m\\](AWS:rspec)\\[\\e[0m\\] $PS1\"\n".freeze
+ZSHRC_EXPECTED_PROMPT    = "PROMPT=\"%F{$(aws_session_status_color \"zsh\")}(AWS:rspec)%f $OLDPROMPT\"\n".freeze
 ZSHRC_EXPECTED_SETSUBST  = "setopt PROMPT_SUBST\n".freeze
-ZSHRC_EXPECTED_OLDPROMPT = "export OLDPROMPT=\"${PROMPT}\"\n".freeze
+ZSHRC_EXPECTED_OLDPROMPT = "OLDPROMPT=\"$PROMPT\"\n".freeze
 ZSH_MOCK_TMPDIR          = "#{Dir.tmpdir}/aws_runas_zsh_rspec".freeze
 
 EXPECTED_ENV = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wdi_runas
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Chris Marchesi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk