abiquo-etk 0.5.8 → 0.5.9

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/lib/abicli/commands/remote-services-settings.rb

@@ -11,8 +11,6 @@ if ARGV[0] == 'remote-services-settings'
     load File.dirname(__FILE__) + "/remote-services-settings16.ext"
   elsif rel_info =~ /Version: 1\.8/
     load File.dirname(__FILE__) + "/remote-services-settings18.ext"
-  elsif rel_info =~ /Version: 2\.0/
-    load File.dirname(__FILE__) + "/remote-services-settings18.ext"
   else
     $stderr.puts "Abiquo release version not found. Unsupported installation."
     exit

data/lib/abicli/commands/server-settings.rb

@@ -11,8 +11,6 @@ if ARGV[0] == 'server-settings'
     load File.dirname(__FILE__) + "/server-settings168.ext"
   elsif rel_info =~ /Version: 1\.8/
     load File.dirname(__FILE__) + "/server-settings18.ext"
-  elsif rel_info =~ /Version: 2\.0/
-    load File.dirname(__FILE__) + "/server-settings18.ext"
   else
     $stderr.puts "Abiquo release version not found. Unsupported installation."
     exit

data/lib/abicli/commands/set.rb

@@ -12,8 +12,6 @@ if ARGV[0] == 'set'
     load File.dirname(__FILE__) + "/set168.ext"
   elsif rel_info =~ /Version: 1\.8/
     load File.dirname(__FILE__) + "/set18.ext"
-  elsif rel_info =~ /Version: 2\.0/
-    load File.dirname(__FILE__) + "/set18.ext"
   else
     $stderr.puts "Abiquo release version not found. Unsupported installation."
     exit

data/lib/abicli/commands/set18.ext

@@ -73,7 +73,6 @@ def set_nfs_repository(val)
   config.save('/opt/abiquo/config/abiquo.properties.bak')
   config['remote-services']['abiquo.appliancemanager.repositoryLocation'] = val
   config['remote-services']['abiquo.virtualfactory.xenserver.repositoryLocation'] = val
-  config['remote-services']['abiquo.virtualfactory.vmware.repositoryLocation'] = val
   config.save('/opt/abiquo/config/abiquo.properties')
 end
 

data/lib/abicli/commands/upload-template.rb

@@ -281,14 +281,14 @@ json = """{'ovfPackageInstanceDto':{
   json.gsub!("'",'"')
   $stdout.sync = true
   line_reset = "\r\e[0K" 
-  rsurl = "#{cli.config[:rs_url]}/am/erepos/#{cli.config[:enterprise_id]}/ovfs"
+  rsurl = "#{cli.config[:rs_url]}/am/erepos/#{cli.config[:enterprise_id]}/templates"
   if cli.config[:debug]
     puts "Upload URL: #{rsurl}"
     puts "JSON sent:\n#{json}"
   end
   StreamingUploader.post(
     rsurl,
-    { :ovfpackageinstance => json, :diskFile => fo }
+    { :aovfpackageinstance => json, :diskFile => fo }
   ) do |size|
     count += size
     per = (100*count)/fsize 

metadata

@@ -1,84 +1,112 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: abiquo-etk
-version: !ruby/object:Gem::Version
-  version: 0.5.8
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 9
+  version: 0.5.9
 platform: ruby
-authors:
+authors: 
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &17225360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *17225360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rpm-utils
-  requirement: &17223840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.1'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *17223840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: term-ansicolor
-  requirement: &17236700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *17236700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: mixlib-cli
-  requirement: &17234440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
-  prerelease: false
-  version_requirements: *17234440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: iniparse
-  requirement: &17247160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
         version: 1.1.4
   type: :runtime
-  prerelease: false
-  version_requirements: *17247160
+  version_requirements: *id005
 description: Tools to troubleshoot and manage your Abiquo installation
 email: srubio@abiquo.com
-executables:
-- abicli
-- abiquo-check-16-install
+executables: 
 - abiquo-check-install
+- abicli
 - ciab-setup
+- abiquo-check-16-install
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 - TODO
-files:
+files: 
 - .document
 - LICENSE
 - README.rdoc
@@ -538,26 +566,6 @@ files:
 - vendor/addressable-2.2.1/tasks/spec.rake
 - vendor/addressable-2.2.1/tasks/yard.rake
 - vendor/addressable-2.2.1/website/index.html
-- vendor/api_ruby_client/Gemfile
-- vendor/api_ruby_client/LICENSE
-- vendor/api_ruby_client/README
-- vendor/api_ruby_client/Rakefile
-- vendor/api_ruby_client/abiquo.gemspec
-- vendor/api_ruby_client/examples/create_dc_and_hv.rb
-- vendor/api_ruby_client/examples/hypervisor_resource.rb
-- vendor/api_ruby_client/examples/rack_resource.rb
-- vendor/api_ruby_client/lib/abiquo.rb
-- vendor/api_ruby_client/lib/core_ext.rb
-- vendor/api_ruby_client/lib/to_xml.rb
-- vendor/api_ruby_client/spec/acceptance/create_resource_spec.rb
-- vendor/api_ruby_client/spec/acceptance/delete_resource_spec.rb
-- vendor/api_ruby_client/spec/acceptance/fetch_resource_collections_spec.rb
-- vendor/api_ruby_client/spec/acceptance/fetch_single_resources_spec.rb
-- vendor/api_ruby_client/spec/acceptance/from_xml_spec.rb
-- vendor/api_ruby_client/spec/acceptance/navigate_linked_resources_spec.rb
-- vendor/api_ruby_client/spec/acceptance/update_resource_spec.rb
-- vendor/api_ruby_client/spec/spec_helper.rb
-- vendor/api_ruby_client/spec/unit/to_xml_spec.rb
 - vendor/fattr-2.1.0/README
 - vendor/fattr-2.1.0/README.erb
 - vendor/fattr-2.1.0/Rakefile
@@ -639,26 +647,36 @@ files:
 - vendor/resourceful-1.0.1/spec/spec_helper.rb
 homepage: http://github.com/abiquo/abiquo-etk
 licenses: []
+
 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'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Abiquo Elite Toolkit
 test_files: []
+

data/vendor/api_ruby_client/Gemfile

@@ -1,10 +0,0 @@
-source "http://rubygems.org"
-
-gem 'resourceful'
-gem 'nokogiri'
-gem 'activesupport'
-
-group :test do
-  gem 'steak'
-  gem 'webmock'
-end

data/vendor/api_ruby_client/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Abiquo Holdings
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/api_ruby_client/README

@@ -1,39 +0,0 @@
-=Abiquo API Ruby client
-
-Rest client to work with the Abiquo's API.
-
-==Installation
-
-gem install abiquo
-
-==Usage
-
-The first version of the api just uses basic authentication, so we need to create an instance with our credentials:
-
-  auth = Abiquo::BasicAuth.new('Abiquo', 'username', 'password')
-
-The entry point for the Abiquo's API is an atom document service:
-
-  api = Abiquo::Resource('http://abiquo.example.com/api', auth)
-
-from this point we can access to every resource exposed by the api calling nested methods:
-
-  datacenters = api.datacenters
-  racks = api.datacenters.first.racks
-
-or get the values of their elements:
-
-  datacenter = api.datacenters.first
-  datacenter.name  # => The name of the datacenter
-
-You can find further example into the specs:
-
-  http://github.com/abiquo/api_ruby_client/tree/master/spec/acceptance
-
-Further documentation of the API can be found in our wiki:
-
-  http://abicloud.org/display/ABI16/Abiquo's+API
-
-==Copyright
-
-Copyright (c) 2010 Abiquo Holdings. See LICENSE for details.

data/vendor/api_ruby_client/Rakefile

@@ -1,89 +0,0 @@
-require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
-
-require "spec"
-require "spec/rake/spectask"
-
-desc "Run acceptance specs"
-Spec::Rake::SpecTask.new("spec:acceptance") do |t|
-  t.spec_opts = "--format specdoc --colour".split
-  t.spec_files = ["spec/acceptance"]
-end
-
-desc "Run unit specs"
-Spec::Rake::SpecTask.new("spec:unit") do |t|
-  t.spec_files = ["spec/unit"]
-end
-
-desc "Run all specs"
-task :spec => ["spec:unit", "spec:acceptance"]
-
-task :default => ["spec"]
-
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
-spec = Gem::Specification.new do |s|
-
-  # Change these as appropriate
-  s.name              = "abiquo"
-  s.version           = "0.1.0"
-  s.summary           = "Abiquo API client"
-  s.author            = "Abiquo"
-  s.email             = "support@abiquo.com"
-  s.homepage          = "http://github.com/abiquo/api_ruby_client"
-
-  s.has_rdoc          = true
-  # You should probably have a README of some kind. Change the filename
-  # as appropriate
-  s.extra_rdoc_files  = %w(README)
-  s.rdoc_options      = %w(--main README)
-
-  # Add any extra files to include in the gem (like your README)
-  s.files             = %w() + Dir.glob("{lib/**/*}")
-  s.require_paths     = ["lib"]
-
-  # If you want to depend on other gems, add them here, along with any
-  # relevant versions
-  s.add_dependency("resourceful")
-  s.add_dependency("nokogiri")
-  s.add_dependency("activesupport")  # for to_xml, singularize, delegate, & try, should we implement them?
-
-  # If your tests use any gems, include them here
-  s.add_development_dependency("steak")
-  s.add_development_dependency("webmock")
-end
-
-# This task actually builds the gem. We also regenerate a static
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
-#
-# To publish your gem online, install the 'gemcutter' gem; Read more 
-# about that here: http://gemcutter.org/pages/gem_docs
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Build the gemspec file #{spec.name}.gemspec"
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-task :package => :gemspec
-
-# Generate documentation
-Rake::RDocTask.new do |rd|
-  
-  rd.rdoc_files.include("lib/**/*.rb", "README.rdoc")
-  rd.rdoc_dir = "rdoc"
-end
-
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
-end

data/vendor/api_ruby_client/abiquo.gemspec

@@ -1,43 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{abiquo}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Abiquo"]
-  s.date = %q{2010-07-28}
-  s.email = %q{support@abiquo.com}
-  s.extra_rdoc_files = ["README.rdoc"]
-  s.files = ["lib/to_xml.rb", "lib/core_ext.rb", "lib/abiquo.rb", "README.rdoc"]
-  s.homepage = %q{http://wiki.github.com/abiquo/abiquo/}
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Abiquo API client}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<resourceful>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<steak>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-    else
-      s.add_dependency(%q<resourceful>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<steak>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<resourceful>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<steak>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-  end
-end

data/vendor/api_ruby_client/examples/create_dc_and_hv.rb

@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'abiquo'
-require 'pp'
-
-auth = Abiquo::BasicAuth.new('Abiquo', 'admin', 'xabiquo')
-api = Abiquo::Resource('http://abiquo-server-ip:8080/api', auth)
-
-
-#
-# Create a DataCenter
-#
-#puts "Creating DC1 in BCN..."
-api.datacenters.create :name => 'DC1', :location => 'BCN'
-
-#
-# Create Remote Services
-# 
-api.datacenters.first.remoteServices.create :type => 'VIRTUAL_FACTORY', :uri => 'http://localhost:8080/virtualfactory'
-api.datacenters.first.remoteServices.create :type => 'STORAGE_SYSTEM_MONITOR', :uri => 'http://localhost:8080/ssm'
-api.datacenters.first.remoteServices.create :type => 'VIRTUAL_SYSTEM_MONITOR', :uri => 'http://localhost:8080/vsm'
-api.datacenters.first.remoteServices.create :type => 'NODE_COLLECTOR', :uri => 'http://localhost:8080/nodecollector'
-api.datacenters.first.remoteServices.create :type => 'APPLIANCE_MANAGER', :uri => 'http://localhost:8080/am'
-api.datacenters.first.remoteServices.create :type => 'DHCP_SERVICE', :uri => 'http://localhost:7911'
-api.datacenters.first.remoteServices.create :type => 'BPM_SERVICE', :uri => 'http://localhost:7911'
-
-#
-# Create a new Rack
-#
-puts "Creating rack 'myrack01'..."
-api.datacenters.first.racks.create :name => 'myrack01'
-
-#
-# Iterate over all the racks and print the rack name
-#
-puts "Listing racks.."
-api.datacenters.first.racks.each do |rack|
-  pp rack.name
-end

data/vendor/api_ruby_client/examples/hypervisor_resource.rb

@@ -1,16 +0,0 @@
-require 'rubygems'
-require 'abiquo'
-require 'pp'
-
-auth = Abiquo::BasicAuth.new('Abiquo', 'admin', 'admin')
-api = Abiquo::Resource('http://as-testing.bcn.abiquo.com:8080/api', auth)
-
-#
-# Iterate over all the racks and print the rack name and the hypervisors underneath
-#
-api.datacenters.first.racks.each do |rack|
-  puts "- RACK [#{rack.name}]" 
-  rack.machines.each do |m|
-    puts "---" + m.name
-  end
-end

data/vendor/api_ruby_client/examples/rack_resource.rb

@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'abiquo'
-require 'pp'
-
-auth = Abiquo::BasicAuth.new('Abiquo', 'admin', 'admin')
-api = Abiquo::Resource('http://as-testing.bcn.abiquo.com:8080/api', auth)
-
-#
-# Create a new Rack
-#
-puts "Creating rack 'myrack01'..."
-api.datacenters.first.racks.create :name => 'myrack01'
-
-#
-# Iterate over all the racks and print the rack name
-#
-puts "Listing racks.."
-api.datacenters.first.racks.each do |rack|
-  pp rack.name
-end
-
-#
-# Iterate over all the racks and print the rack name
-#
-puts "Listing racks..."
-api.datacenters.first.racks.each do |rack|
-  pp rack.name
-end
-
-#
-# Delete the rack myrack01
-# 
-# NOT SUPPORTED IN ABIQUO1.6
-#
-#puts "Deleting rack 'myrack01'..."
-#api.datacenters.first.racks.each do |r|
-#  r.delete if r.name == 'myrack01'
-#end

data/vendor/api_ruby_client/lib/abiquo.rb

@@ -1,201 +0,0 @@
-require 'resourceful'
-require 'nokogiri'
-#gem 'activesupport', '2.3.8'
-require 'active_support'
-require File.expand_path('../core_ext', __FILE__)
-require File.expand_path('../to_xml', __FILE__)
-require 'uri'
-
-module Abiquo
-
-  class NotAllowed < RuntimeError
-    def initialize(method, url)
-      @method = method
-      @url = url
-    end
-
-    def message
-      "Method #{@method} not allowed for #{@url}"
-    end
-  end
-  
-  class BasicAuth < Resourceful::BasicAuthenticator
-    def can_handle?(request); true; end
-  end
-  
-  module HttpAccessor
-    
-    def xml
-      @xml ||= begin
-        response = http.resource(url_with_params).get
-        Nokogiri.parse(response.body).root
-      end
-    end
-    
-    private
-    
-    def url_with_params
-      @options[:expand] = @options[:expand].join(",") if @options[:expand].is_a?(Array)
-      params = @options.map { |k, v| "#{k}=#{v}" }.join("&")
-      params = "?#{params}" unless params.empty?
-      @url + params
-    end
-    
-    def http
-      Resourceful::HttpAccessor.new(:authenticator => @auth)
-    end
-
-    def rest_options
-      @rest_options ||= begin
-        response = http.resource(@url).options
-        response.header['Allow'].map {|m| m.to_sym }
-      end
-    end
-    
-  end
-  
-  class SingleResource
-    
-    include HttpAccessor
-    
-    undef id
-    
-    def initialize(url, auth, xml = nil, options = {})
-      @url = url
-      @auth = auth
-      @xml = xml
-      @options = options
-    end
-    
-    def update(attrs = {})
-      raise Abiquo::NotAllowed.new(:PUT, url) unless rest_options.include?(:PUT)
-      response = http.resource(url).put(attrs.to_xml(:root => object_type), :content_type => "application/xml")
-      @xml = Nokogiri.parse(response.body).root
-    end
-    
-    def delete
-      raise Abiquo::NotAllowed.new(:DELETE, url) unless rest_options.include?(:DELETE)
-      http.resource(url).delete
-    end
-    
-    def url
-      @url ||= xml.at_xpath("./link[@rel='edit']").try(:[], "href")
-    end
-    
-    delegate :to_xml, :to => :xml
-    alias_method :inspect, :to_xml
-    
-    private
-    
-    def object_type
-      @object_type ||= URI.parse(url).path.split("/")[-2].singularize
-    end
-    
-    def method_missing(meth, *args, &blk)
-      attribute = xml.at_xpath("./*[name()='#{meth}' or name()='#{attribute_name(meth)}']")
-      return node_text(attribute) if attribute
-      
-      link = xml.at_xpath("./link[@rel='#{meth}' or @rel='#{attribute_name(meth)}']")
-      return Resource.new(link["href"], @auth, link.at_xpath("./*"), *args) if link
-
-      if xml.namespaces.has_key?('xmlns:ns2')
-        @xml = Nokogiri.parse(xml.to_s.downcase).root
-        link = xml.at_xpath("//ns2:collection/xmlns:title[. = '#{meth}']").try(:parent)
-        return Resource.new(link['href'], @auth, nil, *args) if link
-      end
-      
-      super
-    end
-    
-    def node_text(node)
-      node.text
-    end
-    
-    def attribute_name(attribute)
-      attribute.to_s.gsub('_', '-')
-    end
-    
-  end
-  
-  class ResourceCollection
-    
-    include HttpAccessor
-    
-    delegate :inspect, :to => :resources
-    
-    def initialize(url, auth, xml = nil, options = {})
-      @url = url
-      @auth = auth
-      @xml = xml if options.empty?
-      @options = options
-    end
-    
-    def create(attrs = {})
-      raise Abiquo::NotAllowed.new(:POST, url) unless rest_options.include?(:POST)
-      response = http.resource(url_with_params).post(attrs.to_xml(:root => object_type, :convert_links => true), :content_type => "application/xml")
-      Resource.new(nil, @auth, Nokogiri.parse(response.body).root)
-    end
-    
-    private
-    
-    def object_type
-      @object_type ||= URI.parse(@url).path.split("/").last.singularize
-    end
-    
-    def resources
-      @resources ||= xml.xpath("./*").map { |subnode| Resource.new(subnode.at_xpath("./link[@rel='edit']").try(:[], "href"), @auth, subnode, @options) }
-    end
-    
-    def method_missing(meth, *args, &blk)
-      resources.send(meth, *args, &blk)
-    end
-  end
-  
-  class Resource
-    
-    include HttpAccessor
-    
-    undef id
-    undef type
-    
-    delegate :inspect, :to => :get!
-    
-    def self.from_xml(xml, auth = nil)
-      new(nil, auth, Nokogiri.parse(xml).root)
-    end
-    
-    def initialize(url, auth, xml = nil, options = {})
-      @url = url
-      @auth = auth
-      @xml = xml
-      @options = options
-    end
-    
-    def method_missing(meth, *args, &blk)
-      @resource_object ||= resource_class(meth).new(@url, @auth, @xml, @options)
-      @resource_object.send(meth, *args, &blk)
-    end
-    
-    def resource_class(meth)
-      @resource_class ||= if (Array.instance_methods + ["create"] - ["delete", "id"]).include?(meth.to_s)
-        ResourceCollection
-      else
-        SingleResource
-      end
-    end
-    
-    def get!
-      klass = SingleResource
-      if (!xml.children.empty? && xml.name.singularize == xml.children.first.name)
-        klass = ResourceCollection
-      end
-      @resource_object = klass.new(@url, @auth, @xml, @options)
-    end
-        
-  end
-  
-  def self.Resource(url, auth, params = {})
-    Resource.new(url, auth, nil, params)
-  end
-  
-end

data/vendor/api_ruby_client/lib/core_ext.rb

@@ -1,28 +0,0 @@
-require 'net/http'
-
-module Resourceful
-  class Resource
-    def options(header = {})
-      request(:options, nil, header)
-    end
-
-    def host_with_port
-      add = Addressable::URI.parse(uri)
-      !add.port.blank? && add.port != 80 ? [add.host, add.port].join(':') : add.host
-    end
-
-    alias_method_chain :host, :port
-  end
-
-  class NetHttpAdapter
-    def net_http_request_class_with_options(method)
-      if method == :options
-        Net::HTTP::Options
-      else
-        net_http_request_class_without_options(method)
-      end
-    end
-
-    alias_method_chain :net_http_request_class, :options
-  end
-end

data/vendor/api_ruby_client/lib/to_xml.rb

@@ -1,22 +0,0 @@
-module Abiquo
-  
-  module ToXml
-    
-    def to_xml_with_links(options = {})
-      if options[:convert_links] && options[:builder]
-        options[:builder].tag!(:link, :rel => options[:root]) do
-          to_xml_without_links(options)
-        end
-      else
-        to_xml_without_links(options)
-      end
-    end
-    
-  end
-  
-end
-
-class Array
-  include Abiquo::ToXml
-  alias_method_chain :to_xml, :links
-end

data/vendor/api_ruby_client/spec/acceptance/create_resource_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-feature "Creating new resources" do
-  
-  scenario "Creating a resource in a collection" do
-    
-    datacenters = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters", auth)
-
-    stub_auth_request(:options, "http://admin:admin@abiquo.example.com/api/admin/datacenters").
-      to_return(:headers => {'Allow' => 'GET, POST, OPTIONS'})
-
-    stub_auth_request(:post, "http://admin:admin@abiquo.example.com/api/admin/datacenters").with do |req|
-      # we parse because comparing strings is too fragile because of order changing, different indentations, etc.
-      # we're expecting something very close to this:
-      # <datacenter>
-      #   <name>Wadus</name>
-      # </datacenter>
-      Nokogiri.parse(req.body).at_xpath("/datacenter/name").text == "Wadus"
-    end.to_return(:body => %q{
-      <datacenter>
-        <name>Wadus</name>
-        <link rel="edit" href="http://abiquo.example.com/api/admin/datacenters/1"/>
-      </datacenter>
-    })
-    
-    datacenter = datacenters.create(:name => "Wadus")
-    
-    datacenter.should be_a(Abiquo::Resource)
-    datacenter.name.should == "Wadus"
-
-    stub_auth_request(:options, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").
-      to_return(:headers => {'Allow' => 'GET, PUT, OPTIONS'})
-    
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => %q{
-      <datacenter>
-        <name>Wadus</name>
-        <link rel="edit" href="http://abiquo.example.com/api/admin/datacenters/1"/>
-      </datacenter>
-    })
-
-    datacenter.name == Abiquo::Resource(datacenter.url, auth).name
-  end
-end

data/vendor/api_ruby_client/spec/acceptance/delete_resource_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-feature "Deleting resources" do
-  
-  scenario "return status 200 when delete is allowed" do
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-    
-    stub_auth_request(:options, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").
-      to_return(:status => 200, :headers => {'Allow' => 'GET, PUT, OPTIONS, HEAD, DELETE'})
-
-    stub_auth_request(:delete, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:status => 200)
-    
-    datacenter.delete
-    
-    auth_request(:delete, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").should have_been_made.once
-  end
-
-  scenario "raise Abiquo::NotAllowed when delete is not allowed" do
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-
-    stub_auth_request(:options, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").
-      to_return(:status => 200, :headers => {'Allow' => 'GET, PUT, OPTIONS, HEAD'})
-    
-    lambda { datacenter.delete }.should raise_error(Abiquo::NotAllowed)
-  end
-  
-end

data/vendor/api_ruby_client/spec/acceptance/fetch_resource_collections_spec.rb

@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-feature "Fetching resource collections" do
-  
-  scenario "Fetch collection" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters").to_return(:body => <<-XML)
-      <datacenters>
-        <datacenter>
-          <link rel='edit' href='http://abiquo.example.com/api/admin/datacenters/1'/>
-          <name>Resource 1</name>
-        </datacenter>
-        <datacenter>
-          <link rel='edit' href='http://abiquo.example.com/api/admin/datacenters/2'/>
-          <name>Resource 2</name>
-        </datacenter>
-      </datacenters>
-    XML
-    
-    resources = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters", auth)
-    
-    resources.map(&:name).should == ["Resource 1", "Resource 2"]
-    resources.size.should == 2
-    resources.first.name.should == "Resource 1"
-    resources.last.name.should  == "Resource 2"
-  end
-  
-  scenario "Inspecting a collection" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters").to_return(:body => %q{
-      <datacenters><datacenter><name>Resource 1</name></datacenter></datacenters>
-    })
-
-    resources = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters", auth)
-
-    resources.inspect.should == "[#{resources.first.inspect}]"
-  end
-
-  scenario 'Fetch service document' do
-    stub_auth_request(:get, 'http://admin:admin@abiquo.example.com/api').to_return(:body => <<-XML)
-      <ns2:service xmlns="http://www.w3.org/2005/Atom" xmlns:ns2="http://www.w3.org/2007/app" xmlns:ns3="http://a9.com/-/spec/opensearch/1.1/" xmlns:ns4="http://www.w3.org/1999/xhtml">
-        <ns2:workspace>
-          <title>Abiquo administration workspace</title>
-          <ns2:collection href="http://localhost:8080/api/admin/datacenters">
-            <title>Datacenters</title>
-            <ns2:accept/>
-          </ns2:collection>
-        </ns2:workspace>
-      </ns2:service>
-    XML
-
-    resources = Abiquo::Resource('http://abiquo.example.com/api', auth)
-
-    lambda { resources.datacenters }.should_not raise_error
-  end
-  
-end

data/vendor/api_ruby_client/spec/acceptance/fetch_single_resources_spec.rb

@@ -1,47 +0,0 @@
-require "spec_helper"
-
-feature "Fetching individual resources" do  
-
-  scenario "Fetching untyped attributes" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => <<-XML)
-      <datacenter>
-        <name>Resource Name</name>
-        <id>12345</id>
-      </datacenter>
-    XML
-
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-    datacenter.name.should == "Resource Name"
-    datacenter.id.should == "12345"
-
-    expect { datacenter.wadus }.to raise_error(NoMethodError)
-  end
-
-  scenario "Fetching typed attributes" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => <<-XML)
-      <datacenter>
-        <id>12345</id>
-        <name>Resource Name</name>
-      </datacenter>
-    XML
-
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-
-    datacenter.id.should == "12345"
-  end
-
-  scenario "Inspecting a resource" do
-    xml = %q{
-      <datacenter>
-        <id>12345</id>
-        <name>Resource Name</name>
-      </datacenter>      
-    }
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => xml)
-
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-
-    Nokogiri.parse(datacenter.inspect).to_xml.should == Nokogiri.parse(xml).to_xml
-  end
-  
-end

data/vendor/api_ruby_client/spec/acceptance/from_xml_spec.rb

@@ -1,15 +0,0 @@
-require "spec_helper"
-
-feature "Instantiate resources from xml" do
-  
-  it "should instantiate the resource without HTTP calls" do
-    xml = %q{
-      <datacenter>
-        <name>Resource 1</name>
-      </datacenter>
-    }
-    datacenter = Abiquo::Resource.from_xml(xml)
-    
-    datacenter.name.should == "Resource 1"
-  end
-end

data/vendor/api_ruby_client/spec/acceptance/navigate_linked_resources_spec.rb

@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-feature "Navigating linked resources" do
-  scenario "Link to a collection of resources" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => <<-XML)
-      <datacenter>
-        <link rel="racks" href="http://abiquo.example.com/api/admin/datacenters/1/racks"/>
-      </datacenter>
-    XML
-    
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-    
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1/racks").to_return(:body => <<-XML)
-      <racks>
-        <rack>
-          <name>Rack 1</name>
-        </rack>
-        <rack>
-          <name>Rack 2</name>
-        </rack>
-      </racks>
-    XML
-    
-    datacenter.racks.size.should == 2
-    datacenter.racks.first.name.should == 'Rack 1'
-    datacenter.racks.last.name.should == 'Rack 2'
-  end
-  
-  scenario "Link to a collection of resources with params" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => <<-XML)
-      <datacenter>
-        <link rel="racks" href="http://abiquo.example.com/api/admin/datacenters/1/racks"/>
-      </datacenter>
-    XML
-
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1/racks").to_return(:body => <<-XML)
-      <racks>
-        <rack>
-          <name>Rack 1</name>
-        </rack>
-      </racks>
-    XML
-    
-    datacenter.racks.size.should == 1
-    datacenter.racks.first.name.should == 'Rack 1'
-  end
-
-  scenario "Link to self" do
-    stub_auth_request(:get, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").to_return(:body => <<-XML)
-      <datacenter>
-        <link rel="edit" href="http://abiquo.example.com/datacenters/1"/>
-      </datacenter>
-    XML
-    
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-    
-    datacenter.url.should == "http://abiquo.example.com/api/admin/datacenters/1"
-  end
-end

data/vendor/api_ruby_client/spec/acceptance/update_resource_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-feature "Updating resources" do
-  
-  scenario "Updating a resource" do
-    datacenter = Abiquo::Resource("http://abiquo.example.com/api/admin/datacenters/1", auth)
-
-    stub_auth_request(:options, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").
-      to_return(:headers => {'Allow' => 'GET, PUT, OPTIONS'})
-
-    stub_auth_request(:put, "http://admin:admin@abiquo.example.com/api/admin/datacenters/1").with do |req|
-      req.body == {:name => "Wadus Wadus"}.to_xml(:root => "datacenter")
-    end.to_return(:body => <<-XML)
-      <datacenter>
-        <name>Wadus Wadus</name>
-        <link rel="edit" href="http://abiquo.example.com/api/admin/datacenters/1"/>
-      </datacenter>
-    XML
-    
-    
-    datacenter.update(:name => "Wadus Wadus")
-    
-    datacenter.name.should == "Wadus Wadus"
-  end
-  
-end

data/vendor/api_ruby_client/spec/spec_helper.rb

@@ -1,32 +0,0 @@
-require 'rubygems'
-require 'steak'
-require 'webmock/rspec'
-require "abiquo"
-
-module Helpers
-
-  def stub_auth_request(*args)
-    stub_request(*args)
-  end
-  
-  def auth_request(*args)
-    request(*args)
-  end
-  
-  def auth
-    Abiquo::BasicAuth.new("Abiquo", "admin", "admin")
-  end
-end
-
-Spec::Runner.configure do |config|
-  config.include Helpers
-  config.include WebMock
-  config.before(:each) do
-    stub_request(:any, //).with { |request| !request.headers.has_key?("Authorization") }.
-                           to_return(
-                             :status => 401, :headers => {
-                               "WWW-Authenticate" => 'Basic realm="Abiquo"'
-                            })
-  end
-  config.after(:each) { reset_webmock }
-end

data/vendor/api_ruby_client/spec/unit/to_xml_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe Hash do
-  
-  describe "to_xml" do
-    
-    it "should convert the nested resources into 'link' tags if the :convert_links option is present" do
-      xml = Nokogiri.parse({"name" => "Almodovar", "tasks" => [{"name" => "Wadus"}]}.to_xml(:root => "project", :convert_links => true))
-      
-      # <project>
-      #   <name>Almodovar</name>
-      #   <link rel="tasks">
-      #     <tasks type="array">
-      #       <task>
-      #         <name>Wadus</name>
-      #       </task>
-      #     </tasks>
-      #   </link>
-      # </project>
-      xml.at_xpath("/project/name").text.should == "Almodovar"
-      xml.at_xpath("/project/tasks").should be_nil
-      xml.at_xpath("/project/link[@rel='tasks']/tasks[@type='array']/task/name").text.should == "Wadus"
-    end
-    
-    it "should not convert the nested resources into 'link' tags if the :convert_links option is not present" do
-      xml = Nokogiri.parse({"name" => "Almodovar", "tasks" => [{"name" => "Wadus"}]}.to_xml(:root => "project", :convert_links => false))
-
-      # <project>
-      #   <name>Almodovar</name>
-      #   <tasks type="array">
-      #     <task>
-      #       <name>Wadus</name>
-      #     </task>
-      #   </tasks>
-      # </project>      
-      xml.at_xpath("/project/name").text.should == "Almodovar"
-      xml.at_xpath("//link").should be_nil
-      xml.at_xpath("/project/tasks[@type='array']/task/name").text.should == "Wadus"
-    end
-    
-    
-  end
-  
-end
-
-describe Array do
-  
-  describe "to_xml" do
-    
-    it "should convert an array into xml" do
-      [].to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<nil-classes type=\"array\"/>\n"
-    end
-    
-  end
-  
-end