hammer_cli_foreman 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78b68bec7f32428e58c4b6fa4711fb8683611dc
-  data.tar.gz: b01e9d5f75a1cd31909e704a97f3af98fd66089a
+  metadata.gz: 6fd5cd72dd8217359f1f71719934fe9377086b17
+  data.tar.gz: bd87b55ddf01d0ff6f043b459c95899f0b5b58da
 SHA512:
-  metadata.gz: 9db1c5c609a7137d2f06cc9b0900854b807fc5912c71377564aa1719944d49f3d621a20e2d1489704c4c70db69ea03b11705c891006d1a5ff7fc9246b1a6116e
-  data.tar.gz: abffea3d9dd96921b090d1ccc302e50b37169b4146034f75137216431ecd03adca6a01fda6e24f3df5b00222a2e208a417013813fdcf90776d830748468b8709
+  metadata.gz: babdcab332392d62a38d006d84fca84069dc66087b0915703f5325c6a1123612b1833f0a8b51402f3824ffe7f29a4fb48c026a798e3f0035c8babd807a3b446c
+  data.tar.gz: ce713dc6633bf093ebbec501e97f8d33901079dfe9927c6d605f2d6fd95abc493d02210824fdd78c190b32dcb9a5697f0346aea0311e29e10d66c1833992c65a

data/lib/hammer_cli_foreman/commands.rb

@@ -28,10 +28,6 @@ module HammerCLIForeman
 
   class WriteCommand < HammerCLI::Apipie::WriteCommand
 
-    def request_headers
-      {}
-    end
-
     def send_request
       HammerCLIForeman.record_to_common_format(resource.call(action, request_params, request_headers)[0])
     end
@@ -205,7 +201,10 @@ module HammerCLIForeman
     def self.setup_associated_identifier_options
       name = associated_resource.name.to_s
       option_switch = "--"+name.gsub('_', '-')
-      option option_switch, name.upcase, " ", :attribute_name => :associated_name if declared_associated_identifiers.include? :name
+
+      option option_switch, name.upcase, " ", :attribute_name => :associated_name do |value|
+        name_to_id(value, "name", associated_resource)
+      end if declared_associated_identifiers.include? :name
       option option_switch+"-id", name.upcase+"_ID", " ", :attribute_name => :associated_id if declared_associated_identifiers.include? :id
     end
 
@@ -243,7 +242,11 @@ module HammerCLIForeman
 
     def get_current_ids
       item = HammerCLIForeman.record_to_common_format(resource.call('show', {'id' => get_identifier[0]})[0])
-      item[associated_resource.name+'_ids'] || []
+      if item.has_key?(associated_resource.plural_name)
+        item[associated_resource.plural_name].map { |assoc| assoc['id'] }
+      else
+        item[associated_resource.name+'_ids'] || []
+      end
     end
 
     def get_required_id
@@ -252,8 +255,13 @@ module HammerCLIForeman
     end
 
     def request_params
-      params = method_options
-      params[resource.name][associated_resource.name+'_ids'] = get_new_ids
+      params = {}
+      if params.key?(resource.name)
+        params[resource.name] = {"#{associated_resource.name}_ids" => get_new_ids }
+      else
+        params["#{associated_resource.name}_ids"] = get_new_ids
+      end
+
       params['id'] = get_identifier[0]
       params
     end

data/lib/hammer_cli_foreman/exception_handler.rb

@@ -18,7 +18,7 @@ module HammerCLIForeman
     def handle_unprocessable_entity(e)
       response = JSON.parse(e.response)
       response = HammerCLIForeman.record_to_common_format(response)
-      print_error response["full_messages"]
+      print_error response['full_messages']
       HammerCLI::EX_DATAERR
     end
 
@@ -46,7 +46,8 @@ module HammerCLIForeman
 
     def handle_not_found(e)
       response = JSON.parse(e.response)
-      message = response["message"] || e.message
+      response = HammerCLIForeman.record_to_common_format(response)
+      message = response['message'] || e.message
 
       print_error message
       log_full_error e

data/lib/hammer_cli_foreman/operating_system.rb

@@ -24,7 +24,7 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      identifiers :id, :label
+      identifiers :id
 
       output ListCommand.output_definition do
         field :media_names, "Installation media", Fields::List
@@ -91,7 +91,7 @@ module HammerCLIForeman
       option "--ptable-ids", "PTABLE_IDS", "set associated partition tables",
         :format => HammerCLI::Options::Normalizers::List.new
 
-      identifiers :id, :label
+      identifiers :id
 
       success_message "Operating system updated"
       failure_message "Could not update the operating system"
@@ -111,7 +111,7 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
 
-      identifiers :id, :label
+      identifiers :id
 
       success_message "Operating system deleted"
       failure_message "Could not delete the operating system"

data/lib/hammer_cli_foreman/user.rb

@@ -23,7 +23,11 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      identifiers :id
+      identifiers :id, :login
+
+      option '--login', 'LOGIN', "User login" do |value|
+        name_to_id(value, "login", resource)
+      end
 
       output ListCommand.output_definition do
         field :last_login_on, "Last login", Fields::Date
@@ -52,7 +56,11 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      identifiers :id
+      identifiers :id, :login
+
+      option '--login', 'LOGIN', "User login" do |value|
+        name_to_id(value, "login", resource)
+      end
 
       success_message "User updated"
       failure_message "Could not update the user"
@@ -64,7 +72,11 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
 
-      identifiers :id
+      identifiers :id, :login
+
+      option '--login', 'LOGIN', "User login" do |value|
+        name_to_id(value, "login", resource)
+      end
 
       success_message "User deleted"
       failure_message "Could not delete the user"

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new '0.0.17'
+    @version ||= Gem::Version.new '0.0.18'
   end
 end

data/test/unit/apipie_resource_mock.rb

@@ -12,11 +12,15 @@ class ApipieResourceMock
     @resource.doc
   end
 
+  def name
+    @resource.name
+  end
+
   def new(attrs)
     return self
   end
 
-  def expects_with(method_name, params, headers=nil, return_value=nil)
+  def expects_with(method_name, params, headers={}, return_value=nil)
     return_value ||= return_value_for(method_name)
     self.expects(method_name).with(params, headers).returns(return_value)
   end

data/test/unit/architecture_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Architecture do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/commands_test.rb

@@ -110,7 +110,26 @@ describe HammerCLIForeman do
       end
       res = Assoc.new("", { :adapter => :csv, :interactive => false })
       res.get_new_ids.sort.must_equal [1, 2]
-     end
+    end
+
+    it "should associate resource with new format" do
+      ForemanApi::Resources::Organization.any_instance.stubs(:show).returns([{
+                      "id" => 1,
+                 "domains" => [
+                  { "id" => 2, "name" => "global.lan" }]
+                 }])
+      ForemanApi::Resources::Domain.any_instance.stubs(:show).returns([{
+                      "id" => 1,
+                    "name" => "local.lan"}])
+
+      class Assoc < HammerCLIForeman::AddAssociatedCommand
+        resource ForemanApi::Resources::Organization
+        associated_resource ForemanApi::Resources::Domain
+        apipie_options
+      end
+      res = Assoc.new("", { :adapter => :csv, :interactive => false })
+      res.get_new_ids.sort.must_equal [1, 2]
+    end
   end
 
 end

data/test/unit/common_parameter_test.rb

@@ -10,6 +10,7 @@ describe HammerCLIForeman::CommonParameter do
 
   before :each do
     cmd.class.resource resource_mock
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/compute_resource_test.rb

@@ -9,6 +9,7 @@ describe HammerCLIForeman::ComputeResource do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/domain_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Domain do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/environment_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Environment do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/exception_handler_test.rb

@@ -20,7 +20,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
   it "should print resource errors on unprocessable entity exception" do
    response = <<-RESPONSE
-   {"id":null,"errors":{"network":["can't be blank","is invalid"],"name":["can't be blank"]},"full_messages":["Network address can't be blank","Network address is invalid","Name can't be blank"]}
+   {"error":{"id":null,"errors":{"network":["can't be blank","is invalid"],"name":["can't be blank"]},"full_messages":["Network address can't be blank","Network address is invalid","Name can't be blank"]}}
    RESPONSE
 
     ex = RestClient::UnprocessableEntity.new(response)
@@ -58,7 +58,7 @@ describe HammerCLIForeman::ExceptionHandler do
 
   it "should print resource errors on resource not found exception" do
    response = <<-RESPONSE
-   {"message":"Resource architecture not found by id '1'"}
+   {"error":{"message":"Resource architecture not found by id '1'"}}
    RESPONSE
     ex = RestClient::ResourceNotFound.new(response)
     ex.stubs(:message).returns("")
@@ -69,7 +69,7 @@ describe HammerCLIForeman::ExceptionHandler do
   end
 
   it "should print exception message on resource not found exception without explicit message" do
-   response = "{}"
+   response = '{"error": ""}'
     ex = RestClient::ResourceNotFound.new(response)
     ex.stubs(:message).returns("ResourceNotFound message")
 

data/test/unit/fact_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Fact do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/host_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Host do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/hostgroup_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Hostgroup do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/image_test.rb

@@ -11,6 +11,7 @@ describe HammerCLIForeman::Image do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/location_test.rb

@@ -11,6 +11,7 @@ describe HammerCLIForeman::Location do
     resource_mock.stub_method(:index, [])
     resource_mock.stub_method(:show, {})
     cmd.class.resource resource_mock
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/media_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Medium do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/model_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Model do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/operating_system_test.rb

@@ -11,6 +11,7 @@ describe HammerCLIForeman::OperatingSystem do
     resource_mock.stub_method(:index, [])
     resource_mock.stub_method(:show, {"operatingsystem" => {}})
     cmd.class.resource resource_mock
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do
@@ -45,7 +46,6 @@ describe HammerCLIForeman::OperatingSystem do
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
-      it_should_accept "label", ["--label=os"]
       it_should_fail_with "no arguments"
     end
 
@@ -87,7 +87,6 @@ describe HammerCLIForeman::OperatingSystem do
     let(:cmd) { HammerCLIForeman::OperatingSystem::DeleteCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "label", ["--label=os"]
       it_should_accept "id", ["--id=1"]
       it_should_fail_with "name or id missing", []
     end
@@ -100,7 +99,6 @@ describe HammerCLIForeman::OperatingSystem do
     let(:cmd) { HammerCLIForeman::OperatingSystem::UpdateCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "label", ["--label=os"]
       it_should_accept "id", ["--id=1"]
       it_should_accept "name, major, minor, family, release name", ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
       it_should_fail_with "no params", []

data/test/unit/organization_test.rb

@@ -11,6 +11,7 @@ describe HammerCLIForeman::Organization do
     resource_mock.stub_method(:index, [])
     resource_mock.stub_method(:show, {})
     cmd.class.resource resource_mock
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/partition_table_test.rb

@@ -9,6 +9,7 @@ describe HammerCLIForeman::PartitionTable do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
 
     ::File.stubs(:read).returns("FILE_CONTENT")
   end
@@ -50,11 +51,11 @@ describe HammerCLIForeman::PartitionTable do
     end
 
     with_params ["--id=83"] do
-      it_should_call_action :show, {'id' => '83'}, nil
+      it_should_call_action :show, {'id' => '83'}
     end
 
     with_params ["--name=ptable"] do
-      it_should_call_action :show, {'id' => 'ptable'}, nil
+      it_should_call_action :show, {'id' => 1}
     end
 
   end
@@ -71,11 +72,11 @@ describe HammerCLIForeman::PartitionTable do
     end
 
     with_params ["--id=83"] do
-      it_should_call_action :show, {'id' => '83'}, nil
+      it_should_call_action :show, {'id' => '83'}
     end
 
     with_params ["--name=ptable"] do
-      it_should_call_action :show, {'id' => 'ptable'}, nil
+      it_should_call_action :show, {'id' => 1}
     end
 
   end
@@ -134,7 +135,7 @@ describe HammerCLIForeman::PartitionTable do
     end
 
     with_params ["--name=ptable"] do
-      it_should_call_action :destroy, {'id' => 'ptable'}
+      it_should_call_action :destroy, {'id' => 1}
     end
 
   end

data/test/unit/puppet_class_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::PuppetClass do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/report_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Report do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/smart_class_parameter_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::SmartClassParameter do
 
   before :each do
     cmd.class.resource ResourceMocks.smart_class_parameter
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do
@@ -41,7 +42,7 @@ describe HammerCLIForeman::SmartClassParameter do
   context "InfoCommand" do
 
     let(:cmd) { HammerCLIForeman::SmartClassParameter::InfoCommand.new("", ctx) }
-    
+
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
@@ -59,13 +60,13 @@ describe HammerCLIForeman::SmartClassParameter do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "override", ["--id=1","--override=true"]
-      it_should_accept "description", ["--id=1","--description=descr"] 
+      it_should_accept "description", ["--id=1","--description=descr"]
       it_should_accept "default-value", ["--id=1","--default-value=1"]
-      it_should_accept "path  ", ["--id=1","--path=path"]  
+      it_should_accept "path  ", ["--id=1","--path=path"]
       it_should_accept "validator-type", ["--id=1","--validator-type=list"]
       it_should_accept "validator-rule ", ["--id=1","--validator-rule=''"]
       it_should_accept "override-value-order", ["--id=1","--override-value-order=fqdn"]
-      it_should_accept "parameter-type ", ["--id=1","--parameter-type=string"] 
+      it_should_accept "parameter-type ", ["--id=1","--parameter-type=string"]
       it_should_accept "required", ["--id=1","--required=true"]
 
       it_should_fail_with "id missing", []

data/test/unit/smart_proxy_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::SmartProxy do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/subnet_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::Subnet do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do

data/test/unit/template_test.rb

@@ -19,6 +19,7 @@ describe HammerCLIForeman::Template do
     resource_mock.stub_method(:index, [])
     resource_mock.stub_method(:show, template_hash)
     cmd.class.resource resource_mock
+    cmd.stubs(:name_to_id).returns(1)
     File.stubs(:read).returns("")
   end
 

data/test/unit/user_test.rb

@@ -8,6 +8,7 @@ describe HammerCLIForeman::User do
 
   before :each do
     cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
+    cmd.stubs(:name_to_id).returns(1)
   end
 
   let(:cmd_module) { HammerCLIForeman::User }
@@ -37,6 +38,7 @@ describe HammerCLIForeman::User do
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
+      it_should_accept "login", ["--login=admin"]
       it_should_fail_with "no arguments"
     end
 
@@ -73,6 +75,7 @@ describe HammerCLIForeman::User do
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
+      it_should_accept "login", ["--login=admin"]
       it_should_fail_with "id missing", []
     end
 
@@ -85,6 +88,7 @@ describe HammerCLIForeman::User do
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
+      it_should_accept "login", ["--login=admin"]
       it_should_fail_with "no params", []
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: foreman_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
 description: |
   Foreman commands for Hammer CLI
 email: tstracho@redhat.com