egi-fedcloud-cloudhound 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6d1e60e2fbc93b5e6d6747ea4373ffe878d9fc
-  data.tar.gz: b17621e8590fe41fef073fd3751b200ce49c00ce
+  metadata.gz: c4e3b3c827061e35ca49b4ea566f0fa3264b4acd
+  data.tar.gz: 033094880617f0c90a25feaa5c4042c862d416a5
 SHA512:
-  metadata.gz: 63b816bef03b604dcf574a783480e1bab4a52af61d0cda94fb4f91c0e0fc23946b945ed0f81ee25d6e3860814eb0ea3c1a169966b48bce9fb83aefbc6632e7b9
-  data.tar.gz: 7a61a4cd04db86768da65fbbdb59f14cb8b41e629e67b9a1c736b202d2cf559afe5bb7ae8ff35d901c1f037357649a25ec5ccf5266e12f00f7e9dadcec22a566
+  metadata.gz: 37529d8dcd8fd6c4824ca091db0f959ae8212cc0a20058bc2c62f792db530cbf9b96f1b3c667228a525055466d35f0ab6fdd177e1681e32105f2e3bcfbe1e83b
+  data.tar.gz: 9d4e419443d9e6a20210332a7baa4da3fd728e1c021ddb76627d2adaae7e75aa64f410424d18f3730c684103fdff6394c06990f8345734b2a604a8109ce9f1e4

data/bin/egi-fedcloud-cloudhound

@@ -23,6 +23,8 @@ class EgiFedcloudCloudhound < Thor
   include Thor::Actions
 
   desc "all", "Prints information for all available cloud sites"
+  method_option :format, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.format,
+                :enum => Egi::Fedcloud::Cloudhound::Formatter::FORMATS, :aliases => '-o', :desc => 'Output formatting'
   method_option :credentials, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.credentials,
                 :aliases => '-c', :desc => 'PEM file with a personal certificate and private key'
   method_option :password, :type => :string, :default => nil,
@@ -38,7 +40,8 @@ class EgiFedcloudCloudhound < Thor
   def all
     init_log options[:debug]
 
-    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.as_table(
+    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.send(
+      "as_#{options[:format]}",
       Egi::Fedcloud::Cloudhound::Extractor.find_all(
         options
       )
@@ -46,6 +49,8 @@ class EgiFedcloudCloudhound < Thor
   end
 
   desc "ip IP_ADDRESS", "Prints information based on the provided IP address or IP address range"
+  method_option :format, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.format,
+                :enum => Egi::Fedcloud::Cloudhound::Formatter::FORMATS, :aliases => '-o', :desc => 'Output formatting'
   method_option :credentials, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.credentials,
                 :aliases => '-c', :desc => 'PEM file with a personal certificate and private key'
   method_option :password, :type => :string, :default => nil,
@@ -61,7 +66,8 @@ class EgiFedcloudCloudhound < Thor
   def ip(ip_address)
     init_log options[:debug]
 
-    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.as_table(
+    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.send(
+      "as_#{options[:format]}",
       Egi::Fedcloud::Cloudhound::Extractor.find_by_ip(
         ip_address,
         options
@@ -70,6 +76,8 @@ class EgiFedcloudCloudhound < Thor
   end
 
   desc "appuri URI", "Prints information based on the provided Appliance MPURI"
+  method_option :format, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.format,
+                :enum => Egi::Fedcloud::Cloudhound::Formatter::FORMATS, :aliases => '-o', :desc => 'Output formatting'
   method_option :credentials, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.credentials,
                 :aliases => '-c', :desc => 'PEM file with a personal certificate and private key'
   method_option :password, :type => :string, :default => nil,
@@ -85,7 +93,8 @@ class EgiFedcloudCloudhound < Thor
   def appuri(uri)
     init_log options[:debug]
 
-    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.as_table(
+    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.send(
+      "as_#{options[:format]}",
       Egi::Fedcloud::Cloudhound::Extractor.find_by_appuri(
         uri,
         options
@@ -107,7 +116,7 @@ class EgiFedcloudCloudhound < Thor
   # @return [Egi::Fedcloud::Cloudhound::Log] logger instance for additional configuration
   def init_log(debug = false)
     logger = Egi::Fedcloud::Cloudhound::Log.new(STDERR)
-    logger.level = debug ? Egi::Fedcloud::Cloudhound::Log::DEBUG : Egi::Fedcloud::Cloudhound::Log::ERROR
+    logger.level = debug ? Egi::Fedcloud::Cloudhound::Log::DEBUG : Egi::Fedcloud::Cloudhound::Log::WARN
     logger
   end
 end

data/config/settings.yml

@@ -1,5 +1,6 @@
 ---
 production:
+  format: table
   credentials: "<%= ENV['HOME'] %>/.globus/usercred.pem"
   ca_path: '/etc/grid-security/certificates'
   gocdb_base_url: 'https://goc.egi.eu'
@@ -7,6 +8,7 @@ production:
   debug: false
 
 development:
+  format: table
   credentials: "<%= ENV['HOME'] %>/.globus/usercred.pem"
   ca_path: '/etc/grid-security/certificates'
   gocdb_base_url: 'https://goc.egi.eu'
@@ -14,6 +16,7 @@ development:
   debug: true
 
 test:
+  format: table
   credentials: "<%= ENV['HOME'] %>/.globus/testcred.pem"
   ca_path: '/etc/grid-security/certificates'
   gocdb_base_url: 'http://localhost/goc'

data/lib/egi/fedcloud/cloudhound/formatter.rb

@@ -3,10 +3,14 @@ require 'terminal-table'
 #
 class Egi::Fedcloud::Cloudhound::Formatter
 
+  FORMATS = %w(table json plain).freeze
+
   class << self
     #
     def as_table(data = [])
       Egi::Fedcloud::Cloudhound::Log.debug "[#{self}] Transforming #{data.inspect} into a table"
+
+      data ||= []
       table = Terminal::Table.new
 
       table.add_row [' >>> Site Name <<< ', ' >>> NGI Name <<< ', ' >>> CSIRT Contact(s) <<< ']
@@ -21,7 +25,26 @@ class Egi::Fedcloud::Cloudhound::Formatter
 
     #
     def as_json(data = [])
-      data ? JSON.generate(data) : '{}'
+      Egi::Fedcloud::Cloudhound::Log.debug "[#{self}] Transforming #{data.inspect} into a JSON document"
+      return '{}' if data.blank?
+
+      JSON.generate(data)
+    end
+
+    #
+    def as_plain(data = [])
+      Egi::Fedcloud::Cloudhound::Log.debug "[#{self}] Transforming #{data.inspect} into plain text"
+      return '' if data.blank?
+
+      plain = []
+      data.each do |site|
+        Egi::Fedcloud::Cloudhound::Log.warn "[#{self}] #{site[:name]} doesn't " \
+                                            "have a CSIRT e-mail!" if site[:csirt].blank?
+        next if site[:csirt].blank?
+        plain << "#{site[:name]} <#{site[:csirt]}>"
+      end
+
+      plain.join ', '
     end
   end
 

data/lib/egi/fedcloud/cloudhound/gocdb_site.rb

@@ -16,7 +16,7 @@ class Egi::Fedcloud::Cloudhound::GocdbSite
     @ngi = self.class.extract_text(element.locate('ROC'))
 
     Egi::Fedcloud::Cloudhound::Log.debug "[#{self.class}] Extracting IP ranges for site #{@name}"
-    @ip_ranges = self.class.extract_ranges(self.class.extract_text(element.locate('SITE_IP')))
+    @ip_ranges = self.class.extract_ranges(self.class.extract_text(element.locate('SITE_IP')), @name)
   end
 
   #
@@ -44,7 +44,7 @@ class Egi::Fedcloud::Cloudhound::GocdbSite
 
   class << self
     #
-    def extract_ranges(text_ranges)
+    def extract_ranges(text_ranges, site_name)
       ranges = text_ranges.split(/[,;]/).reject { |el| el.blank? || !el.include?('/') || INVALID_RANGES.include?(el) }
 
       Egi::Fedcloud::Cloudhound::Log.debug "[#{self}] -- Ranges: #{ranges.inspect}"
@@ -52,7 +52,8 @@ class Egi::Fedcloud::Cloudhound::GocdbSite
         begin
           IPAddr.new(range)
         rescue
-          Egi::Fedcloud::Cloudhound::Log.warn "[#{self}] -- Invalid range #{range.inspect}"
+          Egi::Fedcloud::Cloudhound::Log.warn "[#{self}] Invalid IP range #{range.inspect} " \
+                                              "for site #{site_name}"
           nil
         end
       end

data/lib/egi/fedcloud/cloudhound/version.rb

@@ -2,7 +2,7 @@ module Egi
   module Fedcloud
     module Cloudhound
       # Versioning constant
-      VERSION = "0.0.2" unless defined?(::Egi::Fedcloud::Cloudhound::VERSION)
+      VERSION = "0.0.3" unless defined?(::Egi::Fedcloud::Cloudhound::VERSION)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egi-fedcloud-cloudhound
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Boris Parak
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A proof-of-concept utility for locating cloud sites and corresponding CSIRT/CERT