ec2ssh 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a9fc26414d2229c5799e37e4c57d462a93fae33
-  data.tar.gz: da75a3f732e6422304d4146b983b5ce59aa1d8f1
+  metadata.gz: 427d803411f39f80c250748ed172af0f72308082
+  data.tar.gz: 0378e1f19cfd75db31a2441967b46e72f3abbd15
 SHA512:
-  metadata.gz: 7f9ce9fa0b70be913f10f57dd9c7eefef819459681a1ab5fca2f474abb99c4eaa5b9f09159836bf7c36e384ad7d403083458b2ba2c1167d068429330e9481e2d
-  data.tar.gz: 9d594fbdb67366d832bed0c6b6633485d8481f765d4ab2bfd37c66c949477fe9a90675c85564da36698df2074f68a6a3e8237bafcc776f67ceb6d69cabf6ce79
+  metadata.gz: f8e5de4f469dbbfc56f6061484932748b0e6387f72035b51d9a53ce453fa2b8ee4007ce06e253ef087073c61d05999991ac44c16959a86b84a35d384261e8556
+  data.tar.gz: a77fffdc9fec166647df4372238a277600bed4a8dbc8c4fa3935311de0a2b8f3712441ac6ec3f0bd4386a04d0b491ad976ef63797ddcf18bc1caf95f893678d9

data/ChangeLog.md

@@ -1,4 +1,9 @@
 # Change Log
+## 3.0.3
+* Use "%-" for ERB's trim\_mode at `host\_line` in dotfile (#29)
+* Add 'shellcomp' command: loading completion functions easily in bash/zsh (#27)
+  Thanks to @hayamiz
+
 ## 3.0.2
 * Add zsh completion file (#26)
   Thanks to @hayamiz

data/bash/ec2ssh.bash

@@ -0,0 +1,53 @@
+# bash completion support for ec2ssh
+
+_ec2ssh() {
+    local cmd cur prev subcmd
+    cmd=$1
+    cur=$2
+    prev=$3
+
+    subcmds="help init migrate remove update version"
+    common_opts="--dotfile --verbose"
+
+    # contextual completion
+    case $prev in
+        ec2ssh)
+            case "$cur" in
+                -*)
+                    COMPREPLY=( $(compgen -W "$common_opts" $cur) )
+                    ;;
+                *)
+                    COMPREPLY=( $(compgen -W "$subcmds" $cur) )
+            esac
+            return 0
+            ;;
+        --aws-key)
+            COMPREPLY=()
+            return 0;
+            ;;
+        --dotfile)
+            COMPREPLY=( $(compgen -o default -- "$cur"))
+            return 0;
+            ;;
+    esac
+
+    # complete options
+    subcmd=${COMP_WORDS[1]}
+
+    case $subcmd in
+        update)
+            COMPREPLY=( $(compgen -W "--aws-key $common_opts" -- "$cur") )
+            ;;
+        help)
+            COMPREPLY=( $(compgen -W "$subcmds" $cur) )
+            ;;
+        *)
+            COMPREPLY=( $(compgen -W "$common_opts" -- "$cur") )
+            ;;
+    esac
+
+    return 0
+
+}
+
+complete -F _ec2ssh ec2ssh

data/lib/ec2ssh/builder.rb

@@ -6,7 +6,9 @@ module Ec2ssh
   class Builder
     def initialize(container)
       @container = container
-      @host_lines_erb = ERB.new @container.host_line
+      safe_level = nil
+      erb_trim_mode = '%-'
+      @host_lines_erb = ERB.new @container.host_line, safe_level, erb_trim_mode
     end
 
     def build_host_lines
@@ -16,10 +18,11 @@ module Ec2ssh
         ec2s.instances(name).each do |instance|
           bind = instance.instance_eval { binding }
           next if @container.reject && @container.reject.call(instance)
-          out.puts @host_lines_erb.result(bind)
+          line = @host_lines_erb.result(bind).rstrip
+          out.puts line unless line.empty?
         end
       end
-      out.string
+      out.string.rstrip
     end
 
     def ec2s

data/lib/ec2ssh/cli.rb

@@ -51,6 +51,38 @@ module Ec2ssh
       command.run
     end
 
+    desc 'shellcomp [-]', 'Initialize shell completion for bash/zsh'
+    def shellcomp(_ = false)
+      if args.include?("-")
+        print_rc = true
+      else
+        print_rc = false
+      end
+
+      # print instructions for automatically enabling shell completion
+      unless print_rc
+        puts <<EOS
+# Enable ec2ssh completion by adding
+# the following to .bash_profile/.zshrc
+
+type ec2ssh >/dev/null 2>&1 && eval "$(ec2ssh shellcomp -)"
+
+EOS
+        exit(false)
+      end
+
+      # print shell script for enabling shell completion
+      zsh_comp_file = File.expand_path("../../../zsh/_ec2ssh", __FILE__)
+      bash_comp_file = File.expand_path("../../../bash/ec2ssh.bash", __FILE__)
+      puts <<EOS
+if [ -n "${BASH_VERSION:-}" ]; then
+    source #{bash_comp_file}
+elif [ -n "${ZSH_VERSION:-}" ]; then
+    source #{zsh_comp_file}
+fi
+EOS
+    end
+
     desc 'version', 'Show version'
     def version
       require 'ec2ssh/version'

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/spec/lib/ec2ssh/builder_spec.rb

@@ -38,7 +38,7 @@ describe Ec2ssh::Builder do
     end
 
     it do
-      expect(builder.build_host_lines).to eq <<-END
+      expect(builder.build_host_lines).to eq <<-END.rstrip
 # section: key1
 Host srv1
 Host srv2
@@ -54,7 +54,7 @@ Host srv4
       end
 
       it do
-        expect(builder.build_host_lines).to eq <<-END
+        expect(builder.build_host_lines).to eq <<-END.rstrip
 # section: key1
 Host srv2
 # section: key2
@@ -63,5 +63,27 @@ Host srv4
         END
       end
     end
+
+    context 'checking erb trim_mode' do
+      before do
+        container.host_line = <<-END
+% if tags['Name']
+  <%- if tags['Name'] == 'srv3' -%>
+Host <%= tags['Name'] %>
+  HostName <%= tags['Name'] %>
+  <%- end -%>
+% end
+        END
+      end
+
+      it do
+        expect(builder.build_host_lines).to eq <<-END.rstrip
+# section: key1
+# section: key2
+Host srv3
+  HostName srv3
+        END
+      end
+    end
   end
 end

data/spec/lib/ec2ssh/command/update_spec.rb

@@ -86,7 +86,6 @@ Host srv1
   HostName 10.0.0.1
 Host srv2
   HostName 10.0.0.2
-
 ### EC2SSH END ###
 
 # after lines...

data/spec/lib/ec2ssh/dsl_spec.rb

@@ -2,9 +2,6 @@ require 'spec_helper'
 require 'ec2ssh/dsl'
 
 describe Ec2ssh::Dsl do
-  shared_examples 'a filled dsl container' do
-  end
-
   let(:dsl_str) do
 <<-END
 aws_keys(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,6 +69,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bash/ec2ssh.bash
 - bin/ec2ssh
 - ec2ssh.gemspec
 - example/example.ec2ssh