hammer_cli_katello_bridge 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9711ad104d47a673c287e0f428217bdb7ceeb9d
-  data.tar.gz: a54156ccb83ad90dab757ce5433f1308658f9653
+  metadata.gz: 650316688484c19388f991f9a50b1514a620ae54
+  data.tar.gz: 01fbbd1b5ea17c4e0e2393ee6bed60b7f2440b04
 SHA512:
-  metadata.gz: 30a4e95a507bd30b6613763d50a2558e770e74aa4bd081a82776ca41d397d53de87e6eca3796bb8732f9e03c274ab87e2948fdb10cdb6267bd5746dd3d8a9b27
-  data.tar.gz: c2b683d4adbd6c52378383ec0e79a8b9e5ce62d1c481d2e9ee9417fd0d1f0f515702926a86ad38f7254b4e6851648b38a5dcec06226259b729ad27db4c6ff227
+  metadata.gz: d34920fae8bb22bd4b162870138a53f02dd640eaf88cdf82775d1b1c1c8eac0f873dd72fb58dc80cea9bcaff0cc1af9902097213f93b5d60feaf418b0ba29b8f
+  data.tar.gz: fc07f2082a4cad7c8f2d7b4fd9c1eb9a61b4b2d08a8237a3d805e5b023921940ef5173b39172a360b2efa1d28730ae864c2e79381f60685a9fa63096860268ac

data/lib/hammer_cli_katello_bridge.rb

@@ -1,5 +1,4 @@
 require 'hammer_cli'
-require 'pry'
 require 'json'
 require 'logging'
 
@@ -34,8 +33,8 @@ module HammerCLIKatelloBridge
     def katello args
       cml = args.join(' ')
 
-      username = context[:username]
-      password = context[:password]
+      username = context[:username] || ENV['KATELLO_USERNAME'] || HammerCLI::Settings.get(:katello_bridge, :username)
+      password = context[:password] || ENV['KATELLO_PASSWORD'] || HammerCLI::Settings.get(:katello_bridge, :password)
 
       username_param = username ? "-u #{username}" : ''
       password_param = password ? "-p #{password}" : ''
@@ -80,7 +79,7 @@ module HammerCLIKatelloBridge
 
 
 
-  json_file = HammerCLI::Settings[:katello_cli_description]
+  json_file = HammerCLI::Settings.get(:katello_bridge, :cli_description)
   raise "Path to katello CLI description is not set or file does not exist" unless (json_file && File.exist?(json_file))
   self.load_commands(File.read(json_file)).each do |command|
     HammerCLI::MainCommand.subcommand!(command[:name], command[:desc], command[:cls])

data/lib/hammer_cli_katello_bridge/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatelloBridge
   def self.version
-    @version ||= Gem::Version.new '0.0.3'
+    @version ||= Gem::Version.new '0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello_bridge
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Martin Bačovský
 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: json
@@ -38,8 +38,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "Katello commands for Hammer CLI. This plugin use Katello CLI to run
-  the commands. \n"
+description: |
+  Katello commands for Hammer CLI. This plugin use Katello CLI to run the commands.
 email: mbacovsk@redhat.com
 executables: []
 extensions: []
@@ -71,3 +71,4 @@ signing_key:
 specification_version: 4
 summary: Katello commands for hammer-cli
 test_files: []
+has_rdoc: