hammer_cli_foreman 0.1.0 → 0.1.1

data/test/unit/domain_test.rb

@@ -4,11 +4,7 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Domain do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
@@ -33,14 +29,10 @@ describe HammerCLIForeman::Domain do
 
     let(:cmd) { HammerCLIForeman::Domain::InfoCommand.new("", ctx) }
 
-    before :each do
-      HammerCLIForeman::Parameter.stubs(:get_parameters).returns([])
-    end
-
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=arch"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -60,7 +52,8 @@ describe HammerCLIForeman::Domain do
 
     context "parameters" do
       it_should_accept "name, fullname", ["--name=domain", "--description=full_domain_name"]
-      it_should_fail_with "name missing", ["--full-name=full_domain_name"]
+      # it_should_fail_with "name missing", ["--full-name=full_domain_name"]
+      # TODO: temporarily disabled, parameters are checked in the api
     end
 
   end
@@ -73,7 +66,7 @@ describe HammerCLIForeman::Domain do
     context "parameters" do
       it_should_accept "name", ["--name=domain"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -86,8 +79,9 @@ describe HammerCLIForeman::Domain do
     context "parameters" do
       it_should_accept "name", ["--name=domain", "--new-name=domain2", "--description=full_domain_name"]
       it_should_accept "id", ["--id=1", "--new-name=domain2", "--description=full_domain_name"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "name or id missing", ["--new-name=arch2", "--description=full_domain_name"]
+      # it_should_fail_with "no params", []
+      # it_should_fail_with "name or id missing", ["--new-name=arch2", "--description=full_domain_name"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -102,11 +96,12 @@ describe HammerCLIForeman::Domain do
     let(:cmd) { HammerCLIForeman::Domain::SetParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, value and domain name", ["--name=name", "--value=val", "--domain-name=name"]
+      it_should_accept "name, value and domain name", ["--name=name", "--value=val", "--domain=name"]
       it_should_accept "name, value and domain id", ["--name=name", "--value=val", "--domain-id=id"]
-      it_should_fail_with "name missing", ["--value=val", "--domain-name=name"]
-      it_should_fail_with "value missing", ["--name=name", "--domain-name=name"]
-      it_should_fail_with "domain name or id missing", ["--name=name", "--value=val"]
+      # it_should_fail_with "name missing", ["--value=val", "--domain=name"]
+      # it_should_fail_with "value missing", ["--name=name", "--domain=name"]
+      # it_should_fail_with "domain name or id missing", ["--name=name", "--value=val"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -117,10 +112,12 @@ describe HammerCLIForeman::Domain do
     let(:cmd) { HammerCLIForeman::Domain::DeleteParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name and domain name", ["--name=domain", "--domain-name=name"]
-      it_should_accept "name and domain id", ["--name=domain", "--domain-id=id"]
-      it_should_fail_with "name missing", ["--domain-name=name"]
-      it_should_fail_with "domain name or id missing", ["--name=name"]
+      it_should_accept "name and domain name", ["--name=param", "--domain=name"]
+      it_should_accept "name and domain id", ["--name=param", "--domain-id=id"]
+
+      # it_should_fail_with "name missing", ["--domain=name"]
+      # it_should_fail_with "domain name or id missing", ["--name=param"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end

data/test/unit/environment_test.rb

@@ -4,11 +4,7 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Environment do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
@@ -37,7 +33,8 @@ describe HammerCLIForeman::Environment do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=env"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments"
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -59,7 +56,8 @@ describe HammerCLIForeman::Environment do
 
     context "parameters" do
       it_should_accept "name", ["--name=env"]
-      it_should_fail_with "name missing", []
+      # it_should_fail_with "name missing", []
+      # TODO: temporarily disabled, parameters are checked by the api
     end
 
   end
@@ -72,7 +70,7 @@ describe HammerCLIForeman::Environment do
     context "parameters" do
       it_should_accept "name", ["--name=env"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -85,8 +83,8 @@ describe HammerCLIForeman::Environment do
     context "parameters" do
       it_should_accept "name", ["--name=env", "--new-name=env2"]
       it_should_accept "id", ["--id=1", "--new-name=env2"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "name or id missing", ["--new-name=env2"]
+      # it_should_fail_with "no params", [] # TODO: temporarily disabled, parameters are checked in the id resolver
+      # it_should_fail_with "name or id missing", ["--new-name=env2"] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -102,7 +100,7 @@ describe HammerCLIForeman::Environment do
     context "parameters" do
       it_should_accept "name", ["--name=env"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end

data/test/unit/fact_test.rb

@@ -4,23 +4,22 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Fact do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
     let(:cmd) { HammerCLIForeman::Fact::ListCommand.new("", ctx) }
 
+    before(:each) do
+      ResourceMocks.facts_index
+    end
+
     context "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
     end
 
     context "output" do
-      it_should_print_n_records 2
       it_should_print_column "Host"
       it_should_print_column "Fact"
       it_should_print_column "Value"

data/test/unit/helpers/command.rb

@@ -1,93 +1,149 @@
 require File.join(File.dirname(__FILE__), '../test_output_adapter')
 
+class IdResolverTestProxy
 
-module CommandTestHelper
+  attr_reader :api
 
-  def with_params(params, &block)
-    context "with params "+params.to_s do
-      let(:with_params) { params }
-      self.instance_eval &block
-    end
+  def initialize(original_resolver)
+    @original_resolver = original_resolver
+    define_id_finders
   end
 
-  def it_should_call_action(action, params, headers={})
-    it "should call action "+action.to_s do
-      arguments ||= respond_to?(:with_params) ? with_params : []
-      ApipieBindings::API.any_instance.expects(:call).with() do |r,a,p,h,o|
-        (r == cmd.resource.name && a == action && p == params && h == headers)
-      end
-      cmd.run(arguments)
-    end
+  def scoped_options(scope, options)
+    @original_resolver.scoped_options(scope, options)
+  end
+
+  def dependent_resources(resource, options={})
+    @original_resolver.dependent_resources(resource, options)
   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 : []
-      ApipieBindings::API.any_instance.expects(:call).with() do |r,a,p,h,o|
-        (r == cmd.resource.name && a == action && yield(p))
+  def id_params(action, options={})
+    @original_resolver.id_params(action, options)
+  end
+
+  def param_to_resource(param_name)
+    @original_resolver.param_to_resource(param_name)
+  end
+
+
+  protected
+
+  def define_id_finders
+    @original_resolver.api.resources.each do |resource|
+      method_name = "#{resource.singular_name}_id"
+
+      self.class.send(:define_method, method_name) do |options|
+        1
       end
-      cmd.run(arguments)
     end
   end
 
-  def it_should_fail_with(message, arguments=[])
-    it "should fail with " + message.to_s do
-      cmd.run(arguments).must_equal HammerCLI::EX_USAGE
+end
+
+
+module CommandTestHelper
+
+  def self.included(base)
+    base.extend(ClassMethods)
+
+    base.before :each do
+      resolver = cmd.resolver
+      cmd.stubs(:resolver).returns(IdResolverTestProxy.new(resolver))
     end
   end
 
-  def it_should_accept(message, arguments=[])
-    it "should accept " + message.to_s do
-      out, err = capture_io do
-        cmd.run(arguments).must_equal HammerCLI::EX_OK
+  module ClassMethods
+
+    def with_params(params, &block)
+      context "with params "+params.to_s do
+        let(:with_params) { params }
+        self.instance_eval &block
       end
     end
-  end
 
-  def it_should_output(message, adapter=:base)
-    it "should output '" + message.to_s + "'" do
-      arguments ||= respond_to?(:with_params) ? with_params : []
-      cmd.stubs(:context).returns(ctx.update(:adapter => adapter))
-      out, err = capture_io do
+    def it_should_call_action(action, params, headers={})
+      it "should call action "+action.to_s do
+        arguments ||= respond_to?(:with_params) ? with_params : []
+        ApipieBindings::API.any_instance.expects(:call).with() do |r,a,p,h,o|
+          (r == cmd.resource.name && a == action && p == params && h == headers)
+        end
         cmd.run(arguments)
       end
-      out.must_include message
     end
-  end
 
-  def it_should_print_column(column_name, arguments=nil)
-    it "should print column " + column_name do
-      arguments ||= respond_to?(:with_params) ? with_params : []
+    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 : []
+        ApipieBindings::API.any_instance.expects(:call).with() do |r,a,p,h,o|
+          (r == cmd.resource.name && a == action && yield(p))
+        end
+        cmd.run(arguments)
+      end
+    end
 
-      cmd.stubs(:context).returns(ctx.update(:adapter => :test))
-      proc { cmd.run(arguments) }.must_output /.*##{column_name}#.*/
+    def it_should_fail_with(message, arguments=[])
+      it "should fail with " + message.to_s do
+        cmd.run(arguments).must_equal HammerCLI::EX_USAGE
+      end
     end
-  end
 
-  def it_should_print_columns(column_names, arguments=nil)
-    column_names.each do |name|
-      it_should_print_column name, arguments
+    def it_should_accept(message, arguments=[])
+      it "should accept " + message.to_s do
+        out, err = capture_io do
+          cmd.run(arguments).must_equal HammerCLI::EX_OK
+        end
+      end
     end
-  end
 
-  def it_should_print_n_records(count=nil, arguments=nil)
-    it "should print correct count of records" do
-      arguments ||= respond_to?(:with_params) ? with_params : []
+    def it_should_output(message, adapter=:base)
+      it "should output '" + message.to_s + "'" do
+        arguments ||= respond_to?(:with_params) ? with_params : []
+        cmd.stubs(:context).returns(ctx.update(:adapter => adapter))
+        out, err = capture_io do
+          cmd.run(arguments)
+        end
+        out.must_include message
+      end
+    end
 
-      cmd.stubs(:context).returns(ctx.update(:adapter => :test))
-      count ||= expected_record_count rescue 0
-      out, err = capture_io do
-        cmd.run(arguments)
+    def it_should_print_column(column_name, arguments=nil)
+      it "should print column " + column_name do
+        arguments ||= respond_to?(:with_params) ? with_params : []
+
+        cmd.stubs(:context).returns(ctx.update(:adapter => :test))
+        out, err = capture_io do
+          cmd.run(arguments)
+        end
+
+        out.split("\n")[0].must_match /.*##{column_name}#.*/
+      end
+    end
+
+    def it_should_print_columns(column_names, arguments=nil)
+      column_names.each do |name|
+        it_should_print_column name, arguments
       end
-      out.split(/\n/).length.must_equal count+1 # plus 1 for line with column headers
     end
-  end
 
-  def it_should_accept_search_params
-    it_should_accept "search", ["--search=some_search"]
-    it_should_accept "per page", ["--per-page=1"]
-    it_should_accept "page", ["--page=2"]
-    it_should_accept "order", ["--order=order"]
+    def it_should_print_n_records(count=nil, arguments=nil)
+      it "should print correct count of records" do
+        arguments ||= respond_to?(:with_params) ? with_params : []
+
+        cmd.stubs(:context).returns(ctx.update(:adapter => :test))
+        count ||= expected_record_count rescue 0
+        out, err = capture_io do
+          cmd.run(arguments)
+        end
+        out.split(/\n/).length.must_equal count+1 # plus 1 for line with column headers
+      end
+    end
+
+    def it_should_accept_search_params
+      it_should_accept "search", ["--search=some_search"]
+      it_should_accept "per page", ["--per-page=1"]
+      it_should_accept "page", ["--page=2"]
+      it_should_accept "order", ["--order=order"]
+    end
   end
 
 end

data/test/unit/helpers/fake_searchables.rb

@@ -0,0 +1,19 @@
+
+
+class FakeSearchables
+
+  def initialize(searchable_fields, editable_fields = [])
+    @searchables = []
+    @searchables += searchable_fields.collect do |name|
+      HammerCLIForeman::Searchable.new(name, "Search by #{name}", :editable => false)
+    end
+    @searchables += editable_fields.collect do |name|
+      HammerCLIForeman::Searchable.new(name, "Search by #{name}", :editable => true)
+    end
+  end
+
+  def for(resource)
+    @searchables
+  end
+
+end

data/test/unit/host_test.rb

@@ -4,11 +4,7 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Host do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
@@ -23,7 +19,7 @@ describe HammerCLIForeman::Host do
       let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
-      it_should_print_columns ["Id", "Name", "Operating System Id", "Host Group Id", "IP", "MAC"]
+      it_should_print_columns ["Id", "Name", "Operating System", "Host Group", "IP", "MAC"]
     end
 
   end
@@ -33,28 +29,27 @@ describe HammerCLIForeman::Host do
     let(:cmd) { HammerCLIForeman::Host::InfoCommand.new("", ctx) }
 
     before :each do
-      HammerCLIForeman::Parameter.stubs(:get_parameters).returns([])
+      cmd.stubs(:get_parameters).returns([])
     end
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=host"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
-        it_should_print_columns ["Id", "Name", "Operating System Id", "Host Group Id", "IP", "MAC"]
+        it_should_print_columns ["Id", "Name", "Operating System", "Host Group", "IP", "MAC"]
 
-        it_should_print_columns ["UUID", "Cert name"]
-        it_should_print_columns ["Environment", "Environment Id"]
+        it_should_print_columns ["UUID", "Cert name", "Environment"]
         it_should_print_columns ["Managed", "Enabled", "Build"]
         it_should_print_columns ["Use image", "Disk", "Image file"]
-        it_should_print_columns ["SP Name", "SP IP", "SP MAC", "SP Subnet", "SP Subnet Id"]
+        it_should_print_columns ["SP Name", "SP IP", "SP MAC", "SP Subnet"]
         it_should_print_columns ["Created at", "Updated at", "Installed at", "Last report"]
-        it_should_print_columns ["Puppet CA Proxy Id", "Medium Id", "Model Id", "Owner Id", "Subnet Id", "Domain Id"]
-        it_should_print_columns ["Puppet Proxy Id", "Owner Type", "Partition Table Id", "Architecture Id", "Image Id", "Compute Resource Id"]
+        it_should_print_columns ["Puppet CA Proxy Id", "Medium", "Model", "Owner Id", "Subnet", "Domain"]
+        it_should_print_columns ["Puppet Proxy Id", "Owner Type", "Partition Table", "Architecture", "Image", "Compute Resource"]
         it_should_print_columns ["BMC Network Interfaces", "Managed Network Interfaces"]
         it_should_print_columns ["Comment"]
       end
@@ -73,7 +68,8 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments"
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -93,15 +89,19 @@ describe HammerCLIForeman::Host do
 
     let(:cmd) { HammerCLIForeman::Host::FactsCommand.new("", ctx) }
 
+    before(:each) do
+      ResourceMocks.facts_index
+    end
+
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments"
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
       with_params ["--name=my5name.mydomain.net"] do
-        it_should_print_n_records 2
         it_should_print_column "Fact"
         it_should_print_column "Value"
       end
@@ -116,10 +116,12 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", []
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
+
       with_params ["--name=my5name.mydomain.net"] do
         it_should_print_column "Id"
         it_should_print_column "Name"
@@ -136,7 +138,9 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments"
+      # TODO: temporarily disabled, parameters are checked in the id resolver
+
     end
 
     context "output" do
@@ -185,7 +189,8 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", []
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -244,8 +249,9 @@ describe HammerCLIForeman::Host do
             "--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',
             "--root-password=pwd", "--ask-root-password=true", "--provision-method=build"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "name or id missing", ["--new-name=host2"]
+      # it_should_fail_with "no params", []
+      # it_should_fail_with "name or id missing", ["--new-name=host2"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
 
       with_params ["--id=1", "--puppet-proxy-id=1"] do
         it_should_call_action_and_test_params(:update) { |par| par["host"].key?("managed") != true }
@@ -278,11 +284,12 @@ describe HammerCLIForeman::Host do
     let(:cmd) { HammerCLIForeman::Host::SetParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, value and host name", ["--name=name", "--value=val", "--host-name=name"]
+      it_should_accept "name, value and host name", ["--name=name", "--value=val", "--host=name"]
       it_should_accept "name, value and host id", ["--name=name", "--value=val", "--host-id=id"]
-      it_should_fail_with "name missing", ["--value=val", "--host-name=name"]
-      it_should_fail_with "value missing", ["--name=name", "--host-name=name"]
-      it_should_fail_with "host name or id missing", ["--name=name", "--value=val"]
+      it_should_fail_with "name missing", ["--value=val", "--host=name"]
+      it_should_fail_with "value missing", ["--name=name", "--host=name"]
+      # it_should_fail_with "host name or id missing", ["--name=name", "--value=val"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -293,10 +300,11 @@ describe HammerCLIForeman::Host do
     let(:cmd) { HammerCLIForeman::Host::DeleteParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name and host name", ["--name=name", "--host-name=name"]
+      it_should_accept "name and host name", ["--name=name", "--host=name"]
       it_should_accept "name and host id", ["--name=name", "--host-id=id"]
-      it_should_fail_with "name missing", ["--host-name=name"]
-      it_should_fail_with "host name or id missing", ["--name=name"]
+      # it_should_fail_with "name missing", ["--host=name"]
+      # it_should_fail_with "host name or id missing", ["--name=name"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -306,7 +314,8 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "empty params", []
+      # it_should_fail_with "empty params", []
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
   end
 
@@ -316,7 +325,8 @@ describe HammerCLIForeman::Host do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
       it_should_accept "id and force", ["--id=1", "--force"]
-      it_should_fail_with "empty params", []
+      # it_should_failwith "empty params", []
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
   end
 
@@ -325,7 +335,8 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=host"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "empty params", []
+      # it_should_fail_with "empty params", []
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
   end
 
@@ -340,7 +351,7 @@ describe HammerCLIForeman::Host do
     context "parameters" do
       it_should_accept "name", ["--name=env"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end