cobbler 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: 24e1e5cfa835de1c54d3c9e0706cf21dc0506ec7f8ac2bc9beced12a68ea498b8fb28ee4f97e512d61edb622318ee5ff9e52a02b5b79e868226674b6a457fe7a
-  metadata.gz: 8565605df4e39ae5aa7e069a029e420e41b5edb1a5436dfc917a91bede2aacb4949a63acf8549ff87bf0724983ae202845e44be3a778a98563d91bddc59a8e9c
+  data.tar.gz: 63a2bf4f191921f4edc3ff20e7198f0b450de120e8a89cb7eb5f567b09d538c9a4cf059c17c64207ff16cbcab7600afb36856511434be7654e3428b59b8b10e7
+  metadata.gz: 48a3a3a1fe972ba74771ec51536896e6c383138c7a4528855edebbc41a78e1a1d9f390f7fce7f2874ceb37ee4a5bd3a51e065013c6deff21f33f8224cb397abb
 SHA1: 
-  data.tar.gz: 553b175cc8cc5d21003843e58d1b1a4984302771
-  metadata.gz: 264878c6be7a05856884705c746bf937de70a236
+  data.tar.gz: 1aa8159cf3d1ab92aa934c97384476f8d58395ed
+  metadata.gz: 5ab6018172c562e17fa1240e488d33a765e56251

data/Gemfile

@@ -6,10 +6,12 @@ source "http://rubygems.org"
 if RUBY_VERSION < "1.9"
   gem 'activesupport', '~> 3.1.12'
   gem 'nokogiri', '~> 1.5.0'
+  gem 'highline', '~> 1.6.21'
+  gem 'i18n', '~> 0.6.11'
 else
   gem 'activesupport'
+  gem 'i18n'
 end
-gem 'i18n'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Rakefile

@@ -37,7 +37,7 @@ require 'cobbler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docgem.rubygems.org/read/chapter/20 for more options
   gem.name = 'cobbler'
-  gem.version = "2.0.2"
+  gem.version = "2.0.3"
   gem.author = 'duritong'
   gem.email = 'peter.meier@immerda.ch'
   gem.homepage = 'http://github.com/duritong/ruby-cobbler/'
@@ -66,7 +66,7 @@ task :default => :spec
 gem 'rdoc'
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|
-  version = '2.0.2'
+  version = '2.0.3'
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "cobbler #{version}"
   rdoc.rdoc_files.include('README*')

data/cobbler.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cobbler 2.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cobbler"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   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-27"
+  s.date = "2015-06-05"
   s.description = "  Provides Ruby bindings to interact with a Cobbler server.\n"
   s.email = "peter.meier@immerda.ch"
   s.extra_rdoc_files = [
@@ -59,7 +57,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/duritong/ruby-cobbler/"
   s.licenses = ["GPLv2"]
-  s.rubygems_version = "2.3.0"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.15"
   s.summary = "An interface for interacting with a Cobbler server."
 
   if s.respond_to? :specification_version then
@@ -68,7 +67,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.12"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<highline>, ["~> 1.6.21"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.6.11"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_development_dependency(%q<mocha>, ["~> 0.10.0"])
@@ -78,7 +78,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>, ["~> 3.1.12"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<highline>, ["~> 1.6.21"])
+      s.add_dependency(%q<i18n>, ["~> 0.6.11"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_dependency(%q<mocha>, ["~> 0.10.0"])
@@ -89,7 +90,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, ["~> 3.1.12"])
     s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<highline>, ["~> 1.6.21"])
+    s.add_dependency(%q<i18n>, ["~> 0.6.11"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.8"])
     s.add_dependency(%q<mocha>, ["~> 0.10.0"])

data/config/cobbler.yml

@@ -3,3 +3,5 @@
 hostname: localhost
 username: cobbler
 password: cobbler
+secure: false
+timeout: 30

data/lib/cobbler.rb

@@ -30,6 +30,6 @@ require 'cobbler/system'
 
 module Cobbler
 
-  VERSION = '2.0.0'
+  VERSION = '2.0.3'
 
 end

data/lib/cobbler/connection/handling.rb

@@ -37,7 +37,7 @@ module Cobbler
                 
                 # Set hostname, username, password for the Cobbler server, overriding any settings
                 # from cobbler.yml.
-                mattr_accessor :hostname, :username, :password
+                mattr_accessor :hostname, :username, :password, :secure, :verify_ssl, :timeout
                 
                 # Returns the version for the remote cobbler instance.
                 def remote_version
@@ -81,12 +81,15 @@ module Cobbler
                 protected
                 # Returns a connection to the Cobbler server.
                 def connect
-                    debug("Connecting to http://#{hostname}/cobbler_api")
-                    @connection = XMLRPC::Client.new2("http://#{hostname}/cobbler_api").tap do |client|
+                    debug("Connecting to #{protocol}://#{hostname}/cobbler_api")
+                    @connection = XMLRPC::Client.new2("#{protocol}://#{hostname}/cobbler_api",nil,timeout).tap do |client|
                         client.http_header_extra = { 'Accept-Encoding' => 'identity' } if client.respond_to?(:http_header_extra=)
+                        if secure && no_verify_ssl
+                            client.instance_variable_get(:@http).instance_variable_set(:@verify_mode, OpenSSL::SSL::VERIFY_NONE)
+                        end
                     end
                 end
-                
+
                 private                
                 # Establishes a connection with the Cobbler system.
                 def begin_transaction
@@ -105,6 +108,18 @@ module Cobbler
                     properties && !properties.empty? && properties != '~'
                 end
 
+                def protocol
+                    secure ? "https" : "http"
+                end
+
+                def no_verify_ssl
+                    if verify_ssl == false
+                        true
+                    else
+                        false
+                    end
+                end
+
             end
         end
     end

data/lib/cobbler/system.rb

@@ -25,7 +25,7 @@
 module Cobbler
     class System < Base
         cobbler_fields :name, :profile, :image, :kickstart, :netboot_enabled, :server, :virt_cpus,
-        :virt_file_size, :virt_path, :virt_ram, :virt_auto_boot, :virt_type, :gateway, :hostname
+        :virt_file_size, :virt_path, :virt_ram, :virt_auto_boot, :virt_type, :gateway, :hostname, :timeout
 
         cobbler_collection :kernel_options, :packing => :hash
         cobbler_collection :ks_meta, :packing => :hash, :store => :store_ksmeta

data/spec/spec_helper.rb

@@ -12,7 +12,8 @@ end
 def with_real_cobbler(calzz,&blk)
     unless ENV['NO_REAL_COBBLER'] == '1'
         config = (ENV['COBBLER_YML'] || File.expand_path(File.join(File.dirname(__FILE__),'..','config','cobbler.yml')))
-        if File.exist?(config) && (yml = YAML::load(File.open(config))) && (yml['hostname'] && yml['username'] && yml['password'])
+        if File.exist?(config) && (yml = YAML::load(File.open(config))) && (yml['hostname'] && yml['username'] && \
+          yml['password'] && yml['secure'])
             yield(yml)
         else
             puts "No cobbler data found."

data/spec/unit/cobbler/connection/common_spec.rb

@@ -40,6 +40,7 @@ describe Cobbler::Connection::Common do
                 TestConnection.hostname = yml['hostname']
                 TestConnection.username = yml['username']
                 TestConnection.password = yml['password']
+                TestConnection.timeout = yml['timeout']
             end
             
             it "should "

data/spec/unit/cobbler/connection/handling_spec.rb

@@ -7,7 +7,7 @@ class TestConnection
 end
 
 describe Cobbler::Connection::Handling do
-    [:hostname, :username, :password].each do |field|
+    [:hostname, :username, :password, :timeout].each do |field|
         it "should provide getters and setters for #{field}" do
             TestConnection.should respond_to(field)
             TestConnection.should respond_to("#{field}=".to_sym)
@@ -60,7 +60,7 @@ describe Cobbler::Connection::Handling do
     it "should connect to the cobbler server" do
         TestConnection.hostname = 'localhost'
         @connection = Object.new
-        XMLRPC::Client.expects(:new2).with('http://localhost/cobbler_api').returns(@connection)
+        XMLRPC::Client.expects(:new2).with('http://localhost/cobbler_api',nil,nil).returns(@connection)
         TestConnection.send(:connect)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cobbler
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - duritong
@@ -9,93 +9,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-27 00:00:00 Z
+date: 2015-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 3.1.12
-  requirement: *id001
-  name: activesupport
-  type: :runtime
+  version_requirements: *id001
   prerelease: false
+  type: :runtime
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.5.0
-  requirement: *id002
-  name: nokogiri
-  type: :runtime
+  version_requirements: *id002
   prerelease: false
+  type: :runtime
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - &id007 
-      - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-  requirement: *id003
-  name: i18n
+        version: 1.6.21
+  version_requirements: *id003
+  prerelease: false
   type: :runtime
+  name: highline
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.11
+  version_requirements: *id004
   prerelease: false
+  type: :runtime
+  name: i18n
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.5.0
-  requirement: *id004
-  name: rspec
-  type: :development
+  version_requirements: *id005
   prerelease: false
+  type: :development
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "3.8"
-  requirement: *id005
-  name: rdoc
-  type: :development
+  version_requirements: *id006
   prerelease: false
+  type: :development
+  name: rdoc
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.10.0
-  requirement: *id006
-  name: mocha
-  type: :development
+  version_requirements: *id007
   prerelease: false
+  type: :development
+  name: mocha
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
-  requirement: *id008
-  name: bundler
-  type: :development
+    - &id009 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version_requirements: *id008
   prerelease: false
+  type: :development
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
-  requirement: *id009
-  name: jeweler
-  type: :development
+    - *id009
+  version_requirements: *id010
   prerelease: false
+  type: :development
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
-    - *id007
-  requirement: *id010
-  name: simplecov
-  type: :development
+    - *id009
+  version_requirements: *id011
   prerelease: false
+  type: :development
+  name: simplecov
 description: "  Provides Ruby bindings to interact with a Cobbler server.\n"
 email: peter.meier@immerda.ch
 executables: []
@@ -155,14 +167,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id007
+  - *id009
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id007
+  - *id009
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
 summary: An interface for interacting with a Cobbler server.