kanmon 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271479b1cbec8d070ad4daaaa7a47af0e77862a271f7417cb00c88d6e51f6df5
-  data.tar.gz: 4a0a8c012fe218f30c63ff3921038e2e817b7ea4f39d9dbccea049f199893c4f
+  metadata.gz: 7cd9e1d8a755e41165434ffa463b63985f11d472198afc132c3d6c32ad962196
+  data.tar.gz: cf18367379ee2bd8bf97844cdcba1f0cd49f0103b64c66f5124373218c7de991
 SHA512:
-  metadata.gz: 588b0c59e9697d502483ef90c3b5b1c774809c08883238b9b99ae4840002b06dd49e0e3cb7121ccac6d25ec7412ec87cd6deb27b6f668074240618d0a0c18184
-  data.tar.gz: 7f42b9031b1fea39f1cbdf5c9747333e30f89a6034e1402287cbb15258a4d61c1806085c114044bcfc342cbfca705e0f75e605b503ee67ecf50cd11aba083def
+  metadata.gz: 252463b76b73e7df45e78d08dae7cf93594d0e3e8df629d9d0270473b0f5e837b63836f7d7412da111400ddd9948b3ec71e8c9c05fa505223a2ca9afba5c2a30
+  data.tar.gz: 7511a1468e453590f321400a699ccc704627f00eb2efd96040f32fa39fc737385abba27b9fa044939b5541dab0faa97d5002ae54972dbc62b5ad60f1583056d3

data/kanmon.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yao", ">= 0.4.1"
+  spec.add_dependency "yao", ">= 0.12.0"
   spec.add_dependency "thor", ">= 0.20.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/kanmon.rb

@@ -21,8 +21,4 @@ module Kanmon
     end
   end
 
-  def self.load_config(file_name)
-    YAML.load_file(file_name)
-  end
-
 end

data/lib/kanmon/cli.rb

@@ -5,79 +5,95 @@ require "kanmon/version"
 require "kanmon/securitygroup"
 require "kanmon/server"
 require "kanmon/exclude_ips"
-
-module Yao::Resources
-  class Server < Yao::Resources::Base
-    def self.add_security_group(server_id, security_group_name)
-      action(server_id, {"addSecurityGroup": {"name": security_group_name}})
-    end
-
-    def self.remove_security_group(server_id, security_group_name)
-      action(server_id, {"removeSecurityGroup": {"name": security_group_name}})
-    end
-  end
-end
+require "kanmon/config"
 
 module Kanmon
   class CLI < Thor
-    class_option :kanmon_config, aliases: "f", type: :string, default: "kanmon.yml", banner: "FILE", desc: "Load configure from FILE"
+    class_option :config_file, aliases: "f", type: :string, default: nil, banner: "FILE", desc: "Specifies an alternate configuration file. (Default: ~/.kanmon.yml or ./kanmon.yml)"
     class_option :target, aliases: "t", type: :string, default: nil, banner: "TARGET", desc: "If more than one Security Group is in the setting, select target"
 
     desc "open", "Commands about add rules to SecurityGroup"
     def open
-      @kanmon.open
+      adapter = load_adapter(config)
+      adapter.open
       puts "Success!!"
     rescue Yao::Conflict => e
       puts "Is not it already opened?" if e.message.include?("Security group rule already exists.")
       puts e
+    rescue Kanmon::AlreadySecurityExistsError
     end
 
     desc "close", "Commands about delete rules from SecurityGroup"
+    method_option :all, aliases: "a", type: :boolean, default: false, desc: "If set, close all Security Groups(Exclusive witeh --target)"
     def close
-      @kanmon.close
+      if options[:all] && options[:target].nil?
+        config.targets.each do |name|
+          puts "Checking #{name}"
+          config.set(name)
+          adapter = load_adapter(config)
+          adapter.close
+        end
+      else
+        adapter = load_adapter(config)
+        adapter.close
+      end
       puts "Success!!"
     end
 
-    desc "ssh HOSTNAME", "Commands about exec ssh"
+    desc "ssh [args]", "Commands about exec ssh"
     def ssh(*args)
-      invoke :exec, args.unshift("ssh")
+      ssh_args = args.unshift("ssh", config.target)
+      invoke :exec, ssh_args
     end
 
     desc "exec COMMAND", "Commands about open, exec command, close"
     def exec(*args)
-      @kanmon.open do
+      adapter = load_adapter(config)
+      adapter.open do
         command = Shellwords.join(args)
         Process.wait spawn(command)
       end
     end
 
+    desc "list", "Commands about list targets"
+    def list
+      puts config.targets.sort.join("\n")
+    end
+
     desc "version", "Commands about show version"
     def version
       puts Kanmon::VERSION
     end
 
     no_commands do
-      def invoke_command(command, *args)
-        unless %w(help version).include?(command.name)
-          Kanmon.init_yao
-          @config = Kanmon.load_config(options[:kanmon_config])
-          @config = @config[options[:target]] if options[:target]
+      def config
+        if @__config.nil?
+          @__config = Config.load_file(options[:config_file])
+        end
+
+        if target = options[:target]
+          @__config.set(target)
+        end
+
+        @__config
+      end
+
+      def load_adapter(opts)
+        Kanmon.init_yao
 
-          if @config.key?("security_group")
-            @kanmon = SecurityGroup.new(@config["security_group"], @config["port"])
-          end
-          if @config.key?('server')
-            @kanmon = Server.new(@config["server"], @config["port"])
-          end
+        adapter = if opts.security_group
+                    SecurityGroup.new(opts.security_group, opts.port)
+                  elsif opts.server
+                    Server.new(opts.server, opts.port)
+                  end
 
-          exclude_ips = ExcludeIps.new(@config["exclude_ips"])
-          if exclude_ips.include?(@kanmon.ip)
-            puts "MyIP(#{@kanmon.ip}) is included in exclude IPs."
-            exit
-          end
+        exclude_ips = ExcludeIps.new(opts.exclude_ips)
+        if exclude_ips.include?(adapter.ip)
+          puts "MyIP(#{adapter.ip}) is included in exclude IPs."
+          exit
         end
 
-        super
+        adapter
       end
     end
   end

data/lib/kanmon/config.rb

@@ -0,0 +1,39 @@
+require "yaml"
+
+module Kanmon
+  class Config
+    def self.load_file(filepath)
+      data = if filepath
+               YAML.load_file(filepath)
+             else
+               default_files = [File.expand_path("~/.kanmon.yml"), "./kanmon.yml"]
+               config_file = default_files.find {|path| File.exists?(path)}
+               YAML.load_file(config_file)
+             end
+
+      new(data)
+    end
+
+    def initialize(data)
+      @data = data
+    end
+
+    def targets
+      @data.keys
+    end
+
+    def set(target)
+      @target = target
+    end
+
+    %w(security_group server port exclude_ips).each do |name|
+      define_method(name) do
+        if @target
+          @data[@target][name]
+        else
+          @data[name]
+        end
+      end
+    end
+  end
+end

data/lib/kanmon/error.rb

@@ -0,0 +1,8 @@
+
+module Kanmon
+  class AlreadySecurityExistsError < StandardError
+    def initialize(msg="Security Group already exists.")
+      super
+    end
+  end
+end

data/lib/kanmon/server.rb

@@ -1,6 +1,7 @@
 require "yao"
 
 require "kanmon/myip"
+require "kanmon/error"
 
 module Kanmon
   class Server
@@ -32,12 +33,21 @@ module Kanmon
       Yao::Server.add_security_group(@id, sg_name)
     end
 
+    def validate_sg_already_exists
+      if Yao::SecurityGroup.list({name: sg_name}).size > 0
+        puts "Security Group #{sg_name} already exists."
+        puts "Is not it already opened?"
+        raise Kanmon::AlreadySecurityExistsError
+      end
+    end
+
     def remove_sg
       puts "Remove security group #{sg_name} from server '#{@server.name}'."
       Yao::Server.remove_security_group(@id, sg_name)
     end
 
     def open
+      validate_sg_already_exists
       create_sg
       add_sg
 
@@ -53,10 +63,11 @@ module Kanmon
 
     def close
       begin
-        @sg = Yao::SecurityGroup.get(sg_name)
-        remove_sg
-        delete_sg
-
+        result = Yao::SecurityGroup.find_by_name(sg_name)
+        if @sg = result.first
+          remove_sg
+          delete_sg
+        end
       rescue => e
         p e
       end

data/lib/kanmon/version.rb

@@ -1,3 +1,3 @@
 module Kanmon
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanmon
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Yuki Koya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,8 @@ files:
 - kanmon.gemspec
 - lib/kanmon.rb
 - lib/kanmon/cli.rb
+- lib/kanmon/config.rb
+- lib/kanmon/error.rb
 - lib/kanmon/exclude_ips.rb
 - lib/kanmon/myip.rb
 - lib/kanmon/securitygroup.rb
@@ -124,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CLI tool of add public IP to Securoity Group on OpenStack.