rhn_satellite 0.0.5 → 0.0.6

data/Gemfile

@@ -11,4 +11,5 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem "mocha", "~> 0.9.10"
+  gem "pry"
 end

data/Gemfile.lock

@@ -1,13 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.0.6)
     diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    method_source (0.7.1)
     mocha (0.9.12)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (< 3, >= 2.4.4)
     rake (0.9.2)
     rcov (0.9.10)
     rspec (2.3.0)
@@ -18,6 +24,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    slop (2.4.4)
 
 PLATFORMS
   ruby
@@ -26,5 +33,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   mocha (~> 0.9.10)
+  pry
   rcov
   rspec (~> 2.3.0)

data/README.rdoc

@@ -20,6 +20,7 @@ This file should contain the following options:
     hostname: satellite.example.com
     username: foobar
     password: foobar
+    https:    true
 
 However, you can always set later your own credentials for the whole API:
 
@@ -63,12 +64,8 @@ This will get all packages that can be upgraded for a system and will schedule t
     satellite_system = RhnSatellite::System.get('somenode.example.com')
     packages_to_update = RhnSatellite::System.latest_upgradable_packages(satellite_system['id']).inject({}) { |res,p|
       # sometimes the satellite lists some weird packages, so we check if they actually exist.
-      key = "#{p['name']}-#{p['version']}-#{p['release']}"
-      if res[key]
-        res[key] = p['to_package_id'] if RhnSatellite::Package.exists?(p['to_package_id'])
-      else
-        res[key] = p['to_package_id']
-      end
+      key = "#{p['name']}-#{p['version']}-#{p['release']}.#{p['arch']}"
+      res[key] = p['to_package_id'] if RhnSatellite::Packages.exists?(p['to_package_id'])
       res
     }.values.compact
     if packages_to_update.size > 0

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/rhn_satellite/channel_software.rb

@@ -14,6 +14,9 @@ module RhnSatellite
       def list_children(channel_label)
         base.default_call('channel.software.listChildren',channel_label)
       end
+      def list_all_packages(channel_label)
+        base.default_call('channel.software.listAllPackages',channel_label)
+      end
     end
     
   end

data/lib/rhn_satellite/connection/base.rb

@@ -2,7 +2,8 @@ module RhnSatellite
   module Connection
     class Base
       class << self
-        attr_accessor :hostname, :username, :password, :https
+        attr_accessor :hostname, :username, :password
+        attr_writer :timeout, :https
 
         attr_reader :collection_cmd
         
@@ -10,11 +11,19 @@ module RhnSatellite
           RhnSatellite::Connection::Handler.reset_instance(self.name)
         end
 
+        def timeout
+          @timeout ||= 30
+        end
+
+        def https
+          @https.nil? ? (@https=true) : @https
+        end
+
         private
         def base
-          RhnSatellite::Connection::Handler.instance_for(self.name, hostname, username, password, https)
+          RhnSatellite::Connection::Handler.instance_for(self.name, hostname, username, password, timeout, https)
         end
-        
+
         def collection(cmd)
           @collection_cmd = cmd 
           extend RhnSatellite::Common::Collection

data/lib/rhn_satellite/connection/handler.rb

@@ -5,18 +5,27 @@ module RhnSatellite
             include RhnSatellite::Common::Debug
             
             class << self
-                attr_accessor :default_hostname,:default_username, :default_password, :default_timeout
+                attr_accessor :default_hostname,:default_username, :default_password
+                attr_writer :default_timeout, :default_https
                 
-                def instance_for(identifier,hostname=nil,username=nil,password=nil,timeout=nil,https=true)
+                def instance_for(identifier,hostname=nil,username=nil,password=nil,timeout=nil,https=nil)
                     instances[identifier] ||= Handler.new(
                         hostname||default_hostname,
                         username||default_username,
                         password||default_password,
-                        timeout||default_timeout,
-                        https
+                        timeout || default_timeout,
+                        https.nil? ? default_https : https
                     )
                 end
-                
+
+                def default_timeout
+                  @default_timeout ||= 30
+                end
+
+                def default_https
+                  @default_https.nil? ? (@default_https=true) : @default_https
+                end
+
                 def reset_instance(identifier)
                     instances.delete(identifier)
                 end

data/lib/rhn_satellite.rb

@@ -22,4 +22,6 @@ if File.exists?(file=File.expand_path('~/.satellite.yaml')) || File.exists?(file
   RhnSatellite::Connection::Handler.default_hostname = global_options['hostname']
   RhnSatellite::Connection::Handler.default_username = global_options['username']
   RhnSatellite::Connection::Handler.default_password = global_options['password']
+  RhnSatellite::Connection::Handler.default_timeout = global_options['timeout']
+  RhnSatellite::Connection::Handler.default_https = global_options['https']
 end

data/rhn_satellite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rhn_satellite}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["duritong"]
-  s.date = %q{2012-03-09}
+  s.date = %q{2012-10-03}
   s.description = %q{It provides an easy way to interact with a RedHat Satellite API.}
   s.email = %q{peter.meier@immerda.ch}
   s.extra_rdoc_files = [
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/duritong/ruby-rhn_satellite}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{RhnSatellite is a ruby api to the RedHat Satellite}
 
   if s.respond_to? :specification_version then
@@ -69,12 +69,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -82,6 +84,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/spec/unit/rhn_satellite/channel_software_spec.rb

@@ -62,4 +62,25 @@ describe RhnSatellite::ChannelSoftware do
       RhnSatellite::ChannelSoftware.list_children('channel_label')
     end
   end
+  
+  describe '.list_all_packages' do
+    it "lists all packages in a software channel" do
+      RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with(
+        "channel.software.listAllPackages",
+        "token",
+        'channel_label').returns([
+          {
+          "name"                => "yum",
+          "version"             => "3.2.8",
+          "release"             => "9.el5_2.1",
+          "epoch"               => "",
+          "id"                  => 5337,
+          "arch_label"          => "noarch",
+          "last_modified_date"  => "2008-05-21 17:34:21",
+          "last_modified"       => "2008-05-21 17:34:21"
+        }])
+        
+      RhnSatellite::ChannelSoftware.list_all_packages('channel_label').first['name'].should eql('yum')
+    end
+  end
 end

data/spec/unit/rhn_satellite/connection/base_spec.rb

@@ -26,7 +26,7 @@ describe RhnSatellite::Connection::Base do
     end
   end
 
-  [:hostname,:username, :password].each do |field|
+  [ :hostname,:username, :password, :timeout, :https ].each do |field|
     describe "##{field}" do
       it "provides a way to set and read a #{field}" do
         RhnSatellite::Test.should respond_to("#{field}=")
@@ -40,5 +40,5 @@ describe RhnSatellite::Connection::Base do
       end
     end
   end
-  
+
 end  

data/spec/unit/rhn_satellite/connection/handler_spec.rb

@@ -3,13 +3,29 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe RhnSatellite::Connection::Handler do
 
-  [:hostname,:username, :password].each do |field|
+  [:hostname,:username, :password, :timeout, :https ].each do |field|
     it "provides a way to set and read a default #{field}" do
       RhnSatellite::Connection::Handler.should respond_to("default_#{field}=")
       RhnSatellite::Connection::Handler.should respond_to("default_#{field}")
     end
   end
-  
+
+  describe 'sane defaults' do
+    describe 'timeout' do
+      it "should default to 30" do
+        RhnSatellite::Test.reset
+        RhnSatellite::Test.timeout.should eql(30)
+      end
+    end
+
+    describe 'https' do
+      it "should default to true" do
+        RhnSatellite::Test.reset
+        RhnSatellite::Test.https.should be_true
+      end
+    end
+  end
+
   describe ".instance_for" do
     it "returns an instance of RhnSatellite::Connection::Handler" do
       RhnSatellite::Connection::Handler.instance_for(:foo).should be_a(RhnSatellite::Connection::Handler) 

metadata

@@ -1,80 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rhn_satellite
-version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: !!null 
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
-authors:
+authors: 
 - duritong
-autorequire: !!null 
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 +01:00
-default_executable: !!null 
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &6922660 !ruby/object:Gem::Requirement
+
+date: 2012-10-03 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :development
+  requirement: *id001
   prerelease: false
-  version_requirements: *6922660
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &6906240 !ruby/object:Gem::Requirement
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  requirement: *id002
   prerelease: false
-  version_requirements: *6906240
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &6903900 !ruby/object:Gem::Requirement
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
+  requirement: *id003
+  prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   prerelease: false
-  version_requirements: *6903900
-- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &6902060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: *6902060
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &6899400 !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
         version: 0.9.10
+  requirement: *id005
+  prerelease: false
+  name: mocha
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
   prerelease: false
-  version_requirements: *6899400
+  name: pry
 description: It provides an easy way to interact with a RedHat Satellite API.
 email: peter.meier@immerda.ch
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -113,31 +158,37 @@ files:
 - spec/unit/rhn_satellite/systemgroup_spec.rb
 has_rdoc: true
 homepage: http://github.com/duritong/ruby-rhn_satellite
-licenses:
+licenses: 
 - MIT
-post_install_message: !!null 
+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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 732024450435592684
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: !!null 
-rubygems_version: 1.5.0
-signing_key: !!null 
+
+rubyforge_project: 
+rubygems_version: 1.6.2
+signing_key: 
 specification_version: 3
 summary: RhnSatellite is a ruby api to the RedHat Satellite
 test_files: []
+