hammer_cli_foreman 0.0.5 → 0.0.6

data/lib/hammer_cli_foreman/commands.rb

@@ -6,18 +6,12 @@ module HammerCLIForeman
 
     action :index
 
-    def self.command_name(name=nil)
-      super(name) || "list"
+    def adapter
+      :table
     end
 
-    def output
- 
-      @output ||= HammerCLI::Output::Output.new(
-            :context => context,
-            :definition => output_definition,
-            :adapter => HammerCLI::Output::Adapter::Table.new(
-              context, HammerCLIForeman::Output::Formatters::DEFAULT_FORMATTERS))
-
+    def self.command_name(name=nil)
+      super(name) || "list"
     end
 
   end
@@ -41,14 +35,6 @@ module HammerCLIForeman
       super(options.merge(:without => declared_identifiers.keys))
     end
 
-    def output
-      @output ||= HammerCLI::Output::Output.new(
-            :context => context,
-            :definition => output_definition,
-            :adapter => HammerCLI::Output::Adapter::Base.new(
-              context, HammerCLIForeman::Output::Formatters::DEFAULT_FORMATTERS))
-    end
-
   end
 
 

data/lib/hammer_cli_foreman/common_parameter.rb

@@ -44,7 +44,7 @@ module HammerCLIForeman
         else
           msg = "Global parameter updated"
         end
-        output.print_message msg
+        print_message msg
       end
 
       def parameter_exist?

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -56,10 +56,10 @@ module HammerCLIForeman
         end
       end
 
-      def print_records(data)
+      def print_data(data)
         provider = data["compute_resource"]["provider"].downcase
         output_definition.fields.concat PROVIDER_SPECIFIC_FIELDS[provider]
-        super data
+        print_records(output_definition, data)
       end
 
     end

data/lib/hammer_cli_foreman/host.rb

@@ -92,7 +92,7 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Host, "status"
 
       def print_data(records)
-        output.print_message records["status"]
+        print_message records["status"]
       end
     end
 
@@ -103,7 +103,7 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Host, "puppetrun"
 
       def print_data(records)
-        output.print_message 'Puppet run triggered'
+        print_message 'Puppet run triggered'
       end
     end
 

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -2,22 +2,31 @@ module HammerCLIForeman::Output
   module Formatters
 
     class OSNameFormatter < HammerCLI::Output::Formatters::FieldFormatter
+
+      def tags
+        [:flat]
+      end
+
       def format(os)
         name = "%s %s" % [os[:name], os[:major]]
-        name += ".%s" % os[:minor] unless os[:minor].nil?
+        name += ".%s" % os[:minor] unless (!os.has_key?(:minor) || os[:minor].empty?)
         name
       end
     end
 
     class ServerFormatter < HammerCLI::Output::Formatters::FieldFormatter
+      
+      def tags
+        [:flat]
+      end
+
       def format(server)
         "%s (%s)" % [server[:name], server[:url]]
       end
     end
 
-    DEFAULT_FORMATTERS = HammerCLI::Output::Formatters::DEFAULT_FORMATTERS
-    DEFAULT_FORMATTERS.register_formatter(:OSName, OSNameFormatter.new)
-    DEFAULT_FORMATTERS.register_formatter(:Server, ServerFormatter.new)
+    HammerCLI::Output::Output.register_formatter(OSNameFormatter.new, :OSName)
+    HammerCLI::Output::Output.register_formatter(ServerFormatter.new, :Server)
 
   end
 end

data/lib/hammer_cli_foreman/parameter.rb

@@ -34,10 +34,10 @@ module HammerCLIForeman
       def execute
         if parameter_exist?
           update_parameter
-          output.print_message success_message_for :update if success_message_for :update
+          print_message success_message_for :update if success_message_for :update
         else
           create_parameter
-          output.print_message success_message_for :create if success_message_for :create
+          print_message success_message_for :create if success_message_for :create
         end
         HammerCLI::EX_OK
       end
@@ -96,7 +96,7 @@ module HammerCLIForeman
         }.merge base_action_params
 
         resource.call(:destroy, params)
-        output.print_message success_message if success_message
+        print_message success_message if success_message
         HammerCLI::EX_OK
       end
 

data/lib/hammer_cli_foreman/resource_supported_test.rb

@@ -6,7 +6,8 @@ module HammerCLIForeman
       if resource_supported?
         super
       else
-        output.print_error "The server does not support such operation."
+        error = "The server does not support such operation."
+        HammerCLI::Output::Output.print_error error, nil, context, :adapter => adapter
         1
       end
     end

data/lib/hammer_cli_foreman/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,122 +10,133 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: foreman_api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Foreman commands for Hammer CLI
+description: ! 'Foreman commands for Hammer CLI
+
+'
 email: tstracho@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hammer_cli_foreman/output.rb
-- lib/hammer_cli_foreman/environment.rb
-- lib/hammer_cli_foreman/domain.rb
-- lib/hammer_cli_foreman/partition_table.rb
-- lib/hammer_cli_foreman/host.rb
-- lib/hammer_cli_foreman/resource_supported_test.rb
-- lib/hammer_cli_foreman/location.rb
-- lib/hammer_cli_foreman/subnet.rb
-- lib/hammer_cli_foreman/media.rb
+- lib/hammer_cli_foreman.rb
 - lib/hammer_cli_foreman/common_parameter.rb
-- lib/hammer_cli_foreman/puppet_class.rb
 - lib/hammer_cli_foreman/model.rb
+- lib/hammer_cli_foreman/output/fields.rb
+- lib/hammer_cli_foreman/output/formatters.rb
+- lib/hammer_cli_foreman/template.rb
 - lib/hammer_cli_foreman/fact.rb
 - lib/hammer_cli_foreman/user.rb
-- lib/hammer_cli_foreman/smart_proxy.rb
-- lib/hammer_cli_foreman/commands.rb
-- lib/hammer_cli_foreman/version.rb
-- lib/hammer_cli_foreman/output/formatters.rb
-- lib/hammer_cli_foreman/output/fields.rb
+- lib/hammer_cli_foreman/domain.rb
+- lib/hammer_cli_foreman/resource_supported_test.rb
+- lib/hammer_cli_foreman/media.rb
 - lib/hammer_cli_foreman/compute_resource.rb
-- lib/hammer_cli_foreman/exception_handler.rb
+- lib/hammer_cli_foreman/report.rb
+- lib/hammer_cli_foreman/location.rb
+- lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/associating_commands.rb
+- lib/hammer_cli_foreman/parameter.rb
+- lib/hammer_cli_foreman/architecture.rb
+- lib/hammer_cli_foreman/version.rb
+- lib/hammer_cli_foreman/smart_proxy.rb
+- lib/hammer_cli_foreman/environment.rb
 - lib/hammer_cli_foreman/organization.rb
+- lib/hammer_cli_foreman/host.rb
 - lib/hammer_cli_foreman/hostgroup.rb
-- lib/hammer_cli_foreman/architecture.rb
+- lib/hammer_cli_foreman/output.rb
+- lib/hammer_cli_foreman/exception_handler.rb
+- lib/hammer_cli_foreman/puppet_class.rb
+- lib/hammer_cli_foreman/partition_table.rb
 - lib/hammer_cli_foreman/operating_system.rb
-- lib/hammer_cli_foreman/template.rb
-- lib/hammer_cli_foreman/report.rb
-- lib/hammer_cli_foreman/parameter.rb
-- lib/hammer_cli_foreman.rb
+- lib/hammer_cli_foreman/subnet.rb
 homepage: http://github.com/theforeman/hammer-cli-foreman
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Foreman commands for Hammer
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 347e1a17bb3de02d953265130d1ee306eb42b9a7
-  data.tar.gz: fa67c9be572c2224e7e0f16ea2c2eacad66af3af
-SHA512:
-  metadata.gz: 3364fffab86bdb1ac845c4b632cd3a2364c0f3f928cbe98b61298421c540365f24fad21de21dbea0de197b545fac67860f2762ab9d880c1e65a95b5f319f7df1
-  data.tar.gz: d89eebb8f3141fcd809f55fa2f7bd73d679fb16f3fbd97d1d0be2c58b8a4bb7482150a281da8cd76a9b8e9acab8aed9f84470c0916e2386429e98a9ba418d3f9