occi 2.5.7 → 2.5.8

data/.gitignore

@@ -1,3 +1,4 @@
+*.swp
 .project
 .idea
 .yardoc

data/Gemfile

@@ -10,6 +10,7 @@ gem "builder"
 gem "activesupport"
 gem "rake"
 gem "httparty"
+gem "highline"
 gem "i18n"
 
 # development related gems
@@ -19,4 +20,4 @@ group :development do
   gem "yard"
   gem "yard-sinatra"
   gem "rspec-http"
-end
+end

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.3)
     hashie (1.2.0)
+    highline (1.6.11)
     httparty (0.8.1)
       multi_json
       multi_xml
@@ -44,6 +45,7 @@ DEPENDENCIES
   antlr3
   builder
   hashie
+  highline
   httparty
   i18n
   json

data/README.md

@@ -8,7 +8,7 @@ Requirements
 
 The following setup is recommended
 
-* usage of the Ruby Version Manger
+* usage of the Ruby Version Manager
 * Ruby 1.9.3
 * RubyGems installed
 
@@ -19,29 +19,52 @@ Installation
 
 Usage
 -----
+### Client
+The OCCI gem includes a client you can use directly from shell with the following auth methods: x509 (with --password, --user-cred and --ca-path), basic (with --username and --password), digest (with --username and --password), none. If you won't set a password using --password, the client will run in an interactive mode and ask for it later on.
 
-Use the Interactive Ruby Shell (IRB) to interact with an OCCI server. If you have the occi gem installed, you just have
-to start irb from the command line:
+To find out more about available options and defaults use
 
-    irb
+    occi --help
 
-If you want to test newer versions of rOCCI, you have to tell irb from where it
-should load occi:
+To list available resources use
 
-    cd rOCCI
-    irb -I lib
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action list --resource compute --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action list --resource storage --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action list --resource network --auth x509
 
-First require the gem, for Ruby 1.8.7 you also have to require rubygems
+To describe available resources use
 
-    require 'rubygems'
-    require 'occi'
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource compute --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource storage --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource network --auth x509
 
-### Client
+To describe specific resources use
+
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource https://<ENDPOINT>:<PORT>/compute/<OCCI_ID> --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource https://<ENDPOINT>:<PORT>/storage/<OCCI_ID> --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource https://<ENDPOINT>:<PORT>/network/<OCCI_ID> --auth x509
+
+To list available OS templates or Resource templates use
+
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action list --resource os_tpl --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action list --resource resource_tpl --auth x509
+
+To describe a specific OS template or Resource template use
 
-The OCCI gem includes a Client to simplify the usage of an OCCI endpoint. If you want to use authentication then you
-should create a hash with information either on username and password for basic authentication or with a X.509 user
-certificate, the user certificate password and the path to the Root CAs which are used to verify the certificate of the
-OCCI server.
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource os_tpl#debian6 --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action describe --resource resource_tpl#small --auth x509
+
+To create a compute resource with mixins use
+
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --resource-title "My rOCCI VM" --auth x509
+
+To delete a compute resource use
+
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action delete --resource https://<ENDPOINT>:<PORT>/compute/<OCCI_ID> --auth x509
+
+### Client scripting
+
+#### Auth
 
 For Basic auth use
 
@@ -49,7 +72,7 @@ For Basic auth use
     auth.type = 'basic'
     auth.username = 'user'
     auth.password = 'mypass'
-
+ 
 For Digest auth use
 
     auth = Hashie::Mash.new
@@ -58,52 +81,153 @@ For Digest auth use
     auth.password = 'mypass'
 
 For X.509 auth use
-
+ 
     auth = Hashie::Mash.new
     auth.type = 'x509'
     auth.user_cert = '/Path/To/My/usercert.pem'
     auth.user_cert_password = 'MyPassword'
     auth.ca_path = '/Path/To/root-certificates'
 
+#### DSL
+In your scripts, you can use the OCCI client DSL.
+
+To include the DSL definitions in your script use
+
+    extend OCCI::DSL
+
+To connect to an OCCI endpoint/server (e.g. running on http://localhost:3000/ )
+
+    connect('http://localhost:3300',auth||=nil)
+
+To get the list of available resource types or mixin types use
+
+    resource_types
+    mixin_types
+
+To get compute, storage or network descriptions use
+
+    describe "compute"
+    describe "storage"
+    describe "network"
+
+To get the location of compute, storage or network resources use
+
+    list "compute"
+    list "storage"
+    list "network"
+
+To get the identifiers of specific mixins in specific mixin types use
+
+    mixin "my_template", "os_tpl"
+    mixin "small", "resource_tpl"
+
+To get the identifiers of specific mixins with unknown types use
+
+    mixin "medium"
+
+To get mixin descriptions use
+
+    mixin "medium", nil, true
+    mixin "my_template", "os_tpl", true
+
+To get a list of names of all / OS templates / Resource templates mixins use
+
+    mixins
+    mixins "os_tpl"
+    mixins "resource_tpl"
+
+To create a new compute resource use
+
+    os = mixin 'my_os', 'os_tpl'
+    size = mixin 'large', 'resource_tpl'
+    cmpt = resource "compute"
+    cmpt.mixins << os << size
+    cmpt.attributes.occi!.core!.title = "My VM"
+    create cmpt
+
+To get a description of a specific resource use
+
+    describe "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
+    describe "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
+    describe "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+
+To delete a specific resource use
+
+    delete "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
+    delete "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
+    delete "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+
+#### API
+If you need low level access to parts of the OCCI client or need to use more than one instance
+at a time, you should use the OCCI client API directly.
+
 To connect to an OCCI endpoint/server (e.g. running on http://localhost:3000/ )
 
-    client = OCCI::Client.new('http://occi.cloud.gwdg.de:3300',auth||=nil)
+    client = OCCI::Client.new('http://localhost:3300',auth||=nil)
 
 All available categories are automatically registered to the OCCI model during client initialization. You can get them via
 
     client.model
 
-To get all resources (as a list of OCCI::Resources) currently managed by the endpoint use
+To get the list of available resource types or mixin types use
+
+    client.get_resource_types
+    client.get_mixin_types
+
+To get compute, storage or network descriptions use
+
+    client.describe "compute"
+    client.describe "storage"
+    client.describe "network"
 
-    client.get resources
+To get the location of compute, storage or network resources use
 
-To get only compute, storage or network resources use
+    client.list "compute"
+    client.list "storage"
+    client.list "network"
 
-    client.get compute
-    client.get storage
-    client.get network
+To get the identifiers of specific mixins in specific mixin types use
 
-To get the location of all resources use
+    client.find_mixin "my_template", "os_tpl"
+    client.find_mixin "small", "resource_tpl"
 
-    client.list resources
+To get the identifiers of specific mixins with unknown types use
 
-Analogue for compute, storage, network.
+    client.find_mixin "medium"
 
-To get a list of all OS / resource templates use
+To get mixin descriptions use
 
-    client.get_os_templates
-    client.get_resource_templates
+    client.find_mixin "medium", nil, true
+    client.find_mixin "my_template", "os_tpl", true
+
+To get a list of names of all / OS templates / Resource templates mixins use
+
+    client.get_mixins
+    client.get_mixins "os_tpl"
+    client.get_mixins "resource_tpl"
 
 To create a new compute resource use
 
-    os = client.get_os_templates.select { |template| template.term.include? 'my_os' }
-    size = client.get_resource_templates.select { |template| template.term.include? 'large' }
-    cmpt = OCCI::Core::Resource.new compute
+    os = client.find_mixin 'my_os', 'os_tpl'
+    size = client.find_mixin 'large', 'resource_tpl'
+    cmpt = client.get_resource "compute"
     cmpt.mixins << os << size
     cmpt.attributes.occi!.core!.title = "My VM"
     client.create cmpt
 
-### Logging
+To get a description of a specific resource use
+
+    client.describe "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
+    client.describe "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
+    client.describe "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+
+To delete a specific resource use
+
+    client.delete "https://<ENDPOINT>:<PORT>/compute/<OCCI_ID>"
+    client.delete "https://<ENDPOINT>:<PORT>/storage/<OCCI_ID>"
+    client.delete "https://<ENDPOINT>:<PORT>/network/<OCCI_ID>"
+
+#### Logging
 
 The OCCI gem includes its own logging mechanism using a message queue. By default, no one is listening to that queue.
 A new OCCI Logger can be initialized by specifying the log destination (either a filename or an IO object like
@@ -117,7 +241,7 @@ You can always, even if there is no logger defined, log output using the class m
 
     OCCI::Log.info("Test message")
 
-### Registering categories in the OCCI Model
+#### Registering categories in the OCCI Model
 
 Before the parser may be used, the available categories have to be registered in the OCCI Model.
 
@@ -129,7 +253,7 @@ For categories already specified by the OCCI WG a method exists in the OCCI Mode
 Further categories can either be registered from files which include OCCI collections in JSON formator or from parsed
  JSON objects (e.g. from the query interface of an OCCI service endpoint).
 
-### Parsing OCCI messages
+#### Parsing OCCI messages
 
 The OCCI gem includes a Parser to easily parse OCCI messages. With a given media type (e.g. json,
 xml or plain text) the parser analyses the content of the message body and, if supplied,
@@ -139,11 +263,11 @@ category and a message with an entity which has a kind, it has to be specified i
 
 OCCI messages can be parsed to an OCCI collection for example like
 
-    media_type = text/plain
+    media_type = 'text/plain'
     body = %Q|Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind"|
     collection=OCCI::Parser.parse(media_type, body)
 
-### Parsing OVF / OVA files
+#### Parsing OVF / OVA files
 
 Parsing of OVF/OVA files is partly supported and will be improved in future versions.
 
@@ -236,4 +360,4 @@ Install dependencies for deployment
 2. Create a branch (git checkout -b my_markup)
 3. Commit your changes (git commit -am "My changes")
 4. Push to the branch (git push origin my_markup)
-5. Create an Issue with a link to your branch
+5. Create an Issue with a link to your branch

data/bin/occi

@@ -17,13 +17,130 @@
 require 'rubygems'
 require 'occi'
 require 'pp'
-require 'logger'
+require 'highline/import'
+require 'openssl'
 
-include OCCI::DSL
+# OcciOpts is not part of the occi required above
+require 'occi/client/occiopts'
+
+extend OCCI::DSL
+
+# get arguments and validate/parse them to an ostruct
+options = OcciOpts.parse ARGV
+
+# initiate the Logger
+logger = OCCI::Log.new(options.log[:out])
+logger.level = options.log[:level]
+options.log[:logger] = logger
+
+OCCI::Log.info "Starting OCCI client ..."
+OCCI::Log.debug "Options: #{options}"
+
+# running with an empty password?
+if options.auth[:password].nil? or options.auth[:user_cert_password].nil?
+  options.auth[:password] = options.auth[:user_cert_password] = ask("Enter password: ") { |q| q.echo = false } unless options.auth[:type] == "none"
+end
 
 begin
-  puts "This is an OCCI client utility."
+
+  OCCI::Log.info "Establishing a connection to #{options.endpoint} ..."
+  connect options.endpoint, options.auth, options.log, true, options.media_type
+
+  OCCI::Log.info "Executing action #{options.action.to_s} on #{options.resource} ..."
+  case options.action
+  when :list
+
+    if resource_types.include? options.resource or resource_type_identifiers.include? options.resource
+      pp list options.resource
+    elsif mixin_types.include? options.resource
+      pp mixins options.resource
+    elsif mixin_type_identifiers.include? options.resource
+      pp mixins options.resource.split('#').last
+    else 
+      puts "Unknown resource #{options.resource}, there is nothing to list here!"
+    end
+
+  when :describe
+
+    if resource_types.include? options.resource or resource_type_identifiers.include? options.resource or options.resource.start_with? options.endpoint
+      pp describe options.resource
+    elsif mixin_types.include? options.resource
+      mixins(options.resource).each do |mxn|
+        mxn = mxn.split("#").last
+        pp mixin(mxn, options.resource, true)
+      end
+    elsif mixin_type_identifiers.include? options.resource
+      mixins(options.resource.split('#').last).each do |mxn|
+        mxn = mxn.split("#").last
+        pp mixin(mxn, options.resource, true)
+      end
+    elsif mixins.include? options.resource
+      mxn_type,mxn = options.resource.split("/").last.split('#')
+      pp mixin(mxn, mxn_type, true)
+    elsif mixin_types.include? options.resource.split('#').first
+      mxn_type,mxn = options.resource.split('#')
+      pp mixin(mxn, mxn_type, true)
+    else
+      puts "Unknown resource #{options.resource}, there is nothing to describe here!"
+    end
+
+  when :create
+    
+    if resource_types.include? options.resource or resource_type_identifiers.include? options.resource
+      raise "Not yet implemented!" unless options.resource.include? "compute"
+      
+      res = resource options.resource
+
+      OCCI::Log.debug "Creating #{options.resource}:\n#{res.inspect}"
+      OCCI::Log.debug "with mixins:#{options.mixin}"
+      
+      options.mixin.keys.each do |type|
+        OCCI::Log.debug "Adding mixins of type #{type} to #{options.resource}"
+        options.mixin[type].each do |name|
+          mxn = mixin name, type
+
+          raise "Unknown mixin #{type}##{name}, stopping here!" if mxn.nil?
+          OCCI::Log.debug "Adding mixin #{mxn} to #{options.resource}"
+          res.mixins << mxn
+        end
+      end
+
+      #TODO: set other attributes
+      res.attributes.occi!.core!.title = options.resource_title
+
+      puts create res
+    else
+      puts "Unknown resource #{options.resource}, there is nothing to create here!"
+    end
+
+  when :delete
+    result = delete options.resource
+
+    if result
+      puts "Resource #{options.resource} successfully removed!"
+    else
+      puts "Failed to remove resource #{options.resource}!"
+    end
+  when :trigger
+    raise "Not yet implemented!"
+  else
+    raise "Unknown action [#{options.action}]!"
+  end
+
+rescue OpenSSL::SSL::SSLError => ssl_ex
+  OCCI::Log.error "An SSL Auth Error occurred! Please, make sure your credentials are valid and the endpoind is trusted! Message: #{ssl_ex.message}"
+  raise ssl_ex if options.debug
+  exit!
+rescue OpenSSL::PKey::RSAError => key_ex
+  OCCI::Log.error "An X509 Error occurred! Please, check your credentials! Message: #{key_ex.message}"
+  raise key_ex if options.debug
+  exit!
 rescue Exception => ex
-  puts "An error occurred!"
+  OCCI::Log.error "An error occurred! Message: #{ex.message}"
+  raise ex if options.debug
   exit!
 end
+
+OCCI::Log.info "OCCI client is shutting down ..."
+
+exit!(true)

data/examples/x509auth_example.rb

@@ -3,23 +3,24 @@ require 'occi'
 require 'pp'
 
 ## options
-use_os_temlate = true # use OS_TEMPLATE or NETWORK + STORAGE + INSTANCE TYPE
-OS_TEMPLATE = 'monitoring' # name of the VM template in ON
+use_os_temlate = true         # use OS_TEMPLATE or NETWORK + STORAGE + INSTANCE TYPE
+OS_TEMPLATE    = 'monitoring' # name of the VM template in ON
 
-clean_up_compute = true # issue DELETE <RESOURCE> after we are done
+clean_up_compute = true       # issue DELETE <RESOURCE> after we are done
 
-USER_CERT           = ENV['HOME'] + '/.globus/usercred.pem'
+USER_CERT          = ENV['HOME'] + '/.globus/usercred.pem'
 USER_CERT_PASSWORD = 'mypassphrase'
-CA_PATH             = '/etc/grid-security/certificates'
+CA_PATH            = '/etc/grid-security/certificates'
+ENDPOINT           = 'https://localhost:3300'
 
 ## get an OCCI::Client instance
-client = OCCI::Client.new('https://localhost:3300',
-                                 { :type               => "x509",
-                                   :user_cert          => USER_CERT,
-                                   :user_cert_password => USER_CERT_PASSWORD,
-                                   :ca_path            => CA_PATH },
-                                 { :out                => STDERR,
-                                   :level              => OCCI::Log::DEBUG})
+client = OCCI::Client.new(ENDPOINT,
+        { :type               => "x509",
+          :user_cert          => USER_CERT,
+          :user_cert_password => USER_CERT_PASSWORD,
+          :ca_path            => CA_PATH },
+        { :out   => STDERR,
+          :level => OCCI::Log::DEBUG })
 
 puts "\n\nListing all available resource types:"
 client.get_resource_types.each do |type|

data/lib/occi/api/client.rb

@@ -428,12 +428,13 @@ module OCCI
       response = if filter
         categories = filter.categories.collect { |category| category.to_text }.join(',')
         attributes = filter.entities.collect { |entity| entity.attributes.combine.collect { |k, v| k + '=' + v } }.join(',')
+        
         headers = self.class.headers.clone
         headers['Content-Type'] = 'text/occi'
         headers['Category'] = categories unless categories.empty?
         headers['X-OCCI-Attributes'] = attributes unless attributes.empty?
-        self.class.get(@endpoint + path,
-                       :headers => headers)
+
+        self.class.get(@endpoint + path, :headers => headers)
       else
         self.class.get(@endpoint + path)
       end

data/lib/occi/client/occiopts.rb

@@ -0,0 +1,146 @@
+require 'ostruct'
+require 'optparse'
+
+class OcciOpts
+
+  def self.parse(args)
+
+    options = OpenStruct.new
+    
+    options.debug = false
+    options.verbose = false
+    
+    options.log = {}
+    options.log[:out] = STDERR
+    options.log[:level] = OCCI::Log::WARN
+    
+    options.endpoint = "https://localhost:3300/"
+    
+    options.auth = {}
+    options.auth[:type] = "none"
+    options.auth[:user_cert] = ENV['HOME'] + "/.globus/usercred.pem"
+    options.auth[:ca_path] = "/etc/grid-security/certificates"
+    options.auth[:username] = "anonymous"
+    
+    options.media_type = "application/occi+json"
+
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: occi [OPTIONS]"
+
+      opts.separator ""
+      opts.separator "Options:"
+
+      opts.on("--endpoint URI", String, "OCCI server URI, defaults to '#{options.endpoint}'") do |endpoint|
+        options.endpoint = endpoint
+      end
+
+      opts.on("--auth METHOD", [:x509, :basic, :digest, :none], "Authentication method, defaults to '#{options.auth[:type]}'") do |auth|
+        options.auth[:type] = auth.to_s
+      end
+
+      opts.on("--username USER", String, "Username for basic or digest authentication, defaults to '#{options.auth[:username]}'") do |username|
+        options.auth[:username] = username
+      end
+
+      opts.on("--password PASSWORD", String, "Password for basic, digest or x509 authentication") do |password|
+        options.auth[:password] = password
+        options.auth[:user_cert_password] = password
+      end
+
+      opts.on("--ca-path PATH", String, "Path to CA certificates, defaults to '#{options.auth[:ca_path]}'") do |ca_path|
+        options.auth[:ca_path] = ca_path
+      end
+
+      opts.on("--user-cred X509_CREDENTIALS", String, "Path to user's x509 credentials, defaults to '#{options.auth[:user_cert]}'") do |user_cred|
+        options.auth[:user_cert] = user_cred
+      end
+
+      opts.on("--media-type MEDIA_TYPE", ["application/occi+json", "application/occi+xml", "text/plain"], "Media type for client <-> server communication, defaults to '#{options.media_type}'") do |media_type|
+        options.media_type = media_type
+      end
+
+      opts.on("--resource RESOURCE", String, "Resource to be queried (e.g. network, compute, storage etc.), required") do |resource|
+        options.resource = resource
+      end
+
+      opts.on("--resource-title TITLE", String, "Resource title for new resources") do |resource_title|
+        options.resource_title = resource_title
+      end
+
+      opts.on("--action ACTION", [:list, :describe, :create, :delete, :trigger], "Action to be performed on the resource, required") do |action|
+        options.action = action
+      end
+
+      opts.on("--mixin NAME", String, "Type and name of the mixin as TYPE#NAME (e.g. os_tpl#monitoring, resource_tpl#medium)") do |mixin|
+        parts = mixin.split("#")
+
+        raise "Unknown mixin format! Use TYPE#NAME!" unless parts.length == 2
+
+        options.mixin = {} if options.mixin.nil?
+        options.mixin[parts[0]] = [] if options.mixin[parts[0]].nil?
+        options.mixin[parts[0]] << parts[1]
+      end
+
+      opts.on("--trigger-action TRIGGER_ACTION", String, "Action to be triggered on the resource") do |trigger_action|
+        options.trigger_action = trigger_action
+      end
+
+      opts.on("--log-to OUTPUT", [:STDOUT, :stdout, :STDERR, :stderr], "Log to the specified device, defaults to 'STDERR'") do |log_to|
+        options.log[:out] = STDOUT if log_to == :stdout or log_to == :STDOUT
+      end
+
+      opts.on_tail("--debug", "Enable debugging messages") do |debug|
+        options.debug = debug
+        options.log[:level] = OCCI::Log::DEBUG
+      end
+
+      opts.on_tail("--verbose", "Be more verbose, less intrusive than debug mode") do |verbose|
+        options.verbose = verbose
+        options.log[:level] = OCCI::Log::INFO unless options.log[:level] == OCCI::Log::DEBUG
+      end
+
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit!
+      end
+
+      opts.on_tail("--version", "Show version") do
+        puts OCCI::VERSION
+        exit!(true)
+      end
+
+    end
+
+    begin
+      opts.parse!(args)
+    rescue Exception => ex
+      puts ex.message.capitalize
+      puts opts
+      exit!
+    end
+
+    mandatory = []
+
+    if options.action == :trigger
+      mandatory << :trigger_action
+    end
+
+    if options.action == :create
+      mandatory << :mixin << :resource_title
+    end
+
+    mandatory.concat [:resource, :action]
+    
+    options_hash = options.marshal_dump
+
+    missing = mandatory.select{ |param| options_hash[param].nil? }
+    if not missing.empty?
+      puts "Missing required arguments: #{missing.join(', ')}"
+      puts opts
+      exit!
+    end
+
+    options
+  end
+
+end

data/lib/occi/collection.rb

@@ -59,6 +59,13 @@ module OCCI
       text
     end
 
+    def to_header
+      header = Hashie::Mash.new
+      header[:Category] = self.categories.collect {|category| category.to_text}.join(',') if self.categories.any?
+      header = self.entities.first.to_header if self.entities.any?
+      header
+    end
+
     def inspect
       JSON.pretty_generate(JSON.parse(to_json))
     end

data/lib/occi/core/category.rb

@@ -52,6 +52,11 @@ module OCCI
         text
       end
 
+      def to_header
+        header = Hashie::Mash.new
+        header[:Category] = self.to_text
+      end
+
       def inspect
         JSON.pretty_generate(JSON.parse(to_json))
       end

data/lib/occi/core/entity.rb

@@ -167,6 +167,30 @@ module OCCI
         text
       end
 
+      def to_header
+        scheme, term      = self.kind.split('#')
+        header            = Hashie::Mash.new
+        header['Category'] = term + ';scheme=' + scheme.inspect + ';class="kind"'
+        @mixins.each do |mixin|
+          scheme, term      = mixin.split('#')
+          header['Category'] += ',' + term + ';scheme=' + scheme.inspect + ';class="mixin"'
+        end
+        attributes = []
+        @attributes.combine.each_pair do |name, value|
+          name = name.inspect if name.kind_of? String
+          value = value.inspect if value.kind_of? String
+          attributes << name + '=' + value
+        end
+        header['X-OCCI-Attribute'] = attributes.join(',') if attributes.any?
+        links = []
+        @actions.each do |action|
+          _, term = mixin.split('#')
+          links << self.location + '?action=' + term + '>;rel=' + action.inspect
+        end
+        header['Link'] = links.join(',') if links.any?
+        header
+      end
+
       def inspect
         JSON.pretty_generate(JSON.parse(to_json))
       end

data/lib/occi/version.rb

@@ -1,3 +1,3 @@
 module OCCI
-  VERSION = "2.5.7" unless defined?(::OCCI::VERSION)
+  VERSION = "2.5.8" unless defined?(::OCCI::VERSION)
 end

data/occi.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'activesupport'
   gem.add_dependency 'httparty'
+  gem.add_dependency 'highline'
   gem.add_dependency 'i18n'
 
   gem.required_ruby_version     = ">= 1.8.7"
-end
+end

data/spec/occiantlr/parser_spec.rb

@@ -44,9 +44,9 @@ module OCCI
           self_location                                = '/link/networkinterface/456'
           kind                                     = 'http://schemas.ogf.org/occi/infrastructure#networkinterface'
           attributes                                   = Hashie::Mash.new
-          attributes.occi!.networkinterface!.interface = '"eth0"'
-          attributes.occi!.networkinterface!.mac       = '"00:11:22:33:44:55"'
-          attributes.occi!.networkinterface!.state     = '"active"'
+          attributes.occi!.networkinterface!.interface = 'eth0'
+          attributes.occi!.networkinterface!.mac       = '00:11:22:33:44:55'
+          attributes.occi!.networkinterface!.state     = 'active'
           attributes_string                            = %Q{occi.networkinterface.interface="eth0";occi.networkinterface.mac="00:11:22:33:44:55";occi.networkinterface.state="active"}
           link_string                                  = %Q{Link: <#{target}>; rel="#{rel}"; self="#{self_location}"; category="#{kind}"; #{attributes_string}}
 
@@ -62,7 +62,7 @@ module OCCI
       describe "#X-OCCI-Attribute" do
         it "is parsed successful" do
           attribute                             = Hashie::Mash.new
-          attribute.occi!.compute!.architecture = '"x86_64"'
+          attribute.occi!.compute!.architecture = 'x86_64'
 
           x_occi_attributes_string = %Q{X-OCCI-Attribute: occi.compute.architecture="x86_64"}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.5.7
+  version: 2.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -124,6 +124,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  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: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +191,7 @@ files:
 - lib/occi.rb
 - lib/occi/api/client.rb
 - lib/occi/api/dsl.rb
+- lib/occi/client/occiopts.rb
 - lib/occi/collection.rb
 - lib/occi/core.rb
 - lib/occi/core/action.rb