hammer_cli_foreman 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e7dc1e35e532761f9e2b59ec44b44a9f505fff
-  data.tar.gz: e8c58306a33bc8dd3440fbaba31aa2e61656420e
+  metadata.gz: fcba3ecfc7d5f30eea296b370ff4ca1065a7043f
+  data.tar.gz: 5243fba92710c4586a9db6759d6df54a426a6adc
 SHA512:
-  metadata.gz: 5a11f4290ab447ec0c6e2a85d45f7760fc8834d04993367c4497ecb89a693f4d72befe237d0f17e8b6fcbe3e46d00e54cd9ad4faa0f69c3922a582d6ca128b86
-  data.tar.gz: 6e0865865ab755afcf98279c28382d4c903fc281bed04354ce1e5d17d72a6e842f162130b7a7fde7da156f376892cdbbbd336fc760ddd61f45c9ae849b172501
+  metadata.gz: ca0889415fc9bbfbf795e8c8fec86945170f63b9cf9223ede6a0f22687ed960fe587a8e966c320bd380b1b1d252213d857b038e31240378840a5ff9a17e1a34a
+  data.tar.gz: d03bd1d2a071979261b9e5397a6c55c330cea0c95f26be7f8c46fcff89473084afa5aa112baf4ce4469fbc7dbb1dc450128c04846f39c0bd2c6151e58859097c

data/lib/hammer_cli_foreman/architecture.rb

@@ -1,8 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/associating_commands'
-
 module HammerCLIForeman
 
   class Architecture < HammerCLI::Apipie::Command
@@ -28,6 +23,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -42,6 +38,8 @@ module HammerCLIForeman
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message "Architecture deleted"
       failure_message "Could not delete the architecture"
+
+      apipie_options
     end
 
 
@@ -59,5 +57,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'architecture', "Manipulate Foreman's architectures.", HammerCLIForeman::Architecture
+HammerCLI::MainCommand.subcommand 'architecture', "Manipulate architectures.", HammerCLIForeman::Architecture
 

data/lib/hammer_cli_foreman/associating_commands.rb

@@ -1,73 +1,82 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
   module AssociatingCommands
 
     module Hostgroup
       class AddHostgroupCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Hostgroup
+        apipie_options
       end
 
       class RemoveHostgroupCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Hostgroup
+        apipie_options
       end
     end
 
     module Environment
       class AddEnvironmentCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Environment
+        apipie_options
       end
 
       class RemoveEnvironmentCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Environment
+        apipie_options
       end
     end
 
     module Domain
       class AddDomainCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Domain
+        apipie_options
       end
 
       class RemoveDomainCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Domain
+        apipie_options
       end
     end
 
     module Medium
       class AddMediumCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Medium
+        apipie_options
       end
 
       class RemoveMediumCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Medium
+        apipie_options
       end
     end
 
     module Subnet
       class AddSubnetCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Subnet
+        apipie_options
       end
 
       class RemoveSubnetCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Subnet
+        apipie_options
       end
     end
 
     module ComputeResource
       class AddComputeResourceCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::ComputeResource
+        apipie_options
       end
 
       class RemoveComputeResourceCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::ComputeResource
+        apipie_options
       end
     end
 
     module SmartProxy
       class AddSmartProxyCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::SmartProxy
+        apipie_options
 
         def associated_resource_name
           "smart_proxy"
@@ -76,6 +85,7 @@ module HammerCLIForeman
 
       class RemoveSmartProxyCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::SmartProxy
+        apipie_options
 
         def associated_resource_name
           "smart_proxy"
@@ -88,32 +98,38 @@ module HammerCLIForeman
         associated_identifiers :id
 
         associated_resource ForemanApi::Resources::User
+        apipie_options
       end
 
       class RemoveUserCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_identifiers :id
 
         associated_resource ForemanApi::Resources::User
+        apipie_options
       end
     end
 
     module ConfigTemplate
       class AddConfigTemplateCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::ConfigTemplate
+        apipie_options
       end
 
       class RemoveConfigTemplateCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::ConfigTemplate
+        apipie_options
       end
     end
 
     module Organization
       class AddOrganizationCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Organization
+        apipie_options
       end
 
       class RemoveOrganizationCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Organization
+        apipie_options
       end
     end
 
@@ -122,6 +138,7 @@ module HammerCLIForeman
         associated_resource ForemanApi::Resources::OperatingSystem
 
         associated_identifiers :id
+        apipie_options
 
         success_message "Operating system has been associated"
         failure_message "Could not associate the operating system"
@@ -132,6 +149,7 @@ module HammerCLIForeman
         associated_resource ForemanApi::Resources::OperatingSystem
 
         associated_identifiers :id
+        apipie_options
 
         success_message "Operating system has been disassociated"
         failure_message "Could not disassociate the operating system"
@@ -141,6 +159,7 @@ module HammerCLIForeman
     module Architecture
       class AddArchitectureCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Architecture
+        apipie_options
 
         success_message "Architecture has been associated"
         failure_message "Could not associate the architecture"
@@ -149,6 +168,7 @@ module HammerCLIForeman
 
       class RemoveArchitectureCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Architecture
+        apipie_options
 
         success_message "Architecture has been disassociated"
         failure_message "Could not disassociate the architecture"
@@ -158,6 +178,7 @@ module HammerCLIForeman
     module PartitionTable
       class AddPartitionTableCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource ForemanApi::Resources::Ptable
+        apipie_options
 
         success_message "Partition table has been associated"
         failure_message "Could not associate the partition table"
@@ -166,6 +187,7 @@ module HammerCLIForeman
 
       class RemovePartitionTableCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource ForemanApi::Resources::Ptable
+        apipie_options
 
         success_message "Partition table has been disassociated"
         failure_message "Could not disassociate the partition table"

data/lib/hammer_cli_foreman/commands.rb

@@ -1,5 +1,3 @@
-require 'hammer_cli'
-
 module HammerCLIForeman
 
   def self.collection_to_common_format(data)
@@ -30,8 +28,12 @@ module HammerCLIForeman
 
   class WriteCommand < HammerCLI::Apipie::WriteCommand
 
+    def request_headers
+      {}
+    end
+
     def send_request
-      HammerCLIForeman.record_to_common_format(resource.call(action, request_params)[0])
+      HammerCLIForeman.record_to_common_format(resource.call(action, request_params, request_headers)[0])
     end
 
   end
@@ -115,10 +117,6 @@ module HammerCLIForeman
       {'id' => get_identifier[0]}
     end
 
-    def self.apipie_options(options={})
-      super({:without => declared_identifiers.keys}.merge(options))
-    end
-
     def retrieve_data
       data = super
       record = HammerCLIForeman.record_to_common_format(data)
@@ -155,11 +153,11 @@ module HammerCLIForeman
       super(name) || "update"
     end
 
-    identifiers :id, :name => :current_name
+    identifiers :id, :name => :option_current_name
 
-    def setup_identifier_options
+    def self.setup_identifier_options
       super
-      self.class.option "--new-name", "NEW_NAME", "new name for the resource", :attribute_name => :name if self.class.identifier? :name
+      option "--new-name", "NEW_NAME", "new name for the resource", :attribute_name => :option_name if identifier? :name
     end
 
     def request_params
@@ -168,10 +166,6 @@ module HammerCLIForeman
       params
     end
 
-    def self.apipie_options(options={})
-      super({:without => declared_identifiers.keys}.merge(options))
-    end
-
   end
 
 
@@ -189,10 +183,6 @@ module HammerCLIForeman
       {'id' => get_identifier[0]}
     end
 
-    def self.apipie_options(options={})
-      super({:without => declared_identifiers.keys}.merge(options))
-    end
-
   end
 
 
@@ -207,16 +197,16 @@ module HammerCLIForeman
       validator.any(*self.class.declared_identifiers.values).required
     end
 
-    def initialize(*args)
-      super
+    def self.apipie_options(options={})
       setup_associated_identifier_options
+      super
     end
 
-    def setup_associated_identifier_options
+    def self.setup_associated_identifier_options
       name = associated_resource.name.to_s
       option_switch = "--"+name.gsub('_', '-')
-      self.class.option option_switch, name.upcase, " ", :attribute_name => :associated_name if self.class.declared_associated_identifiers.include? :name
-      self.class.option option_switch+"-id", name.upcase+"_ID", " ", :attribute_name => :associated_id if self.class.declared_associated_identifiers.include? :id
+      option option_switch, name.upcase, " ", :attribute_name => :associated_name if declared_associated_identifiers.include? :name
+      option option_switch+"-id", name.upcase+"_ID", " ", :attribute_name => :associated_id if declared_associated_identifiers.include? :id
     end
 
 
@@ -252,13 +242,13 @@ module HammerCLIForeman
     end
 
     def get_current_ids
-      item = resource.call('show', {'id' => get_identifier[0]})[0]
-      item[resource.name][associated_resource.name+'_ids'] || []
+      item = HammerCLIForeman.record_to_common_format(resource.call('show', {'id' => get_identifier[0]})[0])
+      item[associated_resource.name+'_ids'] || []
     end
 
     def get_required_id
-      item = associated_resource.call('show', {'id' => associated_id || associated_name})[0]
-      item[associated_resource.name]['id']
+      item = HammerCLIForeman.record_to_common_format(associated_resource.call('show', {'id' => associated_id || associated_name})[0])
+      item['id']
     end
 
     def request_params

data/lib/hammer_cli_foreman/common_parameter.rb

@@ -41,12 +41,13 @@ module HammerCLIForeman
 
       def parameter_exist?
         params = resource.call(:index)[0]
-        params.find { |p| p["common_parameter"]["name"] == name }
+        params = HammerCLIForeman.collection_to_common_format(params)
+        params.find { |p| p["name"] == option_name }
       end
 
       def request_params
         params = method_options
-        params['id'] = name
+        params['id'] = option_name
         params
       end
 
@@ -68,4 +69,4 @@ module HammerCLIForeman
   end
 end
 
-HammerCLI::MainCommand.subcommand 'global_parameter', "Manipulate Foreman's global parameters.", HammerCLIForeman::CommonParameter
+HammerCLI::MainCommand.subcommand 'global_parameter', "Manipulate global parameters.", HammerCLIForeman::CommonParameter

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -1,6 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
 require 'hammer_cli_foreman/image'
 
 module HammerCLIForeman
@@ -57,6 +54,7 @@ module HammerCLIForeman
         print_collection(output_definition, data)
       end
 
+      apipie_options
     end
 
 
@@ -68,7 +66,7 @@ module HammerCLIForeman
       apipie_options
 
       validate_options do
-        all(:name, :url, :provider).required
+        all(:option_name, :option_url, :option_provider).required
       end
     end
 
@@ -97,6 +95,6 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'compute_resource', "Manipulate Foreman's compute resources.", HammerCLIForeman::ComputeResource
+HammerCLI::MainCommand.subcommand 'compute_resource', "Manipulate compute resources.", HammerCLIForeman::ComputeResource
 
 

data/lib/hammer_cli_foreman/domain.rb

@@ -1,8 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-require 'hammer_cli_foreman/parameter'
-
 module HammerCLIForeman
 
   class Domain < HammerCLI::AbstractCommand
@@ -37,6 +32,7 @@ module HammerCLIForeman
         record
       end
 
+      apipie_options
     end
 
 
@@ -47,7 +43,7 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Domain, "create"
 
       apipie_options :without => [:domain_parameters_attributes, :fullname]
-      option "--description", "DESC", "Full name describing the domain", :attribute_name => :fullname
+      option "--description", "DESC", "Full name describing the domain", :attribute_name => :option_fullname
     end
 
 
@@ -58,7 +54,7 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Domain, "update"
 
       apipie_options :without => [:domain_parameters_attributes, :name, :id, :fullname]
-      option "--description", "DESC", "Full name describing the domain", :attribute_name => :fullname
+      option "--description", "DESC", "Full name describing the domain", :attribute_name => :option_fullname
     end
 
 
@@ -87,12 +83,12 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:domain_name, :domain_id).required
+        validator.any(:option_domain_name, :option_domain_id).required
       end
 
       def base_action_params
         {
-          "domain_id" => domain_id || domain_name
+          "domain_id" => option_domain_id || option_domain_name
         }
       end
     end
@@ -111,12 +107,12 @@ module HammerCLIForeman
 
       def validate_options
         super
-        validator.any(:domain_name, :domain_id).required
+        validator.any(:option_domain_name, :option_domain_id).required
       end
 
       def base_action_params
         {
-          "domain_id" => domain_id || domain_name
+          "domain_id" => option_domain_id || option_domain_name
         }
       end
     end
@@ -126,5 +122,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'domain', "Manipulate Foreman's domains.", HammerCLIForeman::Domain
+HammerCLI::MainCommand.subcommand 'domain', "Manipulate domains.", HammerCLIForeman::Domain
 

data/lib/hammer_cli_foreman/environment.rb

@@ -27,6 +27,7 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
+      apipie_options
     end
 
 
@@ -72,5 +73,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'environment', "Manipulate Foreman's environments.", HammerCLIForeman::Environment
+HammerCLI::MainCommand.subcommand 'environment', "Manipulate environments.", HammerCLIForeman::Environment
 

data/lib/hammer_cli_foreman/exception_handler.rb

@@ -17,8 +17,7 @@ module HammerCLIForeman
 
     def handle_unprocessable_entity(e)
       response = JSON.parse(e.response)
-      response = response[response.keys[0]]
-
+      response = HammerCLIForeman.record_to_common_format(response)
       print_error response["full_messages"]
       HammerCLI::EX_DATAERR
     end
@@ -44,6 +43,16 @@ module HammerCLIForeman
       HammerCLI::EX_UNAVAILABLE
     end
 
+
+    def handle_not_found(e)
+      response = JSON.parse(e.response)
+      message = response["message"] || e.message
+
+      print_error message
+      log_full_error e
+      HammerCLI::EX_NOT_FOUND
+    end
+
   end
 end
 

data/lib/hammer_cli_foreman/exceptions.rb

@@ -1,5 +1,3 @@
-require 'hammer_cli_foreman/exceptions'
-
 module HammerCLIForeman
 
   class OperationNotSupportedError < StandardError; end

data/lib/hammer_cli_foreman/fact.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class Fact < HammerCLI::AbstractCommand
@@ -37,4 +33,4 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'fact', "Search Foreman's facts.", HammerCLIForeman::Fact
+HammerCLI::MainCommand.subcommand 'fact', "Search facts.", HammerCLIForeman::Fact