hammer_cli_foreman 2.1.2 → 2.4.0

data/lib/hammer_cli_foreman/location.rb

@@ -33,7 +33,9 @@ module HammerCLIForeman
         HammerCLIForeman::References.compute_resources(self)
         HammerCLIForeman::References.media(self)
         HammerCLIForeman::References.provisioning_templates(self)
+        HammerCLIForeman::References.partition_tables(self)
         HammerCLIForeman::References.domains(self)
+        HammerCLIForeman::References.realms(self)
         HammerCLIForeman::References.environments(self)
         HammerCLIForeman::References.hostgroups(self)
         HammerCLIForeman::References.parameters(self)

data/lib/hammer_cli_foreman/mail_notification.rb

@@ -11,7 +11,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -22,7 +22,7 @@ module HammerCLIForeman
         field :subscription_type, _("Subscription type")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/model.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :hardware_model, _("HW model")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -23,7 +23,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -31,14 +31,14 @@ module HammerCLIForeman
       success_message _("Hardware model created.")
       failure_message _("Could not create the hardware model")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("Hardware model deleted.")
       failure_message _("Could not delete the hardware model")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -46,7 +46,7 @@ module HammerCLIForeman
       success_message _("Hardware model updated.")
       failure_message _("Could not update the hardware model")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 

data/lib/hammer_cli_foreman/operating_system.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :family, _("Family")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -36,7 +36,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.parameters(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -44,7 +44,7 @@ module HammerCLIForeman
       success_message _("Operating system created.")
       failure_message _("Could not create the operating system")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -52,7 +52,7 @@ module HammerCLIForeman
       success_message _("Operating system updated.")
       failure_message _("Could not update the operating system")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -60,7 +60,7 @@ module HammerCLIForeman
       success_message _("Operating system deleted.")
       failure_message _("Could not delete the operating system")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -76,7 +76,7 @@ module HammerCLIForeman
         validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -90,7 +90,7 @@ module HammerCLIForeman
         validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -156,7 +156,8 @@ module HammerCLIForeman
         HammerCLI::EX_OK
       end
 
-      build_options :without => [:template_kind_id, :type]
+      build_options expand: { except: %i[organizations locations] },
+                    without: %i[organization_id location_id template_kind_id type]
     end
 
 
@@ -191,7 +192,7 @@ module HammerCLIForeman
         {"operatingsystem_id" => option_id}
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 

data/lib/hammer_cli_foreman/organization.rb

@@ -33,7 +33,9 @@ module HammerCLIForeman
         HammerCLIForeman::References.compute_resources(self)
         HammerCLIForeman::References.media(self)
         HammerCLIForeman::References.provisioning_templates(self)
+        HammerCLIForeman::References.partition_tables(self)
         HammerCLIForeman::References.domains(self)
+        HammerCLIForeman::References.realms(self)
         HammerCLIForeman::References.environments(self)
         HammerCLIForeman::References.hostgroups(self)
         HammerCLIForeman::References.parameters(self)

data/lib/hammer_cli_foreman/output/fields.rb

@@ -19,7 +19,7 @@ module Fields
 
     def id_detail
       {
-        :label => _('id'),
+        :label => {:target => _('id')},
         :structured_label => _('Id'),
         :key => @options[:id_key] || :id,
         :id => true

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -35,7 +35,7 @@ module HammerCLIForeman::Output
           if detail.is_a?(Hash)
             next if detail[:id] && !show_ids
             if detail[:label]
-              "#{detail[:label]}: #{get_value(data, detail[:key])}"
+              "#{detail[:label][:target]}: #{get_value(data, detail[:key])}"
             else
               get_value(data, detail[:key])
             end

data/lib/hammer_cli_foreman/ping.rb

@@ -1,23 +1,32 @@
 module HammerCLIForeman
   class PingCommand < HammerCLIForeman::Command
-      resource :ping
+    resource :ping
 
-      class ForemanCommand < HammerCLIForeman::Command
-        action :ping
-        command_name 'foreman'
+    class ForemanCommand < HammerCLIForeman::Command
+      action :ping
+      command_name 'foreman'
 
-        output do
-          from 'foreman' do
-            field :database, _('database'), Fields::Label do
-              field :active, _('Status')
-              field :duration_ms, _('Server Response')
-            end
+      output do
+        from 'foreman' do
+          field :database, _('database'), Fields::Label do
+            field :active, _('Status')
+            field :duration_ms, _('Server Response')
           end
         end
+      end
+
+      def execute
+        response = send_request
+        print_data(response)
 
-        extend_with(HammerCLIForeman::CommandExtensions::Ping.new)
+        return 1 if HammerCLIForeman::CommandExtensions::Ping.failed?(response)
+
+        HammerCLI::EX_OK
       end
 
+      extend_with(HammerCLIForeman::CommandExtensions::Ping.new)
+    end
+
     self.default_subcommand = 'foreman'
     autoload_subcommands
   end

data/lib/hammer_cli_foreman/references.rb

@@ -88,6 +88,14 @@ module HammerCLIForeman
       end
     end
 
+    def self.partition_tables(dsl)
+      dsl.build do
+        collection :ptables, _("Partition Tables"), :numbered => false do
+          custom_field Fields::Reference
+        end
+      end
+    end
+
     def self.domains(dsl)
       dsl.build do
         collection :domains, _("Domains"), :numbered => false do
@@ -96,6 +104,14 @@ module HammerCLIForeman
       end
     end
 
+    def self.realms(dsl)
+      dsl.build do
+        collection :realms, _("Realms"), :numbered => false do
+          custom_field Fields::Reference
+        end
+      end
+    end
+
     def self.environments(dsl)
       dsl.build do
         collection :environments, _("Environments"), :numbered => false do

data/lib/hammer_cli_foreman/settings.rb

@@ -20,7 +20,7 @@ module HammerCLIForeman
         data
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -29,9 +29,23 @@ module HammerCLIForeman
       success_message _("Setting [%{name}] updated to [%{value}].")
       failure_message _("Could not update the setting")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+        field :description, _("Description")
+        field :category_name, _("Category")
+        field :settings_type, _("Settings type")
+        field :value, _("Value")
+      end
+
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+    end
+
+
     autoload_subcommands
   end
 

data/lib/hammer_cli_foreman/testing/api_expectations.rb

@@ -1,6 +1,11 @@
 module HammerCLIForeman
   module Testing
     module APIExpectations
+
+      def self.api_calls
+        @api_calls ||= []
+      end
+
       class APICallMatcher < Mocha::ParameterMatchers::Base
         attr_accessor :expected_params, :expected_resource, :expected_action, :block
 
@@ -160,7 +165,12 @@ module HammerCLIForeman
         }.merge(options))
       end
 
+      def api_calls
+        HammerCLIForeman::Testing::APIExpectations.api_calls
+      end
+
       def api_expects(resource=nil, action=nil, note=nil, &block)
+        api_calls << [resource, action]
         APIExpectationsDecorator.new.expects_call(resource, action, note, &block)
       end
 

data/lib/hammer_cli_foreman/usergroup.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :admin, _("Admin"), Fields::Boolean
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -25,28 +25,28 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _("User group [%<name>s] created.")
       failure_message _("Could not create the user group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _("User group [%<name>s] updated.")
       failure_message _("Could not update the user group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("User group [%<name>s] deleted.")
       failure_message _("Could not delete the user group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     HammerCLIForeman::AssociatingCommands::Role.extend_command(self)

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "2.1.2"
+    @version ||= Gem::Version.new "2.4.0"
   end
 end

data/lib/minitest/coverage_reporter.rb

@@ -0,0 +1,94 @@
+require "json"
+
+module Minitest
+  class CoverageRunner
+
+    RESOURCE_BLACK_LIST = ['tasks','home','config_groups','statistics','table_preferences','autosign','puppet_hosts']
+    attr_reader :raw_data, :api_endpoints, :covered_resources, :uncovered_resources, :partially_covered_resources
+    def initialize(file_path)
+      @raw_data = JSON.load(File.open(file_path))
+      @api_endpoints = {}
+      @covered_resources = []
+      @uncovered_resources = []
+      @partially_covered_resources = {}
+    end
+
+    def filtered_endpoints(covered)
+      api_endpoints.select { |_k, v| v == covered }.keys
+    end
+
+    def get_endpoints_by_resource(endpoints)
+      endpoints_by_resource = {}
+      endpoints.each do |url|
+        resource,action = url.split("/")
+        endpoints_by_resource[resource] ||= []
+        endpoints_by_resource[resource] << action
+      end
+      endpoints_by_resource
+    end
+
+    def uncovered_endpoints_by_resource
+      get_endpoints_by_resource(filtered_endpoints(false))
+    end
+
+    def covered_endpoints_by_resource
+      get_endpoints_by_resource(filtered_endpoints(true))
+    end
+
+    def get_coverage
+      get_endpoints_by_resource(api_endpoints.keys).each do |resource, actions|
+        if covered_endpoints_by_resource[resource] == actions
+          @covered_resources << resource
+        elsif uncovered_endpoints_by_resource[resource] == actions
+          @uncovered_resources << resource
+        else
+          @partially_covered_resources[resource] = uncovered_endpoints_by_resource[resource]
+        end
+      end
+    end
+
+    def endpoints_percentage(endpoints)
+      "#{(endpoints.count / api_endpoints.count.to_f * 100 ).to_i}%"
+    end
+
+    def uncovered_endpoints_percentage
+      endpoints_percentage(filtered_endpoints(false))
+    end
+
+    def covered_endpoints_percentage
+      endpoints_percentage(filtered_endpoints(true))
+    end
+
+    def run_tests
+      raw_data["docs"]["resources"].each do |resource|
+        resource[1]["methods"].each do | method |
+          @api_endpoints[method["doc_url"].delete_prefix!("../apidoc/v2/")] = false
+        end unless RESOURCE_BLACK_LIST.include? resource[0]
+      end
+      HammerCLIForeman::Testing::APIExpectations.api_calls.each do |api_call|
+        resource, action = api_call
+          url = "#{resource}/#{action}"
+          @api_endpoints[url] =  true
+      end
+      get_coverage
+      output_coverage
+    end
+
+    def color(str, code)
+      puts "\e[#{code}m#{str}\e[0m"
+    end
+
+    def output_coverage
+      covered_resources
+      color("COVERED RESOURCES" , 32)
+      puts covered_resources
+      color("NOT COVERED AT ALL", 31)
+      puts uncovered_resources
+      color("PARTIALLY COVERED RESOURCES", 33)
+      partially_covered_resources.each do |resource, endpoints|
+        puts "#{resource}: #{endpoints.join(' ')}"
+      end
+      color("covered endpoints #{covered_endpoints_percentage} uncovered endpoints #{uncovered_endpoints_percentage}", 35)
+    end
+  end
+end