hammer_cli_foreman 0.0.18 → 0.1.0

data/test/unit/model_test.rb

@@ -7,7 +7,6 @@ describe HammerCLIForeman::Model do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
     cmd.stubs(:name_to_id).returns(1)
   end
 
@@ -21,7 +20,7 @@ describe HammerCLIForeman::Model do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_column "Name"
@@ -29,7 +28,6 @@ describe HammerCLIForeman::Model do
       it_should_print_column "Vendor class"
       it_should_print_column "HW model"
     end
-
   end
 
 

data/test/unit/operating_system_test.rb

@@ -7,15 +7,15 @@ describe HammerCLIForeman::OperatingSystem do
   extend CommandTestHelper
 
   before :each do
-    resource_mock = ApipieResourceMock.new(cmd.class.resource.resource_class)
-    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
 
+    before :each do
+      ResourceMocks.operatingsystems
+    end
+
     let(:cmd) { HammerCLIForeman::OperatingSystem::ListCommand.new("", ctx) }
 
     context "parameters" do
@@ -24,7 +24,7 @@ describe HammerCLIForeman::OperatingSystem do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_column "Name"
@@ -115,15 +115,13 @@ describe HammerCLIForeman::OperatingSystem do
   context "SetParameterCommand" do
 
     before :each do
-      resource_mock = ApipieResourceMock.new(cmd.class.resource.resource_class)
-      resource_mock.stub_method(:index, [])
-      cmd.class.resource resource_mock
+      ResourceMocks.operatingsystems
     end
 
     let(:cmd) { HammerCLIForeman::OperatingSystem::SetParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, value and os id", ["--name=name", "--value=val", "--os-id=id"]
+      it_should_accept "name, value and os id", ["--name=domain", "--value=val", "--os-id=id"]
       it_should_fail_with "name missing", ["--value=val", "--os-id=id"]
       it_should_fail_with "value missing", ["--name=name", "--os-id=id"]
       it_should_fail_with "os id missing", ["--name=name", "--value=val"]

data/test/unit/organization_test.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 require File.join(File.dirname(__FILE__), 'helpers/resource_disabled')
+require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
+
 
 describe HammerCLIForeman::Organization do
 
@@ -7,15 +9,15 @@ describe HammerCLIForeman::Organization do
   extend ResourceDisabled
 
   before :each do
-    resource_mock = ApipieResourceMock.new(cmd.class.resource.resource_class)
-    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
 
+    before :each do
+      ResourceMocks.organizations_index
+    end
+
     let(:cmd) { HammerCLIForeman::Organization::ListCommand.new("", ctx) }
 
     context "parameters" do
@@ -24,7 +26,7 @@ describe HammerCLIForeman::Organization do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_column "Name"
@@ -37,6 +39,10 @@ describe HammerCLIForeman::Organization do
 
   context "InfoCommand" do
 
+    before :each do
+      ResourceMocks.organizations_show
+    end
+
     let(:cmd) { HammerCLIForeman::Organization::InfoCommand.new("", ctx) }
 
     context "parameters" do
@@ -103,7 +109,7 @@ describe HammerCLIForeman::Organization do
       it_should_fail_with "name or id missing", ["--new-name=org2"]
     end
 
-     with_params ["--id=1"] do
+    with_params ["--id=1"] do
       it_should_fail_when_disabled
     end
   end

data/test/unit/output/formatters_test.rb

@@ -22,6 +22,11 @@ describe HammerCLIForeman::Output::Formatters::ServerFormatter do
     formatter.format({ :name => 'Server', :url => "URL"}).must_equal 'Server (URL)'
   end
 
+  it "formats the server" do
+    formatter = HammerCLIForeman::Output::Formatters::ServerFormatter.new
+    formatter.format({ 'name' => 'Server', 'url' => "URL"}).must_equal 'Server (URL)'
+  end
+
   it "recovers when server is nil" do
     formatter = HammerCLIForeman::Output::Formatters::ServerFormatter.new
     formatter.format(nil).must_equal nil

data/test/unit/partition_table_test.rb

@@ -8,7 +8,6 @@ describe HammerCLIForeman::PartitionTable do
   extend CommandTestHelper
 
   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")
@@ -24,7 +23,7 @@ describe HammerCLIForeman::PartitionTable do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_columns ["Id", "Name", "OS Family"]

data/test/unit/puppet_class_test.rb

@@ -7,7 +7,6 @@ describe HammerCLIForeman::PuppetClass do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
     cmd.stubs(:name_to_id).returns(1)
   end
 
@@ -22,7 +21,7 @@ describe HammerCLIForeman::PuppetClass do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_column "Id"
@@ -55,7 +54,7 @@ describe HammerCLIForeman::PuppetClass do
   context "SCParamsCommand" do
 
     before :each do
-      cmd.class.resource ResourceMocks.smart_class_parameter
+      ResourceMocks.smart_class_parameters_index
     end
 
     let(:cmd) { HammerCLIForeman::PuppetClass::SCParamsCommand.new("", ctx) }

data/test/unit/report_test.rb

@@ -7,7 +7,6 @@ describe HammerCLIForeman::Report do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
     cmd.stubs(:name_to_id).returns(1)
   end
 
@@ -21,7 +20,7 @@ describe HammerCLIForeman::Report do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_column "Id"

data/test/unit/smart_class_parameter_test.rb

@@ -7,12 +7,15 @@ describe HammerCLIForeman::SmartClassParameter do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ResourceMocks.smart_class_parameter
     cmd.stubs(:name_to_id).returns(1)
   end
 
   context "ListCommand" do
 
+    before :each do
+      ResourceMocks.smart_class_parameters_index
+    end
+
     let(:cmd) { HammerCLIForeman::SmartClassParameter::ListCommand.new("", ctx) }
 
     context "parameters" do
@@ -25,7 +28,7 @@ describe HammerCLIForeman::SmartClassParameter do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_column "Id"
@@ -41,15 +44,17 @@ describe HammerCLIForeman::SmartClassParameter do
 
   context "InfoCommand" do
 
-    let(:cmd) { HammerCLIForeman::SmartClassParameter::InfoCommand.new("", ctx) }
+    before :each do
+      ResourceMocks.smart_class_parameters_show
+    end
 
+    let(:cmd) { HammerCLIForeman::SmartClassParameter::InfoCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=param"]
       it_should_fail_with "no arguments"
     end
-
   end
 
 

data/test/unit/smart_proxy_test.rb

@@ -7,7 +7,6 @@ describe HammerCLIForeman::SmartProxy do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
     cmd.stubs(:name_to_id).returns(1)
   end
 
@@ -21,7 +20,7 @@ describe HammerCLIForeman::SmartProxy do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_columns  ["Id", "Name", "URL"]

data/test/unit/subnet_test.rb

@@ -7,7 +7,6 @@ describe HammerCLIForeman::Subnet do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
     cmd.stubs(:name_to_id).returns(1)
   end
 
@@ -21,7 +20,7 @@ describe HammerCLIForeman::Subnet do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_columns  ["Id", "Name", "Network", "Mask"]
@@ -45,7 +44,7 @@ describe HammerCLIForeman::Subnet do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Network", "Mask"]
         it_should_print_columns ["Priority"]
-        it_should_print_columns ["DNS", "Primary DNS", "Secondary DNS"]
+        it_should_print_columns ["DNS", "DNS id", "Primary DNS", "Secondary DNS"]
         it_should_print_columns ["Domain ids", "TFTP", "TFTP id", "DHCP", "DHCP id"]
         it_should_print_columns ["vlan id", "Gateway", "From", "To"]
       end

data/test/unit/template_test.rb

@@ -15,10 +15,6 @@ describe HammerCLIForeman::Template do
   }
 
   before :each do
-    resource_mock = ApipieResourceMock.new(cmd.class.resource.resource_class)
-    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
@@ -33,7 +29,7 @@ describe HammerCLIForeman::Template do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_columns ["Id", "Name", "Type"]
@@ -44,7 +40,6 @@ describe HammerCLIForeman::Template do
             :id => 1, :name => "PXE"
           }
         }
-        mock_resource_method(:index, [[template_wo_kind], nil])
         cmd.run([]).must_equal 0
       end
     end
@@ -57,12 +52,32 @@ describe HammerCLIForeman::Template do
     let(:cmd) { HammerCLIForeman::Template::InfoCommand.new("", ctx) }
 
     context "parameters" do
+      before(:each) do
+        template = {
+          'config_template' => {
+            'id' => 1, 'name' => 'PXE', 'type' => 'something',
+            'operatingsystems' => [ { 'id' => 1 }, { 'id' => 3 }, { 'id' =>4 } ]
+          }
+        }
+        ResourceMocks.mock_action_call(:templates, :show, [template])
+      end
+
       it_should_accept "id", ["--id=1"]
       it_should_fail_with "no arguments"
     end
 
     context "output" do
       with_params ["--id=1"] do
+        before(:each) do
+          template = {
+            'config_template' => {
+              'id' => 1, 'name' => 'PXE', 'type' => 'something',
+              'operatingsystems' => [ { 'id' => 1 }, { 'id' => 3 }, { 'id' =>4 } ]
+            }
+          }
+          ResourceMocks.mock_action_call(:templates, :show, [template])
+        end
+
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Type", "OS ids"]
       end
@@ -99,7 +114,7 @@ describe HammerCLIForeman::Template do
     let(:cmd) { HammerCLIForeman::Template::CreateCommand.new("", ctx) }
 
     before :each do
-      cmd.stubs(:template_kind_id).returns(1)
+      cmd.stubs(:option_template_kind_id).returns(1)
     end
 
     context "parameters" do
@@ -117,7 +132,7 @@ describe HammerCLIForeman::Template do
     let(:cmd) { HammerCLIForeman::Template::UpdateCommand.new("", ctx) }
 
     before :each do
-      cmd.stubs(:template_kind_id).returns(1)
+      cmd.stubs(:option_template_kind_id).returns(1)
     end
 
     context "parameters" do

data/test/unit/test_helper.rb

@@ -14,6 +14,16 @@ require 'minitest/spec'
 require "minitest-spec-context"
 require "mocha/setup"
 
+
+require 'hammer_cli'
+require 'hammer_cli_foreman/commands'
+
+HammerCLIForeman.stubs(:resource_config).returns({
+  :apidoc_cache_dir => 'test/unit/data/' + (ENV['TEST_API_VERSION'] || '1.4'),
+  :apidoc_cache_name => 'foreman_api',
+  :dry_run => true})
+
+
 require 'hammer_cli_foreman'
 
 def ctx
@@ -30,3 +40,6 @@ require File.join(File.dirname(__FILE__), 'test_output_adapter')
 require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 require File.join(File.dirname(__FILE__), 'helpers/command')
 require File.join(File.dirname(__FILE__), 'helpers/resource_disabled')
+
+HammerCLI::Settings.load({:_params => {:interactive => false}})
+

data/test/unit/test_output_adapter.rb

@@ -13,7 +13,7 @@ class TestAdapter < HammerCLI::Output::Adapter::Abstract
     puts @separator+fields.collect{|f| f.label.to_s}.join(@separator)+@separator
 
     data.collect do |d|
-      puts @separator+fields.collect{ |f| f.get_value(d).to_s }.join(@separator)+@separator
+      puts @separator+fields.collect{ |f| data_for_field(f, d).to_s }.join(@separator)+@separator
     end
   end
 

data/test/unit/user_test.rb

@@ -7,7 +7,6 @@ describe HammerCLIForeman::User do
   extend CommandTestHelper
 
   before :each do
-    cmd.class.resource ApipieResourceMock.new(cmd.class.resource.resource_class)
     cmd.stubs(:name_to_id).returns(1)
   end
 
@@ -23,7 +22,7 @@ describe HammerCLIForeman::User do
     end
 
     context "output" do
-      let(:expected_record_count) { cmd.resource.call(:index)[0].length }
+      let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
       it_should_print_columns ["Id", "Login", "Name", "Email"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: foreman_api
+  name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.0.6
 description: |
   Foreman commands for Hammer CLI
 email: tstracho@redhat.com
@@ -49,6 +49,7 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/hammer_cli_foreman/report.rb
+- lib/hammer_cli_foreman/i18n.rb
 - lib/hammer_cli_foreman/media.rb
 - lib/hammer_cli_foreman/domain.rb
 - lib/hammer_cli_foreman/partition_table.rb
@@ -56,6 +57,7 @@ files:
 - lib/hammer_cli_foreman/exceptions.rb
 - lib/hammer_cli_foreman/smart_class_parameter.rb
 - lib/hammer_cli_foreman/host.rb
+- lib/hammer_cli_foreman/auth.rb
 - lib/hammer_cli_foreman/hostgroup.rb
 - lib/hammer_cli_foreman/organization.rb
 - lib/hammer_cli_foreman/parameter.rb
@@ -70,6 +72,7 @@ files:
 - lib/hammer_cli_foreman/output.rb
 - lib/hammer_cli_foreman/compute_resource.rb
 - lib/hammer_cli_foreman/common_parameter.rb
+- lib/hammer_cli_foreman/credentials.rb
 - lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/architecture.rb
 - lib/hammer_cli_foreman/location.rb
@@ -330,6 +333,7 @@ files:
 - test/unit/environment_test.rb
 - test/unit/common_parameter_test.rb
 - test/unit/report_test.rb
+- test/unit/data/1.4/foreman_api.json
 - test/unit/partition_table_test.rb
 - test/unit/media_test.rb
 - test/unit/exception_handler_test.rb
@@ -349,10 +353,14 @@ files:
 - test/unit/hostgroup_test.rb
 - test/unit/image_test.rb
 - test/unit/output/formatters_test.rb
+- test/unit/credentials_test.rb
 - test/unit/user_test.rb
 - test/unit/helpers/command.rb
 - test/unit/helpers/resource_disabled.rb
 - test/unit/architecture_test.rb
+- locale/zanata.xml
+- locale/hammer-cli-foreman.pot
+- locale/Makefile
 - README.md
 homepage: http://github.com/theforeman/hammer-cli-foreman
 licenses:
@@ -627,6 +635,7 @@ test_files:
 - test/unit/environment_test.rb
 - test/unit/common_parameter_test.rb
 - test/unit/report_test.rb
+- test/unit/data/1.4/foreman_api.json
 - test/unit/partition_table_test.rb
 - test/unit/media_test.rb
 - test/unit/exception_handler_test.rb
@@ -646,6 +655,7 @@ test_files:
 - test/unit/hostgroup_test.rb
 - test/unit/image_test.rb
 - test/unit/output/formatters_test.rb
+- test/unit/credentials_test.rb
 - test/unit/user_test.rb
 - test/unit/helpers/command.rb
 - test/unit/helpers/resource_disabled.rb