hammer_cli_katello 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk4ZTUyN2E0Y2I3MTMyOWNhYmY2MTE1ZGQzOTFiY2YwNjNlZmU1OQ==
+    ZDU1YjI4NmM1OGNmNzJhZDM1ZGQ3ODIyNTBjMjM0ZDc0ZTcxOTY3Mw==
   data.tar.gz: !binary |-
-    YTAzZjUzNGY0ZDFjYmQ5OTFjOWRhNTNhNjc3NWM3ZjVlNzA2Yjg2OQ==
+    ZGQzNDRlNTk0MjQ5NmVmZDYzOGI4Y2Y1YjMzZjQxNGM2MDRjZWVmMA==
 SHA512:
   metadata.gz: !binary |-
-    MTYwZDIyMGMxMTc0NGM0NzRjODFiOWRmYzhjYjBjNzBjNjQ0N2ExZDljNjM0
-    Y2I2MzNhYmRiMTc4OTdjY2NmMjQ4M2ExYzMwMzVmYjI2NmJmYTE3NDM0YTk0
-    ZjEzNWU5MjBiODk1ZjFhNmZjMDA0ZTU0MjI2ZGY3MGI1ZTA3Yzg=
+    OTBlYmExNzNhOWNiMmU3OTRiNDY4ODA2M2NlMjhiOTljNjQ1ZWJmMDNjNDM3
+    YzMwM2NlNmEyYWIxZTM0MmQxZDY3OGIzZjdiNzY1NzczYjU0NjAwOTRhNzg5
+    NDA2YzEwZGNhNjE4OTljOTRmY2FjODQ1MGEyMmNiMzdlNWY2ODI=
   data.tar.gz: !binary |-
-    ZTVlYTUyZDVmNjFlNTRjYzkwYzI2NzZjZGQ5NDJjMTkzZjNlMjAxMDBiOWMz
-    YjYzZDZmMjFkNjczZTUwYzMwZjUzMGNkOThiOGVjYjRjNDkwNzdkZmZmMDUw
-    NmU3OWQ3MTY5MzlkZWY2MTJhMjQ4MDg0NzliOTM1MGFiNTI3ZWM=
+    ZmI5N2U0NTc0YzNhODIwZTQ4OGQ0ODFkY2NjMGE0NmM2NGZhNGJlYzdiZGFh
+    NzNjNzZkMWQ0YjZiNmIyZDQ1OTNhNjlmY2IzNzhhODNiY2I4M2Q1MGQ3NDgx
+    NDFjZjMxOTEzOWRiYjIxYTcxODhlMWU5NzkxNThkZTI5MjkzMmU=

data/lib/hammer_cli_katello/gpg_key.rb

@@ -0,0 +1,97 @@
+module HammerCLIKatello
+
+  class GpgKeyCommand < HammerCLI::AbstractCommand
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      resource KatelloApi::Resources::GpgKey, :index
+
+      output do
+        field :id, "ID"
+        field :name, "Name"
+      end
+
+      apipie_options
+    end
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      resource KatelloApi::Resources::GpgKey, :show
+      output do
+        field :id, "ID"
+        field :name, "Name"
+        from :organization do
+          field :name, "Organization"
+        end
+
+        collection :repositories, "Repositories" do
+          field :id, "ID"
+          field :name, "Name"
+          field :content_type, "Content Type"
+          from :product do
+            field :name, "Product"
+          end
+        end
+
+        # TODO: Below!
+        # Need a better way to say
+        # Contents
+        # <content>
+
+        field "", "Content"
+        field :content, nil
+      end
+
+      def request_params
+        super.merge(method_options)
+      end
+
+      apipie_options
+    end
+
+    class CreateCommand < HammerCLIForeman::CreateCommand
+      resource KatelloApi::Resources::GpgKey, :create
+      success_message "GPG Key created"
+      failure_message "Could not create GPG Key"
+      apipie_options  :without => [:content]
+      option "--key", "GPG_KEY_FILE", "GPG Key file",
+             :attribute_name => :option_content,
+             :required => true,
+             :format => HammerCLI::Options::Normalizers::File.new
+    end
+
+    class UpdateCommand < HammerCLIForeman::UpdateCommand
+      success_message "GPG Key updated"
+      failure_message "Could not update GPG Key"
+      resource KatelloApi::Resources::GpgKey, :update
+
+      identifiers :id
+
+      def request_params
+        super.merge(method_options)
+      end
+
+      apipie_options :without => [:content]
+      option "--key", "GPG_KEY_FILE", "GPG Key file",
+             :attribute_name => :option_content,
+             :format => HammerCLI::Options::Normalizers::File.new
+    end
+
+    class DeleteCommand < HammerCLIForeman::DeleteCommand
+      success_message "GPG Key deleted"
+      failure_message "Could not delete the GPG Key"
+      resource KatelloApi::Resources::GpgKey, :destroy
+
+      identifiers :id
+      def request_params
+        super.merge(method_options)
+      end
+
+      apipie_options
+    end
+
+    autoload_subcommands
+  end
+
+  HammerCLI::MainCommand.subcommand("gpg",
+                                    "manipulate GPG Key actions on the server",
+                                    HammerCLIKatello::GpgKeyCommand)
+end

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -16,6 +16,8 @@ module HammerCLIKatello
     class InfoCommand < HammerCLIForeman::InfoCommand
       resource KatelloApi::Resources::Environment, :show
 
+      identifiers :id
+
       output do
         field :id, "ID"
         field :name, "Name"
@@ -48,7 +50,7 @@ module HammerCLIKatello
       failure_message "Could not update environment"
       resource KatelloApi::Resources::Environment, :update
 
-      identifiers :id, :name
+      identifiers :id
 
       def request_params
         super.merge(method_options)
@@ -62,7 +64,7 @@ module HammerCLIKatello
       failure_message "Could not delete environment"
       resource KatelloApi::Resources::Environment, :destroy
 
-      identifiers :id, :name
+      identifiers :id
 
       def request_params
         super.merge(method_options)

data/lib/hammer_cli_katello/ping.rb

@@ -10,54 +10,75 @@ module HammerCLIKatello
         label "candlepin" do
           from "candlepin" do
             field "status", "Status"
-            field "duration_ms", "Duration"
-            field "message", "Message"
+            field "_response", "Server Response"
           end
         end
 
         label "candlepin_auth" do
           from "candlepin_auth" do
             field "status", "Status"
-            field "duration_ms", "Duration"
-            field "message", "Message"
+            field "_response", "Server Response"
           end
         end
 
         label "pulp" do
           from "pulp" do
             field "status", "Status"
-            field "duration_ms", "Duration"
-            field "message", "Message"
+            field "_response", "Server Response"
           end
         end
 
         label "pulp_auth" do
           from "pulp_auth" do
             field "status", "Status"
-            field "duration_ms", "Duration"
-            field "message", "Message"
+            field "_response", "Server Response"
           end
         end
 
         label "elasticsearch" do
           from "elasticsearch" do
             field "status", "Status"
-            field "duration_ms", "Duration"
-            field "message", "Message"
+            field "_response", "Server Response"
           end
         end
 
         label "katello_jobs" do
           from "katello_jobs" do
             field "status", "Status"
-            field "duration_ms", "Duration"
-            field "message", "Message"
+            field "_response", "Server Response"
           end
         end
 
       end # from "services"
     end # output do
 
+    def execute
+      d = retrieve_data
+      if HammerCLI::Settings.get(:log_api_calls)
+        logger.debug "Retrieved data: " + d.ai(:raw => true)
+      end
+      print_data d
+      d['status'] != "FAIL" ? HammerCLI::EX_OK : 1
+    end
+
+    def retrieve_data
+      super.tap do |data|
+        data['services'].each do |name, service|
+          service['_response'] = get_server_response(service)
+        end
+      end
+    end
+
+    private
+
+    def get_server_response(service_hash)
+      if service_hash['duration_ms']
+        "Duration: #{service_hash['duration_ms']}ms"
+      else
+        "Message: #{service_hash['message']}"
+      end
+    end
+
   end # class PingCommand
 
   HammerCLI::MainCommand.subcommand("ping", "get the status of the server",

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.0.2')
+    @version ||= Gem::Version.new('0.0.3')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -173,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hammer_cli_katello.rb
+- lib/hammer_cli_katello/gpg_key.rb
 - lib/hammer_cli_katello/lifecycle_environment.rb
 - lib/hammer_cli_katello/organization.rb
 - lib/hammer_cli_katello/ping.rb
@@ -203,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer