ecl 3.0.1 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d418f427cd07120e2ce1d561201f39577631d88cf2c5f11a8a454f6cb1e5a88e
-  data.tar.gz: 4ecd65b9f7ea0204918b0d2c54bb07dff681e631fd0b3705f269038dfb2d17bb
+  metadata.gz: 9f6a55e474acea1a8a0092e23a7b3533fca93dd185ef334536e9816b142779d6
+  data.tar.gz: de85ae66b54a0b8aa577ae742817c67481ef21845706287a3c707731d63608ba
 SHA512:
-  metadata.gz: 5cf13d19cd882fc13eef4ece7c08360060aa509135c1d2796f4f93ffd94b756b83d38b9e73d50ff3518eec2b7ee55fa3d8f865715236b2c7b6d47a658d9e2807
-  data.tar.gz: 21b952fc210aa49b9ded6cf5f58fb9d238f131205d4050aa0cca8f6b09d46e2bb8a0736bca54b9bbd7d70de24c33281cff756e8bd551334eae88cf4b848eb070
+  metadata.gz: d414ab9f80aef8f1a92f43ac576240a4717dd7d85558938ac1211beb6f86661af9e46953ca14de73328ca958768d202202667b69dccfc787a41172bd1d7bdbb8
+  data.tar.gz: b13b9766f789f2c2b3284b3e5d3645c1c31e0b6541b8df2a67378dde94ea8236a49e1446c7211c427eba0a7f2be27532153b23733b4382bf613f197d7f859226

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecl (3.0.1)
+    ecl (3.0.3)
       aws-sdk-ec2 (~> 1.18)
       curses (~> 1.0)
       json (~> 2.1)
@@ -13,26 +13,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.240.0)
-    aws-sdk-core (3.78.0)
+    aws-partitions (1.294.0)
+    aws-sdk-core (3.92.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.116.0)
+    aws-sdk-ec2 (1.151.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
     coderay (1.1.2)
-    curses (1.3.1)
+    curses (1.3.2)
     jmespath (1.4.0)
-    json (2.2.0)
-    method_source (0.9.2)
-    oj (3.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    json (2.3.0)
+    method_source (1.0.0)
+    oj (3.10.6)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.0.1)
     ruby-string-match-scorer (0.1.0)
 
@@ -45,4 +45,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -110,6 +110,19 @@ config.ssh_keys = {
 }
 ```
 
+### use_vpc_id_env (Experimental)
+_This Feature is experimental and subject to change in future versions_ 
+
+Boolean variable. If true use VPC_ID Environment variable for filtering EC2 instances.
+```ruby
+config.use_vpc_id_env = true
+```
+
+Example VPC_ID variable:
+```
+VPC_ID=vpc-12345678901234567
+```
+
  
 
 Install from Source
@@ -124,7 +137,7 @@ sudo yum install libncursesw5-devel     # CentOS, etc
 gem build eclair.gemspec
 
 # Install eclair into your system
-gem install ecl-3.0.1.gem
+gem install ecl-3.0.4.gem
 ```
 
  

data/lib/eclair/config.rb

@@ -40,6 +40,7 @@ module Eclair
       @exec_format          = "{ssh_command} {ssh_options} -p{port} {ssh_key} {username}@{host}"
       @provider             = :ec2
       @get_pods_option      = ""
+      @use_vpc_id_env       = false
 
       instance_variables.each do |var|
         Config.class_eval do
@@ -52,7 +53,7 @@ module Eclair
       new_dir = "#{ENV['HOME']}/.ecl"
       new_conf  = "#{ENV['HOME']}/.ecl/config.rb"
 
-      if !File.exists?(new_conf) && File.exists?(old_conf)
+      if !File.exist?(new_conf) && File.exist?(old_conf)
         FileUtils.mkdir_p new_dir
         FileUtils.mv old_conf, new_conf
         puts "#{old_conf} migrated to #{new_conf}"
@@ -60,7 +61,7 @@ module Eclair
         exit
       end
 
-      unless File.exists? @config_file
+      unless File.exist? @config_file
         template_path = File.join(File.dirname(__FILE__), "..", "..", "templates", "eclrc.template")
         FileUtils.mkdir_p(File.dirname(@config_file))
         FileUtils.cp(template_path, @config_file)
@@ -69,8 +70,8 @@ module Eclair
       end
 
       key_path = "#{new_dir}/keys"
-      FileUtils.mkdir_p key_path unless Dir.exists? key_path
-      # FileUtils.mkdir_p CACHE_DIR unless Dir.exists? CACHE_DIR
+      FileUtils.mkdir_p key_path unless Dir.exist? key_path
+      # FileUtils.mkdir_p CACHE_DIR unless Dir.exist? CACHE_DIR
     end
 
     def after_load

data/lib/eclair/grid.rb

@@ -172,7 +172,7 @@ module Eclair
     def append_search key
       return unless key
 
-      if @search_buffer.length > 0 && key == 127 # backspace
+      if @search_buffer.length > 0 && (key == 127 || key == Curses::KEY_BACKSPACE || key == 8) #backspace
         @search_buffer = @search_buffer.chop
       elsif key.to_s.length == 1
         begin

data/lib/eclair/provider.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
+require "eclair/config"
+
 module Eclair
   module Provider
+    include ConfigHelper
+
     extend self
     attr_accessor :items
 

data/lib/eclair/providers/ec2/ec2_item.rb

@@ -53,13 +53,6 @@ module Eclair
       "echo Attaching to #{Shellwords.escape(name)} \\[#{@instance.instance_id}\\] && #{joined_cmd}"
     end
 
-    def header
-      <<-EOS
-      #{name} (#{instance_id}) [#{state[:name]}]
-      launched at #{launch_time.to_time}
-      EOS
-    end
-
     def image
       @image ||= provider.find_image_by_id(@instance.image_id)
     end
@@ -70,7 +63,7 @@ module Eclair
 
     def header
       <<-EOS
-      #{name} (#{@instance.instance_id}) [#{@instance.state[:name]}]
+      #{name} (#{@instance.instance_id}) [#{@instance.state[:name]}] #{@instance.private_ip_address}
       launched at #{@instance.launch_time.to_time}
       EOS
     end

data/lib/eclair/providers/ec2/ec2_provider.rb

@@ -93,6 +93,13 @@ module Eclair
 
     def fetch_instances keyword
       filter = if keyword.empty? then {} else { filters: [{name: "tag:Name", values: ["*#{keyword}*"]}] } end
+      if config.use_vpc_id_env then
+        if filter.empty? then
+          filter = { filters: [{name: "vpc-id", values: [ENV['VPC_ID']]}] }
+        else
+          filter[:filters].push({name: "vpc-id", values: [ENV['VPC_ID']]})
+        end
+     end
 
       ec2_client.describe_instances(filter).map{ |resp|
         resp.data.reservations.map do |rsv|

data/lib/eclair/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Eclair
-  VERSION = "3.0.1"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecl
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Devsisters
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,7 +166,7 @@ homepage: https://github.com/devsisters/eclair
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.4.12
+signing_key:
 specification_version: 4
 summary: EC2 ssh helper
 test_files: []