hammer_cli_foreman 0.0.15 → 0.0.16

data/lib/hammer_cli_foreman/report.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class Report < HammerCLI::Apipie::Command
@@ -74,6 +70,7 @@ module HammerCLIForeman
         end
       end
 
+      apipie_options
     end
 
 
@@ -81,6 +78,8 @@ module HammerCLIForeman
       identifiers :id
       success_message "Report has been deleted"
       failure_message "Could not delete the report"
+
+      apipie_options
     end
 
 

data/lib/hammer_cli_foreman/smart_class_parameter.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class SmartClassParametersBriefList < HammerCLIForeman::ListCommand
@@ -78,10 +74,10 @@ module HammerCLIForeman
         res
       end
 
+      apipie_options
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      # identifiers :id, :name
 
       success_message "Parameter updated"
       failure_message "Could not update the parameter"
@@ -104,6 +100,6 @@ module HammerCLIForeman
 
   end
 
-  HammerCLI::MainCommand.subcommand 'sc_param', "Manipulate Foreman's smart class parameters.", HammerCLIForeman::SmartClassParameter
+  HammerCLI::MainCommand.subcommand 'sc_param', "Manipulate smart class parameters.", HammerCLIForeman::SmartClassParameter
 
 end

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class SmartProxy < HammerCLI::Apipie::Command
@@ -33,10 +29,11 @@ module HammerCLIForeman
       end
 
       def extend_data(proxy)
-        proxy['_features'] = proxy['features'].map { |f| f['feature']['name'] }
+        proxy['_features'] = proxy['features'].map { |f| f['name'] }
         proxy
       end
 
+      apipie_options
     end
 
 
@@ -87,7 +84,7 @@ module HammerCLIForeman
 
       def request_params
         opts = super
-        opts['dryrun'] = dryrun?
+        opts['dryrun'] = option_dryrun?
         opts
       end
     end
@@ -97,4 +94,4 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'proxy', "Manipulate Foreman's smart proxies.", HammerCLIForeman::SmartProxy
+HammerCLI::MainCommand.subcommand 'proxy', "Manipulate smart proxies.", HammerCLIForeman::SmartProxy

data/lib/hammer_cli_foreman/subnet.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class Subnet < HammerCLI::AbstractCommand
@@ -39,6 +35,7 @@ module HammerCLIForeman
         field :to, "To"
       end
 
+      apipie_options
     end
 
 
@@ -76,5 +73,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'subnet', "Manipulate Foreman's subnets.", HammerCLIForeman::Subnet
+HammerCLI::MainCommand.subcommand 'subnet', "Manipulate subnets.", HammerCLIForeman::Subnet
 

data/lib/hammer_cli_foreman/template.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 Template < HammerCLI::Apipie::Command
@@ -49,6 +44,7 @@ module HammerCLIForeman
         tpl
       end
 
+      apipie_options
     end
 
 
@@ -82,6 +78,7 @@ module HammerCLIForeman
         puts template["template"]
       end
 
+      apipie_options
     end
 
 
@@ -141,6 +138,8 @@ module HammerCLIForeman
 
       success_message "Config template deleted"
       failure_message "Could not delete the config template"
+
+      apipie_options
     end
 
 
@@ -153,5 +152,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'template', "Manipulate Foreman's config templates.", HammerCLIForeman::Template
+HammerCLI::MainCommand.subcommand 'template', "Manipulate config templates.", HammerCLIForeman::Template
 

data/lib/hammer_cli_foreman/user.rb

@@ -1,7 +1,3 @@
-require 'hammer_cli'
-require 'foreman_api'
-require 'hammer_cli_foreman/commands'
-
 module HammerCLIForeman
 
   class User < HammerCLI::Apipie::Command
@@ -40,6 +36,7 @@ module HammerCLIForeman
         user
       end
 
+      apipie_options
     end
 
 
@@ -81,5 +78,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'user', "Manipulate Foreman's users.", HammerCLIForeman::User
+HammerCLI::MainCommand.subcommand 'user', "Manipulate users.", HammerCLIForeman::User
 

data/lib/hammer_cli_foreman/version.rb

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

data/lib/hammer_cli_foreman.rb

@@ -1,8 +1,7 @@
 require 'hammer_cli'
 require 'hammer_cli/exit_codes'
 
-require 'hammer_cli_foreman/version'
-require 'hammer_cli_foreman/output/fields'
+require 'foreman_api'
 
 module HammerCLIForeman
 
@@ -10,10 +9,15 @@ module HammerCLIForeman
     HammerCLIForeman::ExceptionHandler
   end
 
+  require 'hammer_cli_foreman/version'
   require 'hammer_cli_foreman/output'
+  require 'hammer_cli_foreman/commands'
+  require 'hammer_cli_foreman/associating_commands'
+  require 'hammer_cli_foreman/parameter'
   require 'hammer_cli_foreman/exception_handler'
-  require 'hammer_cli_foreman/architecture'
   require 'hammer_cli_foreman/common_parameter'
+
+  require 'hammer_cli_foreman/architecture'
   require 'hammer_cli_foreman/compute_resource'
   require 'hammer_cli_foreman/domain'
   require 'hammer_cli_foreman/environment'

data/test/unit/apipie_resource_mock.rb

@@ -16,11 +16,17 @@ class ApipieResourceMock
     return self
   end
 
-  def expects_with(method_name, params, return_value=nil)
+  def expects_with(method_name, params, headers=nil, return_value=nil)
     return_value ||= return_value_for(method_name)
-    self.expects(method_name).with(params).returns(return_value)
+    self.expects(method_name).with(params, headers).returns(return_value)
   end
 
+  def expects_with_block(method_name, &block)
+    return_value ||= return_value_for(method_name)
+    self.expects(method_name).with() { |param, headers| yield param }
+  end
+
+
   def stub_method(method_name, return_value)
     self.stubs(method_name.to_s).returns([return_value, return_value.to_s])
     @return_values[method_name.to_s] = return_value
@@ -85,4 +91,4 @@ module ResourceMocks
     sc_params
   end
 
-end 
+end

data/test/unit/commands_test.rb

@@ -93,4 +93,24 @@ describe HammerCLIForeman do
       out.must_match("Message,Id,Name\nArchitecture created,3,i386\n")
     end
   end
+
+  context "AddAssociatedCommand" do
+    it "should associate resource" do
+      ForemanApi::Resources::Organization.any_instance.stubs(:show).returns([{
+                      "id" => 1,
+              "domain_ids" => [2]}])
+      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/exception_handler_test.rb

@@ -7,7 +7,7 @@ describe HammerCLIForeman::ExceptionHandler do
   let(:handler) { HammerCLIForeman::ExceptionHandler.new(:output => output) }
   let(:heading) { "Something went wrong" }
 
-  it "should print resource errors on unprocessable entity exception" do
+  it "should print nested resource errors on unprocessable entity exception" do
    response = <<-RESPONSE
    {"subnet":{"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
@@ -18,6 +18,17 @@ describe HammerCLIForeman::ExceptionHandler do
     err_code.must_equal HammerCLI::EX_DATAERR
   end
 
+  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"]}
+   RESPONSE
+
+    ex = RestClient::UnprocessableEntity.new(response)
+    output.expects(:print_error).with(heading, "Network address can't be blank\nNetwork address is invalid\nName can't be blank")
+    err_code = handler.handle_exception(ex, :heading => heading)
+    err_code.must_equal HammerCLI::EX_DATAERR
+  end
+
   it "should handle argument error" do
     ex = ArgumentError.new
     output.expects(:print_error).with(heading, ex.message)
@@ -44,5 +55,28 @@ describe HammerCLIForeman::ExceptionHandler do
     err_code = handler.handle_exception(HammerCLIForeman::OperationNotSupportedError.new('message'), :heading => heading)
     err_code.must_equal HammerCLI::EX_UNAVAILABLE
   end
+
+  it "should print resource errors on resource not found exception" do
+   response = <<-RESPONSE
+   {"message":"Resource architecture not found by id '1'"}
+   RESPONSE
+    ex = RestClient::ResourceNotFound.new(response)
+    ex.stubs(:message).returns("")
+
+    output.expects(:print_error).with(heading, "Resource architecture not found by id '1'")
+    err_code = handler.handle_exception(ex, :heading => heading)
+    err_code.must_equal HammerCLI::EX_NOT_FOUND
+  end
+
+  it "should print exception message on resource not found exception without explicit message" do
+   response = "{}"
+    ex = RestClient::ResourceNotFound.new(response)
+    ex.stubs(:message).returns("ResourceNotFound message")
+
+    output.expects(:print_error).with(heading, "ResourceNotFound message")
+    err_code = handler.handle_exception(ex, :heading => heading)
+    err_code.must_equal HammerCLI::EX_NOT_FOUND
+  end
+
 end
 

data/test/unit/helpers/command.rb

@@ -10,10 +10,18 @@ module CommandTestHelper
     end
   end
 
-  def it_should_call_action(action, params)
+  def it_should_call_action(action, params, headers={})
     it "should call action "+action.to_s do
       arguments ||= respond_to?(:with_params) ? with_params : []
-      cmd.resource.resource_class.expects_with(action, params)
+      cmd.resource.resource_class.expects_with(action, params, headers)
+      cmd.run(arguments)
+    end
+  end
+
+  def it_should_call_action_and_test_params(action, &block)
+    it "should call action "+action.to_s do
+      arguments ||= respond_to?(:with_params) ? with_params : []
+      cmd.resource.resource_class.expects_with_block(action, &block)
       cmd.run(arguments)
     end
   end

data/test/unit/host_test.rb

@@ -212,6 +212,14 @@ describe HammerCLIForeman::Host do
           ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--operatingsystem-id=1"]
       it_should_fail_with "operatingsystem_id missing",
           ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1"]
+
+      with_params ["--name=host", "--environment-id=1", "--architecture-id=1", "--domain-id=1", "--puppet-proxy-id=1", "--operatingsystem-id=1",
+            "--ip=1.2.3.4", "--mac=11:22:33:44:55:66", "--medium-id=1", "--partition-table-id=1", "--subnet-id=1",
+            "--sp-subnet-id=1", "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1', '--puppetclass-ids'] do
+        it_should_call_action_and_test_params(:create) { |par| par["host"]["managed"] == true }
+        it_should_call_action_and_test_params(:create) { |par| par["host"]["build"] == true }
+        it_should_call_action_and_test_params(:create) { |par| par["host"]["enabled"] == true }
+      end
     end
   end
 
@@ -227,6 +235,20 @@ describe HammerCLIForeman::Host do
             "--sp-subnet-id=1", "--model-id=1", "--hostgroup-id=1", "--owner-id=1", '--puppet-ca-proxy-id=1']
       it_should_fail_with "no params", []
       it_should_fail_with "name or id missing", ["--new-name=host2"]
+
+      with_params ["--id=1", "--puppet-proxy-id=1"] do
+        it_should_call_action_and_test_params(:update) { |par| par["host"].key?("managed") != true }
+        it_should_call_action_and_test_params(:update) { |par| par["host"].key?("build") != true }
+        it_should_call_action_and_test_params(:update) { |par| par["host"].key?("enabled") != true }
+      end
+
+      with_params ["--id=1", "--enabled=true"] do
+        it_should_call_action_and_test_params(:update) { |par| par["host"]["enabled"] == true }
+      end
+
+      with_params ["--id=1", "--enabled=false"] do
+        it_should_call_action_and_test_params(:update) { |par| par["host"]["enabled"] == false }
+      end
     end
 
   end

data/test/unit/partition_table_test.rb

@@ -50,11 +50,11 @@ describe HammerCLIForeman::PartitionTable do
     end
 
     with_params ["--id=83"] do
-      it_should_call_action :show, {'id' => '83'}
+      it_should_call_action :show, {'id' => '83'}, nil
     end
 
     with_params ["--name=ptable"] do
-      it_should_call_action :show, {'id' => 'ptable'}
+      it_should_call_action :show, {'id' => 'ptable'}, nil
     end
 
   end
@@ -71,11 +71,11 @@ describe HammerCLIForeman::PartitionTable do
     end
 
     with_params ["--id=83"] do
-      it_should_call_action :show, {'id' => '83'}
+      it_should_call_action :show, {'id' => '83'}, nil
     end
 
     with_params ["--name=ptable"] do
-      it_should_call_action :show, {'id' => 'ptable'}
+      it_should_call_action :show, {'id' => 'ptable'}, nil
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-21 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.14
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.14
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: foreman_api
   requirement: !ruby/object:Gem::Requirement