rhn_satellite 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42ab7be6ea1207a68ea1fe4e82f86bf2c830a34
-  data.tar.gz: da447112d6d5fa2fc63c2cca06ab84c89d9899d2
+  metadata.gz: d906a912553c0eabe38d8f9accfb936aaddccdc2
+  data.tar.gz: 6a70fc49449cf3c5029537679f2907daa3f456bb
 SHA512:
-  metadata.gz: d864e0de2eba9106561752ad6367fdf473ad9a436053e479eb25af00cc9949530dfc8831bfad4fd3c4053e26edaf5e06c096876147c87651775ad8e3df23721c
-  data.tar.gz: a40b8d97e97cb32a6a863fcb3dfffdb288e32a2b6a30285e9b2a04045b8b0ba4bcee287fbb26db8848b51dfdf499d6175e8d7bcf1c5fb8626f6a4588208295de
+  metadata.gz: cb45552977efc27505d2e577837b825a2329c8cd9896d0d4105785232c103ec4232e10e84ec87f092413e3c2c3f9b937ece8281fbd9ad81f71049b4e30e2a447
+  data.tar.gz: 5f70407b3d6ab4c7dc1041dbfca5fb64d535d4b81db31f2cab4f4439068bcd1c4245ffda203cc1d35de95200ae0f170a3ef9fad3540cb30af58d31e8b71dd29d

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rhn_satellite.rb

@@ -16,6 +16,7 @@ require 'rhn_satellite/schedule'
 require 'rhn_satellite/system'
 require 'rhn_satellite/systemgroup'
 require 'rhn_satellite/packages'
+require 'rhn_satellite/kickstart'
 
 if File.exists?(file=File.expand_path('~/.satellite.yaml')) || File.exists?(file='/etc/satellite.yaml')
   require 'yaml'
@@ -25,4 +26,5 @@ if File.exists?(file=File.expand_path('~/.satellite.yaml')) || File.exists?(file
   RhnSatellite::Connection::Handler.default_password = global_options['password']
   RhnSatellite::Connection::Handler.default_timeout = global_options['timeout']
   RhnSatellite::Connection::Handler.default_https = global_options['https']
+  RhnSatellite::Connection::Handler.default_https_verify = global_options['https_verify']
 end

data/lib/rhn_satellite/connection/handler.rb

@@ -5,16 +5,17 @@ module RhnSatellite
             include RhnSatellite::Common::Debug
             
             class << self
-                attr_accessor :default_hostname,:default_username, :default_password
+                attr_accessor :default_hostname,:default_username, :default_password, :default_https_verify
                 attr_writer :default_timeout, :default_https
                 
-                def instance_for(identifier,hostname=nil,username=nil,password=nil,timeout=nil,https=nil)
+                def instance_for(identifier,hostname=nil,username=nil,password=nil,timeout=nil,https=nil,https_verify=nil)
                     instances[identifier] ||= Handler.new(
                         hostname||default_hostname,
                         username||default_username,
                         password||default_password,
                         timeout || default_timeout,
-                        https.nil? ? default_https : https
+                        https.nil? ? default_https : https,
+                        https_verify.nil? ? default_https_verify : https_verify
                     )
                 end
 
@@ -26,6 +27,10 @@ module RhnSatellite
                   @default_https.nil? ? (@default_https=true) : @default_https
                 end
 
+                def default_https_verify
+                  @default_https_verify.nil? ? (@default_https_verify=true) : @default_https_verify
+                end
+
                 def reset_instance(identifier)
                     instances.delete(identifier)
                 end
@@ -44,12 +49,13 @@ module RhnSatellite
                 end
             end
             
-            def initialize(hostname,username=nil,password=nil,timeout=30,https=true)
+            def initialize(hostname,username=nil,password=nil,timeout=30,https=true,https_verify=true)
                 @hostname = hostname
                 @username = username
                 @password = password
                 @timeout = timeout
                 @https = https
+                @https_verify = https_verify
             end
             
             def login(duration=nil)
@@ -93,6 +99,10 @@ module RhnSatellite
             def connect
                 debug("Connecting to #{url}")
                 @connection = XMLRPC::Client.new2(url,nil,@timeout)
+                if !@https_verify
+                  @connection.instance_variable_get(:@http).instance_variable_set(:@verify_mode, OpenSSL::SSL::VERIFY_NONE)
+                end
+                @connection
             end
             
             def disconnect

data/lib/rhn_satellite/kickstart.rb

@@ -0,0 +1,18 @@
+module RhnSatellite
+  class Kickstart < RhnSatellite::Connection::Base
+    collection 'kickstart.listKickstarts'
+    class << self
+      def import_raw_file(profile_label, virtualization_type,
+                      kickstartable_tree_label, kickstart_file_contents)
+
+        base.default_call('kickstart.importRawFile', profile_label,
+                          virtualization_type, kickstartable_tree_label,
+                          kickstart_file_contents)
+      end
+
+      def delete(ks_label)
+        base.default_call('kickstart.deleteProfile', ks_label)
+      end
+    end
+  end
+end

data/rhn_satellite.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rhn_satellite 0.1.0 ruby lib
+# stub: rhn_satellite 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rhn_satellite"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["duritong"]
-  s.date = "2014-06-03"
+  s.date = "2015-08-28"
   s.description = "It provides an easy way to interact with a RedHat Satellite API."
   s.email = "peter.meier@immerda.ch"
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/rhn_satellite/common/misc.rb",
     "lib/rhn_satellite/connection/base.rb",
     "lib/rhn_satellite/connection/handler.rb",
+    "lib/rhn_satellite/kickstart.rb",
     "lib/rhn_satellite/packages.rb",
     "lib/rhn_satellite/schedule.rb",
     "lib/rhn_satellite/system.rb",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
     "spec/unit/rhn_satellite/common/misc_spec.rb",
     "spec/unit/rhn_satellite/connection/base_spec.rb",
     "spec/unit/rhn_satellite/connection/handler_spec.rb",
+    "spec/unit/rhn_satellite/kickstart_spec.rb",
     "spec/unit/rhn_satellite/packages_spec.rb",
     "spec/unit/rhn_satellite/schedule_spec.rb",
     "spec/unit/rhn_satellite/system_spec.rb",
@@ -61,7 +63,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/duritong/ruby-rhn_satellite"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.3.0"
   s.summary = "RhnSatellite is a ruby api to the RedHat Satellite"
 
   if s.respond_to? :specification_version then

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

@@ -25,6 +25,12 @@ describe RhnSatellite::Connection::Handler do
         RhnSatellite::Connection::Handler.default_https.should be_true
       end
     end
+
+    describe 'https_verify' do
+      it "should default to true" do
+        RhnSatellite::Connection::Handler.default_https_verify.should be_true
+      end
+    end
   end
 
   describe ".instance_for" do
@@ -78,6 +84,14 @@ describe RhnSatellite::Connection::Handler do
     it "takes passed https setting" do
       RhnSatellite::Connection::Handler.instance_for(:default_https2,'bla','user2','secret2',30,false).instance_variable_get('@https').should eql(false)
     end
+
+    it "defaults https_verify to true" do
+      RhnSatellite::Connection::Handler.instance_for(:default_https_verify,'bla','user','secret2').instance_variable_get('@https_verify').should eql(true)
+    end
+
+    it "takes passed https_verify setting" do
+      RhnSatellite::Connection::Handler.instance_for(:default_https_verify2,'bla','user2','secret2',30,false,false).instance_variable_get('@https_verify').should eql(false)
+    end
   end
   
   describe ".reset" do
@@ -111,6 +125,7 @@ describe RhnSatellite::Connection::Handler do
 
   context "connecting" do
     before :each do
+      RhnSatellite::Connection::Handler.reset_instance(:connect)
       RhnSatellite::Connection::Handler.default_hostname = 'connecttest'
     end
   describe "#connect" do
@@ -120,6 +135,21 @@ describe RhnSatellite::Connection::Handler do
       a = RhnSatellite::Connection::Handler.instance_for(:connect)
       a.connect
     end
+    context 'when ssl_verify is true' do
+      it "uses ssl verification" do
+        RhnSatellite::Connection::Handler.default_https_verify = true
+        a = RhnSatellite::Connection::Handler.instance_for(:connect)
+        a.connect.instance_variable_get(:@http).instance_variable_get(:@verify_mode).should_not eq OpenSSL::SSL::VERIFY_NONE
+      end
+    end
+
+    context 'when ssl_verify is false' do
+      it "disables ssl verification" do
+        RhnSatellite::Connection::Handler.default_https_verify = false
+        a = RhnSatellite::Connection::Handler.instance_for(:connect)
+        a.connect.instance_variable_get(:@http).instance_variable_get(:@verify_mode).should eq OpenSSL::SSL::VERIFY_NONE
+      end
+    end
   end
   
   describe "#disconnect" do

data/spec/unit/rhn_satellite/kickstart_spec.rb

@@ -0,0 +1,93 @@
+#! /usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RhnSatellite::Kickstart do
+  context "standard invocation" do
+    before(:each) do
+      #RhnSatellite::Systemgroup.reset
+      conn = Object.new
+      conn.stubs(:call)
+
+      XMLRPC::Client.stubs(:new2).returns(conn)
+
+      RhnSatellite::Kickstart.username = 'user'
+      RhnSatellite::Kickstart.password = 'pwd'
+      RhnSatellite::Connection::Handler.any_instance.stubs(:make_call).with("auth.login",'user','pwd').returns("token")
+      RhnSatellite::Connection::Handler.any_instance.stubs(:make_call).with("auth.logout",'token')
+    end
+
+    describe ".all" do
+      it "logins and returns a bunch of systems" do
+        RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.listKickstarts',"token").returns(["123","234"])
+
+        RhnSatellite::Kickstart.all.should eql(["123","234"])
+      end
+
+      it "returns an empty array on an empty answer" do
+        RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.listKickstarts',"token").returns(nil)
+
+        RhnSatellite::Kickstart.all.should eql([])
+      end
+
+      it "iterates the items over the block" do
+        RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.listKickstarts',"token").returns(["123","234"])
+        RhnSatellite::Kickstart.all{|i| ["123","234"].include?(i).should be_true }.should eql(["123","234"])
+      end
+    end
+
+    describe ".get" do
+      context "with kickstarts" do
+        before :each do
+          RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.listKickstarts',"token").returns([{'name' => "123"},{'name' => "234"}])
+        end
+        it "finds a kickstart in all kickstarts" do
+          RhnSatellite::Kickstart.get('123').should eql({'name' => '123'})
+        end
+
+        it "returns nil on an non-existant kickstart" do
+          RhnSatellite::Kickstart.get('12333').should eql(nil)
+        end
+      end
+      context "without any kickstarts" do
+        before :each do
+          RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.listKickstarts',"token").returns([])
+        end
+        it "returns nil" do
+          RhnSatellite::Kickstart.get('12333').should eql(nil)
+        end
+      end
+    end
+
+    describe ".import_raw_file" do
+
+      it "imports kickstart file contents" do
+        RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with(
+          "kickstart.importRawFile",
+          "token",
+          'some_label',
+          'none',
+          'tree_label',
+          'ks_content'
+        ).returns("1")
+
+        RhnSatellite::Kickstart.import_raw_file('some_label', 'none', 'tree_label', 'ks_content')
+      end
+    end
+
+    describe ".delete" do
+      it "logs in and should delete a kickstart label" do
+        RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.deleteProfile','token', 'some_label').returns(1)
+
+        RhnSatellite::Kickstart.delete('some_label').should eql(1)
+      end
+
+      it "returns nothing on an inexistant kickstart label" do
+        RhnSatellite::Connection::Handler.any_instance.expects(:make_call).with('kickstart.deleteProfile','token', 'some_missing_label').returns(nil)
+
+        RhnSatellite::Kickstart.delete('some_missing_label').should eql(nil)
+      end
+    end
+
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhn_satellite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - duritong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -121,6 +121,7 @@ files:
 - lib/rhn_satellite/common/misc.rb
 - lib/rhn_satellite/connection/base.rb
 - lib/rhn_satellite/connection/handler.rb
+- lib/rhn_satellite/kickstart.rb
 - lib/rhn_satellite/packages.rb
 - lib/rhn_satellite/schedule.rb
 - lib/rhn_satellite/system.rb
@@ -137,6 +138,7 @@ files:
 - spec/unit/rhn_satellite/common/misc_spec.rb
 - spec/unit/rhn_satellite/connection/base_spec.rb
 - spec/unit/rhn_satellite/connection/handler_spec.rb
+- spec/unit/rhn_satellite/kickstart_spec.rb
 - spec/unit/rhn_satellite/packages_spec.rb
 - spec/unit/rhn_satellite/schedule_spec.rb
 - spec/unit/rhn_satellite/system_spec.rb
@@ -161,8 +163,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: RhnSatellite is a ruby api to the RedHat Satellite
 test_files: []
+has_rdoc: