knife-rhn 0.1.0 → 0.2.0

data/lib/chef/knife/rhn_system_systemgroups.rb

@@ -3,36 +3,38 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemSystemgroups < Knife
 
-  class RhnSystemSystemgroups < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn system systemgroups SYSTEM (options)"
-    category "rhn"
+      banner "knife rhn system systemgroups SYSTEM (options)"
+      category "rhn"
 
-    get_common_options
+      def run
+        $stdout.sync = true
+        
+        system = name_args.first
 
-    def run
-      
-      system = name_args.first
+        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)
-      system_groups = RhnSatellite::Systemgroup.all
-      system_groups.sort! {|a,b| a['name'] <=> b['name']}
-      system_groups.each do |system_group|
-        ui.info "#{system_group['name']}" if RhnSatellite::Systemgroup.systems(system_group['name']).find{|s| s['id'] == satellite_system['id']}
+        satellite_system = get_satellite_system(system)
+        system_groups = RhnSatellite::Systemgroup.all
+        system_groups.sort! {|a,b| a['name'] <=> b['name']}
+        system_groups.each do |system_group|
+          ui.info "#{system_group['name']}" if RhnSatellite::Systemgroup.systems(system_group['name']).find{|s| s['id'] == satellite_system['id']}
+        end
       end
-    end
 
+    end
   end
 end

data/lib/chef/knife/rhn_systemgroup_active.rb

@@ -3,47 +3,50 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemgroupActive < Knife
 
-  # Until merged: https://github.com/duritong/ruby-rhn_satellite/pull/7
-  module Systemgroup
-    def active_systems(group_name)
-      base.default_call('systemgroup.listActiveSystemsInGroup',group_name)
-    end
-  end
-
-  class RhnSystemgroupActive < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup active GROUP (options)"
-    category "rhn"
+      banner "knife rhn systemgroup active GROUP (options)"
+      category "rhn"
 
-    get_common_options
-
-    def run
-      
-      group = name_args.first
 
-      if group.nil?
-        ui.fatal "You need a systemgroup name!"
-        show_usage
-        exit 1
+      # Until released: https://github.com/duritong/ruby-rhn_satellite/pull/7
+      module Systemgroup
+        def active_systems(group_name)
+          base.default_call('systemgroup.listActiveSystemsInGroup',group_name)
+        end
       end
 
-      set_rhn_connection_options
-
-      RhnSatellite::Systemgroup.extend(Systemgroup)
-      system_ids = RhnSatellite::Systemgroup.active_systems(group)
-      systems = []
-      system_ids.each do |system_id|
-        systems << RhnSatellite::System.details(system_id)
-      end
-      systems.sort! {|a,b| a['profile_name'] <=> b['profile_name']}
-      systems.each do |system|
-        ui.info "#{system['id']},#{system['profile_name']}"
+      def run
+        $stdout.sync = true
+        
+        group = name_args.first
+
+        if group.nil?
+          ui.fatal "You need a systemgroup name!"
+          show_usage
+          exit 1
+        end
+
+        set_rhn_connection_options
+
+        RhnSatellite::Systemgroup.extend(Systemgroup)
+        system_ids = RhnSatellite::Systemgroup.active_systems(group)
+        systems = []
+        system_ids.each do |system_id|
+          systems << RhnSatellite::System.details(system_id)
+        end
+        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

data/lib/chef/knife/rhn_systemgroup_add.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 RhnSystemgroupAdd < Knife
 
-  class RhnSystemgroupAdd < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup add GROUP SYSTEM (options)"
-    category "rhn"
+      banner "knife rhn systemgroup add 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.add_systems(group,[satellite_system['id']])
+        ui.info "Added #{system} (ID: #{satellite_system['id']}) to RHN systemgroup: #{group}"
+      end
 
-      satellite_system = get_satellite_system(system)
-      RhnSatellite::Systemgroup.add_systems(group,[satellite_system['id']])
-      ui.info "Added #{system} (ID: #{satellite_system['id']}) to RHN systemgroup: #{group}"
     end
-
   end
 end

data/lib/chef/knife/rhn_systemgroup_create.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 RhnSystemgroupCreate < Knife
 
-  class RhnSystemgroupCreate < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup create GROUP DESCRIPTION (options)"
-    category "rhn"
+      banner "knife rhn systemgroup create GROUP DESCRIPTION (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
+        description = name_args[1]
+        description ||= group
 
-      description = name_args[1]
-      description ||= group
+        set_rhn_connection_options
 
-      set_rhn_connection_options
+        RhnSatellite::Systemgroup.create(group,description)
+        ui.info "Created RHN Systemgroup: #{group}"
+      end
 
-      RhnSatellite::Systemgroup.create(group,description)
-      ui.info "Created RHN Systemgroup: #{group}"
     end
-
   end
 end

data/lib/chef/knife/rhn_systemgroup_delete.rb

@@ -3,32 +3,34 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemgroupDelete < Knife
 
-  class RhnSystemgroupDelete < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn systemgroup delete GROUP (options)"
-    category "rhn"
+      banner "knife rhn systemgroup delete 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
+        RhnSatellite::Systemgroup.delete(group)
+        ui.info "Deleted RHN Systemgroup: #{group}"
+      end
 
-      RhnSatellite::Systemgroup.delete(group)
-      ui.info "Deleted RHN Systemgroup: #{group}"
     end
-
   end
 end

data/lib/chef/knife/rhn_systemgroup_inactive.rb

@@ -3,55 +3,57 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
-
-  require 'chef/knife'
-
-  # Until merged: https://github.com/duritong/ruby-rhn_satellite/pull/7
-  module Systemgroup
-    def inactive_systems(group_name,days=nil)
-      if days
-        base.default_call('systemgroup.listInactiveSystemsInGroup',group_name,days.to_i)
-      else
-        base.default_call('systemgroup.listInactiveSystemsInGroup',group_name)
+require 'chef/knife/rhn_base'
+
+class Chef
+  class Knife
+    class RhnSystemgroupInactive < Knife
+
+      include Knife::RhnBase
+
+      banner "knife rhn systemgroup inactive GROUP (options)"
+      category "rhn"
+
+      option :days,
+        :long => "--days DAYS",
+        :description => "The number of inactive days"
+
+      # Until released: https://github.com/duritong/ruby-rhn_satellite/pull/7
+      module Systemgroup
+        def inactive_systems(group_name,days=nil)
+          if days
+            base.default_call('systemgroup.listInactiveSystemsInGroup',group_name,days.to_i)
+          else
+            base.default_call('systemgroup.listInactiveSystemsInGroup',group_name)
+          end
+        end
       end
-    end
-  end
-
-  class RhnSystemgroupInactive < BaseRhnCommand
-
-    banner "knife rhn systemgroup inactive GROUP (options)"
-    category "rhn"
-
-    get_common_options
 
-    option :days,
-      :long => "--days DAYS",
-      :description => "The number of inactive days"
-
-    def run
-      
-      group = name_args.first
-
-      if group.nil?
-        ui.fatal "You need a systemgroup name!"
-        show_usage
-        exit 1
+      def run
+        $stdout.sync = true
+        
+        group = name_args.first
+
+        if group.nil?
+          ui.fatal "You need a systemgroup name!"
+          show_usage
+          exit 1
+        end
+
+        set_rhn_connection_options
+
+        RhnSatellite::Systemgroup.extend(Systemgroup)
+        system_ids = RhnSatellite::Systemgroup.inactive_systems(group,get_config(:days))
+        systems = []
+        system_ids.each do |system_id|
+          systems << RhnSatellite::System.details(system_id)
+        end
+        systems.sort! {|a,b| a['profile_name'] <=> b['profile_name']}
+        systems.each do |system|
+          ui.info "#{system['id']},#{system['profile_name']}"
+        end
       end
 
-      set_rhn_connection_options
-
-      RhnSatellite::Systemgroup.extend(Systemgroup)
-      system_ids = RhnSatellite::Systemgroup.inactive_systems(group,get_config(:days))
-      systems = []
-      system_ids.each do |system_id|
-        systems << RhnSatellite::System.details(system_id)
-      end
-      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

data/lib/chef/knife/rhn_systemgroup_list.rb

@@ -3,27 +3,29 @@
 # License:: Apache License, Version 2.0
 #
 
-module RhnKnifePlugin
+require 'chef/knife/rhn_base'
 
-  require 'chef/knife'
+class Chef
+  class Knife
+    class RhnSystemgroupList < Knife
 
-  class RhnSystemgroupList < BaseRhnCommand
+      include Knife::RhnBase
 
-    banner "knife rhn ystemgroup list (options)"
-    category "rhn"
+      banner "knife rhn ystemgroup list (options)"
+      category "rhn"
 
-    get_common_options
+      def run
+        $stdout.sync = true
 
-    def run
+        set_rhn_connection_options
 
-      set_rhn_connection_options
-
-      system_groups = RhnSatellite::Systemgroup.all
-      system_groups.sort! {|a,b| a['name'] <=> b['name']}
-      system_groups.each do |system_group|
-        ui.info "#{system_group['name']}"
+        system_groups = RhnSatellite::Systemgroup.all
+        system_groups.sort! {|a,b| a['name'] <=> b['name']}
+        system_groups.each do |system_group|
+          ui.info "#{system_group['name']}"
+        end
       end
-    end
 
+    end
   end
 end