occi-core 4.1.0 → 4.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2a33d4666ccb0cb6f5319c9c0a313a57659d092f
+  data.tar.gz: 06508a287d3bab6d510dc75e4c330f15fecab503
+SHA512:
+  metadata.gz: df8f403bc9166fea257c801665645cf61060cb5667854f7a76053d3744f7d1021d77605661805bf55fa649809d51a61187ac8a07dfae89427ff824be8f1e0c03
+  data.tar.gz: 68593e75b588190ee1d8a604594931edac40a1bfded15ca8bba84193859397ada6a2ed16f966ab046d8199918ebc63fe8e3ed4af705b6a39e074a9de476fef5d

data/README.md

@@ -14,20 +14,30 @@ Requirements
 * RubyGems have to be installed
 * Rake has to be installed (e.g., `gem install rake`)
 
-### Libraries/packages
-* libxslt1-dev/libxslt-devel
-* libxml2-dev/libxml2-devel
+### Dependencies
+* `libxslt1-dev` or `libxslt-devel`
+* `libxml2-dev`or `libxml2-devel`
 
 ### Examples
-For distros based on Debian:
+#### For distros based on Debian:
 ~~~
 apt-get install ruby rubygems ruby-dev libxslt1-dev libxml2-dev
 ~~~
+~~~
+ruby -v
+~~~
+
+**Unless you have Ruby >= 1.9.3, please, go to [rOCCI-core#RVM](#rvm) and install RVM with a newer Ruby version.**
 
-For distros based on RHEL:
+#### For distros based on RHEL:
 ~~~
 yum install libxml2-devel libxslt-devel ruby-devel openssl-devel gcc gcc-c++ ruby rubygems
 ~~~
+~~~
+ruby -v
+~~~
+
+**Unless you have Ruby >= 1.9.3, please, go to [rOCCI-core#RVM](#rvm) and install RVM with a newer Ruby version.**
 
 Installation
 ------------
@@ -47,12 +57,8 @@ To install the most recent beta version
 ### From source (dev)
 
 **Installation from source should never be your first choice! Especially, if you are not familiar with RVM, Bundler, Rake and other dev tools for Ruby!**
-**However, if you wish to contribute to our project, this is the right way to start.**
 
-To use rOCCI from source it is very much recommended to use RVM. [Install RVM](https://rvm.io/rvm/install/) with
-
-    curl -L https://get.rvm.io | bash -s stable --ruby
-    rvm install 1.9.3
+**However, if you wish to contribute to our project, this is the right way to start.**
 
 To build and install the bleeding edge version from master
 
@@ -63,6 +69,24 @@ To build and install the bleeding edge version from master
     bundle exec rake test
     rake install
 
+### RVM
+
+**Notice:** Follow the RVM installation guide linked below, we recommend using the default 'Single-User installation'.
+
+**Warning:** NEVER install RVM as root! If you choose the 'Multi-User installation', use a different user account with sudo access instead!
+
+* [Installing RVM](https://rvm.io/rvm/install#explained)
+* Install Ruby
+
+~~~
+rvm requirements
+rvm install 1.9.3
+rvm use 1.9.3 --default
+~~~
+~~~
+ruby -v
+~~~
+
 Usage
 -----
 #### Logging

data/lib/occi/parser/text.rb

@@ -40,7 +40,7 @@ module Occi
       if Occi::Settings.compatibility
         REGEXP_CATEGORY = "Category:\\s*(?<term>#{REGEXP_TERM})" << # term (mandatory)
             ";\\s*scheme=\"(?<scheme>#{REGEXP_SCHEME})#{REGEXP_TERM}?\"" << # scheme (mandatory)
-            ";\\s*class=\"(?<class>#{REGEXP_CLASS})\"" << # class (mandatory)
+            ";\\s*class=\"?(?<class>#{REGEXP_CLASS})\"?" << # class (mandatory)
             "(;\\s*title=\"(?<title>#{REGEXP_QUOTED_STRING})\")?" << # title (optional)
             "(;\\s*rel=\"(?<rel>#{REGEXP_TYPE_IDENTIFIER})\")?"<< # rel (optional)
             "(;\\s*location=\"(?<location>#{URI::URI_REF})\")?" << # location (optional)

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module Occi
-  VERSION = "4.1.0" unless defined?(::Occi::VERSION)
+  VERSION = "4.1.1" unless defined?(::Occi::VERSION)
 end

data/spec/occi/parser/text_spec.rb

@@ -6,7 +6,7 @@ module Occi
 
       describe '.category' do
 
-        it 'parses a string with an OCCI Category to an OCCI Category' do
+        it 'parses a string describing an OCCI Category' do
           category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class="kind";title="aA1!\"§$%&/()=?`´ß+*#-_.:,;<>";rel="http://a.a/b#a";location="/a1-A/";attributes="a_1-_.a1-_a a-1.a.b";actions="http://a.a/a1#a1 http://a.b1/b1#b2"'
 
           category = Occi::Parser::Text.category category_string
@@ -25,6 +25,15 @@ module Occi
           category.actions.to_a.any? {|action| action.to_s == 'http://a.b1/b1#b2'}.should be_true
         end
 
+        it 'parses a string describing an OCCI Category with unquoted class value' do
+          category_string = 'Category: a_a1-_;scheme="http://a.a/a#";class=kind'
+
+          category = Occi::Parser::Text.category category_string
+          category.term.should eq 'a_a1-_'
+          category.scheme.should eq 'http://a.a/a#'
+          category.class.should eq Occi::Core::Kind
+        end
+
       end
 
       describe '.resource' do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 4.1.0
-  prerelease: 
+  version: 4.1.1
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -11,60 +10,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,113 +85,99 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
@@ -288,26 +263,42 @@ files:
 homepage: https://github.com/gwdg/rOCCI-core
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OCCI toolkit
-test_files: []
+test_files:
+- spec/occi/collection_spec.rb
+- spec/occi/core/attribute_spec.rb
+- spec/occi/core/attributes_spec.rb
+- spec/occi/core/categories_spec.rb
+- spec/occi/core/category_spec.rb
+- spec/occi/core/entity_spec.rb
+- spec/occi/core/kind_spec.rb
+- spec/occi/core/resource_spec.rb
+- spec/occi/infrastructure/compute_spec.rb
+- spec/occi/log_spec.rb
+- spec/occi/model_spec.rb
+- spec/occi/parser/text_spec.rb
+- spec/occi/parser_spec.rb
+- spec/occi/test.json
+- spec/occi/test.ova
+- spec/occi/test.ovf
+- spec/spec_helper.rb