knife-rhn 0.1.0 → 0.2.0

data/lib/chef/knife/rhn_systemgroup_outdated.rb

@@ -3,35 +3,37 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemgroupOutdated < Knife
 
-  class RhnSystemgroupOutdated < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup outdated GROUP (options)"
-    category "rhn"
+      banner "knife rhn systemgroup outdated GROUP (options)"
+      category "rhn"
 
-    get_common_options
+      def run
+        $stdout.sync = true
+        
+        group = name_args.first
 
-    def run
-      
-      group = name_args.first
+        if group.nil?
+          ui.fatal "You need a systemgroup name!"
+          show_usage
+          exit 1
+        end
 
-      if group.nil?
-        ui.fatal "You need a systemgroup name!"
-        show_usage
-        exit 1
-      end
-
-      set_rhn_connection_options
+        set_rhn_connection_options
 
-      systems = RhnSatellite::Systemgroup.systems(group)
-      systems.sort! {|a,b| a['profile_name'] <=> b['profile_name']}
-      systems.each do |system|
-        ui.info "#{system['id']},#{system['profile_name']}" unless RhnSatellite::System.uptodate?(system['id'])
+        systems = RhnSatellite::Systemgroup.systems(group)
+        systems.sort! {|a,b| a['profile_name'] <=> b['profile_name']}
+        systems.each do |system|
+          ui.info "#{system['id']},#{system['profile_name']}" unless RhnSatellite::System.uptodate?(system['id'])
+        end
       end
-    end
 
+    end
   end
 end

data/lib/chef/knife/rhn_systemgroup_remove.rb

@@ -3,41 +3,43 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemgroupRemove < Knife
 
-  class RhnSystemgroupRemove < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup remove GROUP SYSTEM (options)"
-    category "rhn"
+      banner "knife rhn systemgroup remove GROUP SYSTEM (options)"
+      category "rhn"
 
-    get_common_options
+      def run
+        $stdout.sync = true
+        
+        group = name_args.first
 
-    def run
-      
-      group = name_args.first
+        if group.nil?
+          ui.fatal "You need a systemgroup name!"
+          show_usage
+          exit 1
+        end
 
-      if group.nil?
-        ui.fatal "You need a systemgroup name!"
-        show_usage
-        exit 1
-      end
+        system = name_args[1]
 
-      system = name_args[1]
+        if system.nil?
+          ui.fatal "You need a system name!"
+          show_usage
+          exit 1
+        end
 
-      if system.nil?
-        ui.fatal "You need a system name!"
-        show_usage
-        exit 1
-      end
+        set_rhn_connection_options
 
-      set_rhn_connection_options
+        satellite_system = get_satellite_system(system)
+        RhnSatellite::Systemgroup.remove_systems(group,[satellite_system['id']])
+        ui.info "Removed #{system} (ID: #{satellite_system['id']}) from RHN systemgroup: #{group}"
+      end
 
-      satellite_system = get_satellite_system(system)
-      RhnSatellite::Systemgroup.remove_systems(group,[satellite_system['id']])
-      ui.info "Removed #{system} (ID: #{satellite_system['id']}) from RHN systemgroup: #{group}"
     end
-
   end
 end

data/lib/chef/knife/rhn_systemgroup_systems.rb

@@ -3,35 +3,37 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemgroupSystems < Knife
 
-  class RhnSystemgroupSystems < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup systems GROUP (options)"
-    category "rhn"
+      banner "knife rhn systemgroup systems GROUP (options)"
+      category "rhn"
 
-    get_common_options
+      def run
+        $stdout.sync = true
+        
+        group = name_args.first
 
-    def run
-      
-      group = name_args.first
+        if group.nil?
+          ui.fatal "You need a systemgroup name!"
+          show_usage
+          exit 1
+        end
 
-      if group.nil?
-        ui.fatal "You need a systemgroup name!"
-        show_usage
-        exit 1
-      end
-
-      set_rhn_connection_options
+        set_rhn_connection_options
 
-      systems = RhnSatellite::Systemgroup.systems(group)
-      systems.sort! {|a,b| a['profile_name'] <=> b['profile_name']}
-      systems.each do |system|
-        ui.info "#{system['id']},#{system['profile_name']}"
+        systems = RhnSatellite::Systemgroup.systems(group)
+        systems.sort! {|a,b| a['profile_name'] <=> b['profile_name']}
+        systems.each do |system|
+          ui.info "#{system['id']},#{system['profile_name']}"
+        end
       end
-    end
 
+    end
   end
 end

data/lib/knife-rhn/version.rb

@@ -1,5 +1,6 @@
 module Knife
   module Rhn
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
+    MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,52 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-rhn
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Brian Flad
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rhn_satellite
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A knife plugin for managing RHN.
-email: 
+email:
 - bflad@wharton.upenn.edu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
 - Rakefile
 - knife-rhn.gemspec
-- lib/chef/knife/BaseRHNCommand.rb
+- lib/chef/knife/rhn_base.rb
 - lib/chef/knife/rhn_system_delete.rb
 - lib/chef/knife/rhn_system_details.rb
 - lib/chef/knife/rhn_system_move.rb
@@ -63,36 +56,26 @@ files:
 - lib/knife-rhn/version.rb
 homepage: https://github.com/bflad/knife-rhn
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ""
+summary: ''
 test_files: []
-

data/lib/chef/knife/BaseRHNCommand.rb

@@ -1,93 +0,0 @@
-#
-# Author:: Brian Flad (<bflad417@gmail.com>)
-# License:: Apache License, Version 2.0
-#
-
-module RhnKnifePlugin
-
-  require 'chef/knife'
-  require 'rhn_satellite'
-  
-  class BaseRhnCommand < Chef::Knife
-
-    #deps do
-    #  require 'highline/import'
-    #end
-
-    def self.get_common_options
-      unless defined? $default
-        $default = Hash.new
-      end
-
-      option :rhn_debug,
-        :long => "--rhn-debug",
-        :description => "Enable debugging for RHN connection",
-        :boolean => false
-
-      option :rhn_hostname,
-        :short => "-h HOSTNAME",
-        :long => "--rhn-hostname HOSTNAME",
-        :description => "The hostname for RHN"
-
-      option :rhn_no_https,
-        :long => "--rhn-no-https",
-        :description => "Disable HTTPS for RHN connection",
-        :boolean => false
-
-      option :rhn_password,
-        :short => "-p PASSWORD",
-        :long => "--rhn-password PASSWORD",
-        :description => "The password for RHN"
-
-      option :rhn_timeout,
-        :long => "--rhn-timeout SECONDS",
-        :description => "The timeout in seconds for RHN"
-      $default[:rhn_timeout] = 30
-
-      option :rhn_username,
-        :short => "-u USERNAME",
-        :long => "--rhn-username USERNAME",
-        :description => "The username for RHN"
-    end
-
-    def get_config(key)
-      key = key.to_sym
-      rval = config[key] || Chef::Config[:knife][key] || $default[key]
-      Chef::Log.debug("value for config item #{key}: #{rval}")
-      rval
-    end
-
-    def get_satellite_system(system)
-      satellite_system = RhnSatellite::System.get(system)
-
-      if satellite_system.nil?
-        ui.fatal "Could not find system in RHN!"
-        exit 1
-      end
-
-      satellite_system
-    end
-
-    def set_rhn_connection_options
-      RhnSatellite::Connection::Handler.debug_enabled = true if get_config(:rhn_debug)
-      RhnSatellite::Connection::Handler.default_hostname = get_config(:rhn_hostname)
-      RhnSatellite::Connection::Handler.default_https = false if get_config(:rhn_no_https)
-      # See: https://github.com/duritong/ruby-rhn_satellite/issues/3
-      RhnSatellite::ActivationKey.https = false if get_config(:rhn_no_https)
-      RhnSatellite::Api.https = false if get_config(:rhn_no_https)
-      RhnSatellite::Channel.https = false if get_config(:rhn_no_https)
-      RhnSatellite::ChannelAccess.https = false if get_config(:rhn_no_https)
-      RhnSatellite::ChannelSoftware.https = false if get_config(:rhn_no_https)
-      RhnSatellite::Packages.https = false if get_config(:rhn_no_https)
-      RhnSatellite::System.https = false if get_config(:rhn_no_https)
-      RhnSatellite::Systemgroup.https = false if get_config(:rhn_no_https)
-      # End of issue 3 workaround
-      RhnSatellite::Connection::Handler.default_timeout = get_config(:rhn_timeout)
-      RhnSatellite::Connection::Handler.default_username = get_config(:rhn_username)
-      password = get_config(:rhn_password)
-      password ||= ask("RHN Password for #{get_config(:rhn_username)}: ") { |q| q.echo = "*" }
-      RhnSatellite::Connection::Handler.default_password = password
-    end
-
-  end
-end