cobbler 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 38385289fb0c297085950841ed566e8b2c41672f
-  data.tar.gz: 0ae7db566f03eb5cf10f94f860ec18d1cf4e2a1f
-SHA512:
-  metadata.gz: 8c1e20ca8074d92908ea39897f31155adc78ba07897a1c21f656cf8d11ffcf732ad6f15ecebb730e3404555728451434740fa13eaef714eef04d7cf803920463
-  data.tar.gz: b2db7d96e9c1e40a37f69a4f77038c5819d85d82d5af9659b5f7f0979f0b6f884829792a1e4cfe88f42d930419ed9e211565ef277cc4d5b4a267ac7abba245ad
+--- 
+SHA512: 
+  data.tar.gz: 24e1e5cfa835de1c54d3c9e0706cf21dc0506ec7f8ac2bc9beced12a68ea498b8fb28ee4f97e512d61edb622318ee5ff9e52a02b5b79e868226674b6a457fe7a
+  metadata.gz: 8565605df4e39ae5aa7e069a029e420e41b5edb1a5436dfc917a91bede2aacb4949a63acf8549ff87bf0724983ae202845e44be3a778a98563d91bddc59a8e9c
+SHA1: 
+  data.tar.gz: 553b175cc8cc5d21003843e58d1b1a4984302771
+  metadata.gz: 264878c6be7a05856884705c746bf937de70a236

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7

data/Gemfile

@@ -3,7 +3,13 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'activesupport'
+if RUBY_VERSION < "1.9"
+  gem 'activesupport', '~> 3.1.12'
+  gem 'nokogiri', '~> 1.5.0'
+else
+  gem 'activesupport'
+end
+gem 'i18n'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.rdoc

@@ -1,4 +1,5 @@
 = ruby-cobbler
+{<img src="https://api.travis-ci.org/duritong/ruby-cobbler.png" />}[https://travis-ci.org/duritong/ruby-cobbler]
 
 Ruby bindings for interacting with Cobbler.
 

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.1"
+  gem.version = "2.0.2"
   gem.author = 'duritong'
   gem.email = 'peter.meier@immerda.ch'
   gem.homepage = 'http://github.com/duritong/ruby-cobbler/'
@@ -66,9 +66,9 @@ task :default => :spec
 gem 'rdoc'
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|
-  version = '2.0.1'
+  version = '2.0.2'
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "iuid #{version}"
+  rdoc.title = "cobbler #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/cobbler.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: cobbler 2.0.1 ruby lib
+# stub: cobbler 2.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cobbler"
-  s.version = "2.0.1"
+  s.version = "2.0.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-05-08"
+  s.date = "2014-06-27"
   s.description = "  Provides Ruby bindings to interact with a Cobbler server.\n"
   s.email = "peter.meier@immerda.ch"
   s.extra_rdoc_files = [
@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "COPYING",
     "ChangeLog",
     "Gemfile",
-    "Gemfile.lock",
     "NEWS",
     "README.rdoc",
     "Rakefile",
@@ -59,14 +59,16 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/duritong/ruby-cobbler/"
   s.licenses = ["GPLv2"]
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.3.0"
   s.summary = "An interface for interacting with a Cobbler server."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      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_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_development_dependency(%q<mocha>, ["~> 0.10.0"])
@@ -74,7 +76,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      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<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.8"])
       s.add_dependency(%q<mocha>, ["~> 0.10.0"])
@@ -83,7 +87,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    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<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.8"])
     s.add_dependency(%q<mocha>, ["~> 0.10.0"])

data/lib/cobbler/base.rb

@@ -60,6 +60,7 @@ require 'cobbler/common/finders'
 # automatically the various API methods if they aren't overwritten.
 # These methods are (defaults are shown for an item called Model):
 #
+# +copy+     - to copy an instance (copy_model)
 # +find_one+ - to find a single instance (get_model)
 # +find_all+ - to find all instances (get_models)
 # +remove+   - to remove an instance (remove_model)
@@ -124,5 +125,18 @@ module Cobbler
                 self.class.make_call(api_methods[:remove],name,token)
             end
         end
+
+        # copy the item on the cobbler server
+        def copy(newname)
+            raise "Not all necessary api methods are defined to process this action!" unless api_methods[:copy]
+            entry = self.class.find_one(name)
+            if entry
+                self.class.in_transaction(true) do |token|
+                    entryid = self.class.make_call(api_methods[:handle],name,token)
+                    self.class.make_call(api_methods[:copy],entryid,newname,token)
+                end
+            end
+        end
+
     end
-end
+end

data/lib/cobbler/common/lifecycle.rb

@@ -59,6 +59,7 @@ module Cobbler
                     return @api_methods if @api_methods
                     model_name = self.name.gsub(/.*::/,'').underscore
                     @api_methods = {
+                      :copy => "copy_#{model_name}",
                       :find_all => "get_#{model_name.pluralize}",
                       :find_one => "get_#{model_name}",
                       :handle => "get_#{model_name}_handle",

data/lib/cobbler/connection/handling.rb

@@ -20,6 +20,7 @@
 # You should have received a copy of the GNU General Public License
 # along with rubygem-cobbler.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'active_support/core_ext/module'
 require 'xmlrpc/client'
 
 # +Handling+ provides common methods to handle the xmlrpc connection to the 
@@ -36,7 +37,7 @@ module Cobbler
                 
                 # Set hostname, username, password for the Cobbler server, overriding any settings
                 # from cobbler.yml.
-                attr_accessor :hostname, :username, :password
+                mattr_accessor :hostname, :username, :password
                 
                 # Returns the version for the remote cobbler instance.
                 def remote_version
@@ -81,7 +82,9 @@ module Cobbler
                 # Returns a connection to the Cobbler server.
                 def connect
                     debug("Connecting to http://#{hostname}/cobbler_api")
-                    @connection = XMLRPC::Client.new2("http://#{hostname}/cobbler_api")
+                    @connection = XMLRPC::Client.new2("http://#{hostname}/cobbler_api").tap do |client|
+                        client.http_header_extra = { 'Accept-Encoding' => 'identity' } if client.respond_to?(:http_header_extra=)
+                    end
                 end
                 
                 private                
@@ -105,4 +108,4 @@ module Cobbler
             end
         end
     end
-end
+end

data/lib/cobbler/system.rb

@@ -26,12 +26,12 @@ 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
-        
+
         cobbler_collection :kernel_options, :packing => :hash
-        cobbler_collection :ks_meta, :packing => :hash
+        cobbler_collection :ks_meta, :packing => :hash, :store => :store_ksmeta
         cobbler_collection :owners
         cobbler_collection :interfaces, :packing => :hash, :store => :store_interfaces
-        
+
         def store_interfaces(sysid,token)
             interfaces.each do |interface,values|
                 values2store = values.keys.inject({}) do |result,member|
@@ -41,5 +41,12 @@ module Cobbler
                 self.class.make_call('modify_system',sysid,'modify_interface',values2store,token) unless values2store.empty?
             end
         end
+
+        def store_ksmeta(sysid,token)
+            result=''
+            ks_meta.each { |meta,values| result << "#{meta}=#{values} " }
+            self.class.make_call('modify_system',sysid,'ks_meta',result.strip,token) unless result.strip.empty?
+        end
+
     end
-end
+end

data/rubygem-cobbler.spec

@@ -7,7 +7,7 @@
 
 Summary: 	An interface for interacting with a Cobbler server
 Name: 		rubygem-%{gemname}
-Version: 	2.0.1
+Version: 	2.0.2
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	LGPLv2+
@@ -58,6 +58,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 27 2014 duritong <peter.meier@immerda.ch> - 2.0.2-1
+- Fix various problems and add copy support as well as a possibility
+  to store ks_meta
+
 * Thu May 08 2014 duritong <peter.meier@immerda.ch> - 2.0.1-1
 - Fix #1 - should not depend on active_support
 

data/spec/unit/cobbler/base_spec.rb

@@ -40,7 +40,7 @@ end
 
 describe Cobbler::Base do
     
-    [:remove, :save ].each do |method|
+    [:remove, :save, :copy ].each do |method|
         it "should provide a method to #{method} the item" do
             test = BaseTest.new
             test.should respond_to(method)
@@ -191,4 +191,4 @@ describe Cobbler::Base do
         end
     end
     
-end
+end

data/spec/unit/cobbler/system_spec.rb

@@ -23,5 +23,19 @@ describe Cobbler::System do
             Cobbler::System.expects(:make_call).with('modify_system','id','modify_interface',{"ipaddress-eth1" => '192.168.2.1'},'muh')
             @test1.save
         end
+        it "should store all ks_meta" do
+            @test1 = Cobbler::System.new({'name' => 'foo'},false)
+            @test1.ks_meta = { 'meta1' => 'val1', 'meta2' => 'val2' }
+            Cobbler::System.expects(:login).returns('muh')
+            Cobbler::System.expects(:logout)
+            Cobbler::System.expects(:find_one).with('foo').returns('entry')
+            Cobbler::System.expects(:connect).returns(Object.new)
+            Cobbler::System.expects(:make_call).with('get_system_handle','foo','muh').returns('id')
+            Cobbler::System.expects(:make_call).with('save_system','id','muh')
+            str = ''
+            @test1.ks_meta.each {|k,v| str << "#{k}=#{v} " }
+            Cobbler::System.expects(:make_call).with('modify_system','id','ks_meta',str.strip,'muh')
+            @test1.save
+        end
     end
-end
+end

metadata

@@ -1,128 +1,117 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cobbler
-version: !ruby/object:Gem::Version
-  version: 2.0.1
+version: !ruby/object:Gem::Version 
+  version: 2.0.2
 platform: ruby
-authors:
+authors: 
 - duritong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-06-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.12
+  requirement: *id001
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+  requirement: *id002
+  name: nokogiri
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id007 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  requirement: *id003
+  name: i18n
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 2.5.0
+  requirement: *id004
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.8"
+  requirement: *id005
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 0.10.0
+  requirement: *id006
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
+  requirement: *id008
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
+  requirement: *id009
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
+  requirement: *id010
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: |2
-    Provides Ruby bindings to interact with a Cobbler server.
+description: "  Provides Ruby bindings to interact with a Cobbler server.\n"
 email: peter.meier@immerda.ch
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - ChangeLog
 - README.rdoc
 - TODO
-files:
-- ".document"
+files: 
+- .document
+- .travis.yml
 - COPYING
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - NEWS
 - README.rdoc
 - Rakefile
@@ -155,27 +144,27 @@ files:
 - spec/unit/cobbler/connection/handling_spec.rb
 - spec/unit/cobbler/system_spec.rb
 homepage: http://github.com/duritong/ruby-cobbler/
-licenses:
+licenses: 
 - GPLv2
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: An interface for interacting with a Cobbler server.
 test_files: []
+

data/Gemfile.lock

@@ -1,89 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    builder (3.2.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.3)
-    docile (1.1.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (2.1.1)
-    highline (1.6.21)
-    i18n (0.6.9)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    metaclass (0.0.4)
-    mini_portile (0.5.3)
-    minitest (5.3.3)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    multi_json (1.10.0)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.3.3)
-    tzinfo (1.1.0)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  bundler
-  jeweler
-  mocha (~> 0.10.0)
-  rdoc (~> 3.8)
-  rspec (~> 2.5.0)
-  simplecov