ecl 1.2.1 → 3.0.0.pre.alpha1

data/lib/eclair/providers/gce/gce_provider.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'eclair/provider'
+require 'eclair/providers/gce/gce_item'
+require 'eclair/providers/gce/gce_group_item'
+require 'oj'
+
+module Eclair
+  module GCEProvider
+    extend Provider
+    extend self
+
+    def group_class
+      GCEGroupItem
+    end
+
+    def item_class
+      GCEItem
+    end
+
+    def prepare keyword
+      instances = Oj.load(`gcloud compute instances list --format=json`)
+      @items = instances.map{|i| GCEItem.new(i)}
+    end
+
+    def items
+      @items
+    end
+
+    private
+    def config
+      Eclair.config
+    end
+  end
+end

data/lib/eclair/providers/k8s.rb

@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+require "eclair/providers/k8s/k8s_provider"

data/lib/eclair/providers/k8s/k8s_group_item.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require "eclair/group_item"
+
+module Eclair
+  class K8sGroupItem < GroupItem
+    def header
+      all = @items.count
+
+      <<-EOS
+      Group #{label}
+      #{all} pods Total
+      EOS
+    end
+  end
+end

data/lib/eclair/providers/k8s/k8s_item.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+require 'eclair/item'
+require 'eclair/providers/k8s/k8s_provider'
+require 'time'
+
+module Eclair
+  class K8sItem < Item
+    attr_reader :pod
+
+    def initialize pod
+      super()
+      @pod = pod
+    end
+
+    def id
+      @pod["metadata"]["uid"]
+    end
+
+    def color
+      if @selected
+        [Curses::COLOR_YELLOW, -1, Curses::A_BOLD]
+      elsif !connectable?
+        [Curses::COLOR_BLACK, -1, Curses::A_BOLD]
+      else
+        [Curses::COLOR_WHITE, -1]
+      end
+    end
+
+    def exec_command
+      @pod["metadata"]["labels"]["eclair_exec_command"] || "/bin/sh"
+    end
+
+    def command
+      "kubectl exec --namespace #{namespace} -ti #{name} #{exec_command}"
+    end
+
+    def header
+      <<-EOS
+      #{name}
+      launched at #{launch_time.to_time}
+      EOS
+    end
+
+    def label
+      " - #{name} [#{launched_at}]"
+    end
+
+    def namespace
+      @pod["metadata"]["namespace"]
+    end
+
+    def name
+      @pod["metadata"]["name"]
+    end
+
+    def connectable?
+      status == "running"
+    end
+
+    def search_key
+      name.downcase
+    end
+
+    private
+
+    def status
+      @pod["status"]["containerStatuses"].first["state"].keys.first rescue nil
+    end
+
+    def launch_time
+      Time.parse(@pod["metadata"]["creationTimestamp"])
+    end
+
+    def launched_at
+      diff = Time.now - launch_time
+      {
+        "year" => 31557600,
+        "month" => 2592000,
+        "day" => 86400,
+        "hour" => 3600,
+        "minute" => 60,
+        "second" => 1
+      }.each do |unit,v|
+        if diff >= v
+          value = (diff/v).to_i
+          return "#{value} #{unit}#{value > 1 ? "s" : ""}"
+        end
+      end
+      "now"
+    end
+  end
+end

data/lib/eclair/providers/k8s/k8s_provider.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'eclair/provider'
+require 'eclair/providers/k8s/k8s_item'
+require 'eclair/providers/k8s/k8s_group_item'
+require 'oj'
+
+module Eclair
+  module K8sProvider
+    extend Provider
+    extend self
+
+    def group_class
+      K8sGroupItem
+    end
+
+    def item_class
+      K8sItem
+    end
+
+    def prepare keyword
+      pods = Oj.load(`kubectl get pods #{config.get_pods_option} -o json`)["items"].select{|i| i["metadata"]["name"].include? keyword or i["metadata"]["namespace"].include? keyword}
+      @items = pods.map{|i| K8sItem.new(i)}
+    end
+
+    def items
+      @items
+    end
+
+    private
+    def config
+      Eclair.config
+    end
+  end
+end

data/lib/eclair/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Eclair
-  VERSION = "1.2.1"
+  VERSION = "3.0.0-alpha1"
 end

data/templates/eclrc.template

@@ -1,34 +1,64 @@
+# frozen_string_literal: true
+
+## Default configuration.
 Eclair.configure do |config|
-  # aws_region - AWS region to connect.
-  # This overrides AWS_REGION environment variable, so you can comment out this line if you set this in environment variable.
-  config.aws_region = "ap-northeast-1"
+  ## provider - Cloud provider to connect.
+  ## You can use either AWS EC2 (:ec2) or Kubernetes (:k8s) with eclair. AWS
+  ## EC2 is used by default.
+  # config.provider = :ec2
+
+  ## aws_region - AWS region to connect.
+  ## This overrides AWS_REGION environment variable, so you can comment out this
+  ## line if you set this in environment variable.
+  # config.aws_region = "ap-northeast-1"
 
-  # columns - Max number of columns displayed in eclair.
-  config.columns = 4
+  ## columns - Max number of columns displayed in eclair. (Default: 4)
+  # config.columns = 4
 
-  # ssh_username - Function to find username from image
-  # You can use image data from EC2::Client#describe_images API call
-  # https://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Client.html#describe_images-instance_method
+  ## ssh_username - Function to find username from image.
+  ## You can use image data from EC2::Client#describe_images API call.
+  ## https://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Client.html#describe_images-instance_method
   config.ssh_username = lambda do |image|
     case image.name
-    when /ubuntu/
-      "ubuntu"
-    else
+
+    ## Add your own configurations here.
+    # when /OpenVPN/
+    #   "openvpnas"
+
+    when /ubuntu/i
+      "ubuntu" ## https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AccessingInstancesLinux.html#AccessingInstancesLinuxSSHClient
+    when /centos/i
+      "centos" ## https://wiki.centos.org/Cloud/AWS
+    when /debian/i
+      "admin" ## https://wiki.debian.org/Cloud#FAQ
+    when /^bitnami-/
+      "bitnami" ## https://docs.bitnami.com/aws/faq/#how-to-connect-to-the-server-through-ssh
+    when /CoreOS/
+      "core" ## https://coreos.com/os/docs/latest/booting-on-ec2.html#ssh-to-your-instances
+    when /redhat/i, /RHEL|rhel/, /fedora/i, /suse/i, /SLES|sles/, /FreeBSD/
       "ec2-user"
+    else
+      fallback = "ec2-user"
+      msg = "Cannot infer ssh username of image \e[33m#{image.name}\e[0m. Fallback to \e[33m#{fallback}\e[0m"
+      STDERR.puts STDERR.isatty ? msg : msg.gsub(/\e\[([;\d]+)?m/, '')
+      fallback
     end
   end
 
-  # ssh_keys - Hash of key_name => key_path in local.
-  # If your key has been already registered in ssh-agent, you don't have to configure this.
-  config.ssh_keys = {
-  }
+  ## ssh_keys - Hash of key_name => key_path in local.
+  ## If your key has been already registered in ssh-agent, you don't have to
+  ## configure this. (Default: {})
+  # config.ssh_keys = {
+  # }
 
-  # group_by - Function to find group name from instance.
-  # Make a function that returns group name from instance data
-  # You can access response data extracted from EC2::Client#describe_instances API call
-  # https://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Client.html#describe_instances-instance_method
+  ## group_by - Function to find group name from instance.
+  ## Make a function that returns group name from instance data.
+  ## You can access response data extracted from EC2::Client#describe_instances
+  ## API call.
+  ##
+  ## https://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Client.html#describe_instances-instance_method
 
-  # If you want to group instances by security group, uncomment example below. (default option)
+  ## If you want to group instances by security group, uncomment the example below. (Default behavior)
   # config.group_by = lambda do |instance|
   #   if instance.security_groups.first
   #     instance.security_groups.first.group_name
@@ -37,11 +67,9 @@ Eclair.configure do |config|
   #   end
   # end
 
-  # If you want to group instances by name, uncomment and edit example below.
+  ## If you want to group instances by name, uncomment and edit the example below.
   # config.group_by = lambda do |instance|
-  #   nametag = instance.tags.find{|t| t.key == "Name"}
-  #   return "Noname" unless nametag
-  #   case nametag.value
+  #   case instance.name
   #   when /^production/
   #     "production servers"
   #   when /^test/
@@ -49,18 +77,36 @@ Eclair.configure do |config|
   #   end
   # end
 
-  # If you do not want to group instances, uncomment below line.
-  # config.group_by = nil  
+  ## If you do not want to group instances, uncomment the line below.
+  # config.group_by = nil
+
+  ## ssh_ports - Port numbers to try ssh.
+  ## Eclair will try to ssh specified ports in order with ConnectTimeout below.
+  # config.ssh_ports = [22]
 
-  # ssh_ports - Port numbers to try ssh.
-  # Eclair will try to ssh specified ports in order with ConnectTimeout below.
-  config.ssh_ports = [22]
+  ## ssh_options - Extra options passed to ssh.
+  ## ConnectTimeout should exist when you want to connect to multiple ports.
+  # config.ssh_options = "-o ConnectTimeout=1 -o StrictHostKeyChecking=no"
 
-  # ssh_options - Extra options passed to ssh.
-  # ConnectTimeout should exist when you want to connect to multiple ports.
-  config.ssh_options = "-o ConnectTimeout=1 -o StrictHostKeyChecking=no"
+  ## ssh_command - Name of the binary which will be used to establish ssh
+  ## connection. (Default: "ssh")
+  # config.ssh_command = "/usr/bin/ssh"
 
-  # ssh_hostname - Hostname to use for ssh.
-  # You can choose from :public_dns_name, :public_ip_address, :private_dns_name, :private_ip_address
-  config.ssh_hostname = :public_ip_address
+  ## exec_format - Format of the shell command which will be executed in the
+  ## shell. (Default: "{ssh_command} {ssh_options} -p{port} {ssh_key} {username}@{host}")
+  # config.exec_format = "echo 'hi' && {ssh_command} {ssh_options} -p{port} {ssh_key} {username}@{host}"
+end
+
+## Alternative configuration.
+##
+## You can easily switch between multiple configurations with 'ECL_PROFILE'
+## environment variable. To use 'k8s' configuration, execute eclair like below:
+##
+##     ECL_PROFILE=k8s ecl
+Eclair.configure "k8s" do |config|
+  config.provider = :k8s
+  config.get_pods_option = "--all-namespaces"
+  config.group_by = lambda do |item|
+    item.namespace
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecl
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 3.0.0.pre.alpha1
 platform: ruby
 authors:
 - Devsisters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-string-match-scorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: ruby-string-match-scorer
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Simple ssh helper for Amazon EC2
 email:
 - se@devsisters.com
@@ -104,28 +132,35 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bin/setup
 - eclair.gemspec
 - exe/ecl
 - lib/eclair.rb
-- lib/eclair/cell.rb
 - lib/eclair/color.rb
-- lib/eclair/column.rb
 - lib/eclair/config.rb
-- lib/eclair/console.rb
 - lib/eclair/grid.rb
-- lib/eclair/group.rb
-- lib/eclair/helpers/aws_helper.rb
-- lib/eclair/helpers/benchmark_helper.rb
-- lib/eclair/helpers/common_helper.rb
-- lib/eclair/instance.rb
+- lib/eclair/group_item.rb
+- lib/eclair/item.rb
 - lib/eclair/less_viewer.rb
-- lib/eclair/matcher.rb
+- lib/eclair/provider.rb
+- lib/eclair/providers/ec2.rb
+- lib/eclair/providers/ec2/ec2_group_item.rb
+- lib/eclair/providers/ec2/ec2_item.rb
+- lib/eclair/providers/ec2/ec2_provider.rb
+- lib/eclair/providers/gce.rb
+- lib/eclair/providers/gce/gce_group_item.rb
+- lib/eclair/providers/gce/gce_item.rb
+- lib/eclair/providers/gce/gce_provider.rb
+- lib/eclair/providers/k8s.rb
+- lib/eclair/providers/k8s/k8s_group_item.rb
+- lib/eclair/providers/k8s/k8s_item.rb
+- lib/eclair/providers/k8s/k8s_provider.rb
 - lib/eclair/version.rb
+- out.gif
 - templates/eclrc.template
 homepage: https://github.com/devsisters/eclair
 licenses:
@@ -142,14 +177,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: EC2 ssh helper
 test_files: []
-has_rdoc: