occi-cli 4.1.0 → 4.2.0.beta.2

data/Gemfile

@@ -5,4 +5,10 @@ gemspec
 group :development do
   gem 'warbler', :git => 'git://github.com/jruby/warbler.git', :ref => 'ce3ce4df137504822e4cbb9399dee7e7dd767c44'
   gem 'rubygems-tasks', :git => 'git://github.com/postmodern/rubygems-tasks.git'
+  gem "rspec"
+  gem "rake"
+  gem "builder"
+  gem "simplecov"
+  gem "yard"
+  gem "yard-rspec"
 end

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-cli#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-cli#RVM](#rvm) and install RVM with a newer Ruby version.**
 
 To use rOCCI-cli with Java, you need JRE 6 or 7. To build rOCCI-cli for Java, you need JDK 6 or 7.
 
@@ -51,13 +61,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-cli 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
-    rvm use 1.9.3 --default
+**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
 
@@ -70,11 +75,7 @@ To build and install the bleeding edge version from master
 
 ### From source, for Java
 
-To use rOCCI-cli with Java 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 jruby
-    rvm use jruby --default
+**Notice:** In order to build rOCCI-cli for Java, you need working jRuby installation. We recommend using [rOCCI-cli#RVM](#rvm).
 
 To build a Java jar file from master use
 
@@ -86,7 +87,25 @@ To build a Java jar file from master use
 
 For Linux / Mac OS X you can create a OCCI Java executable from the jar file using
 
-    sudo echo '#!/usr/bin/java -jar' | cat - occi.jar > occi ; sudo chmod +x occi
+    sudo echo '#!/usr/bin/java -jar' | cat - occi-cli.jar > occi ; sudo chmod +x occi
+
+### 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
 -----

data/bin/occi

@@ -15,13 +15,11 @@
 #--------------------------------------------------------------------------- #
 
 require 'rubygems'
-require 'occi-cli'
 require 'pp'
 require 'highline/import'
 require 'openssl'
 
-extend Occi::Api::Dsl
-extend Occi::Cli::Helpers
+require 'occi-cli'
 
 # get arguments and validate/parse them to an ostruct
 options = Occi::Cli::OcciOpts.parse ARGV
@@ -144,7 +142,11 @@ begin
     options.resource = nil
 
     # offer just the resource types we will be able to process
-    menu_resources = Occi::Cli::ResourceOutputFactory.allowed_resource_types
+    menu_resources = []
+    menu_resources << resource_type_identifiers.select { |i| i.include?("infrastructure#") }
+    menu_resources << ["http://schemas.ogf.org/occi/infrastructure#os_tpl", "http://schemas.ogf.org/occi/infrastructure#resource_tpl"]
+    menu_resources.flatten!
+    menu_resources.uniq!
 
     # separate menus from each other
     say("\n")
@@ -241,17 +243,12 @@ begin
           number_of_mixins = ask("How many mixins do you wish me to mix into this resource? ",
                                  Integer) { |q| q.in = 0..2 }
 
-          options.mixins = {}
+          options.mixins = Occi::Core::Mixins.new
           (1..number_of_mixins).each do |mixin_number|
-            mixin = ask("What mixin should I mix in? ") { |q| q.validate = /^\S+?#\S+$/ }
+            mixin = ask("What mixin should I mix in? ") { |q| q.validate = Occi::Cli::OcciOpts::MIXIN_REGEXP }
             parts = mixin.split("#")
 
-            # TODO: find a way to remove this OCCI-OS compatibility hack
-            parts[0] = 'os_tpl' if parts[0] == 'os'
-            parts[0] = 'resource_tpl' if parts[0] == 'resource'
-
-            options.mixins[parts[0]] = [] unless options.mixins[parts[0]]
-            options.mixins[parts[0]] << parts[1]
+            options.mixins << Occi::Core::Mixin.new("#{parts[0]}#", parts[1])
           end
         end
       }

data/lib/occi/cli/errors/formatter_input_type_error.rb

@@ -0,0 +1,5 @@
+module Occi::Cli::Errors
+
+  class FormatterInputTypeError < ArgumentError; end
+
+end

data/lib/occi/cli/errors/formatter_output_type_error.rb

@@ -0,0 +1,5 @@
+module Occi::Cli::Errors
+
+  class FormatterOutputTypeError < ArgumentError; end
+
+end

data/lib/occi/cli/errors.rb

@@ -0,0 +1,4 @@
+module Occi::Cli::Errors; end
+
+# load all
+Dir[File.join(File.dirname(__FILE__), 'errors', '*.rb')].each { |file| require file.gsub('.rb', '') }

data/lib/occi/cli/helpers/common_helper.rb

@@ -0,0 +1,5 @@
+module Occi::Cli::Helpers::CommonHelper
+
+  # nothing here
+
+end

data/lib/occi/cli/helpers/create_helper.rb

@@ -0,0 +1,103 @@
+module Occi::Cli::Helpers::CreateHelper
+
+  def helper_create(options, output = nil)
+    location = nil
+
+    if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource)
+      Occi::Log.debug "#{options.resource.inspect} is a resource type."
+      raise "Not yet implemented!" unless options.resource.include? "compute"
+
+      res = resource options.resource
+
+      Occi::Log.debug "Creating #{options.resource.inspect}:\n#{res.inspect}"
+
+      helper_attach_links(options, res)
+      helper_attach_mixins(options, res)
+      helper_attach_context_vars(options, res)
+
+      # TODO: set other attributes
+      # TODO: OCCI-OS uses occi.compute.hostname instead of title
+      res.title = options.attributes[:title]
+      res.hostname = options.attributes[:title]
+
+      Occi::Log.debug "Creating #{options.resource.inspect}:\n#{res.inspect}"
+
+      location = create res
+    else
+      Occi::Log.warn "I have no idea what #{options.resource.inspect} is ..."
+      raise "Unknown resource #{options.resource.inspect}, there is nothing to create here!"
+    end
+
+    return location if output.nil?
+
+    puts location
+  end
+
+  def helper_attach_links(options, res)
+    return unless options.links
+    Occi::Log.debug "with links: #{options.links.inspect}"
+
+    options.links.each do |link|
+      if link.start_with? options.endpoint
+        link.gsub!(options.endpoint.chomp('/'), '')
+      end
+
+      if link.include? "/storage/"
+        Occi::Log.debug "Adding storagelink to #{options.resource.inspect}"
+        res.storagelink link
+      elsif link.include? "/network/"
+        Occi::Log.debug "Adding networkinterface to #{options.resource.inspect}"
+        res.networkinterface link
+      else
+        raise "Unknown link type #{link.inspect}, stopping here!"
+      end
+    end
+  end
+
+  def helper_attach_mixins(options, res)
+    return unless options.mixins
+    Occi::Log.debug "with mixins: #{options.mixins}"
+
+    options.mixins.to_a.each do |mxn|
+      Occi::Log.debug "Adding mixin #{mxn.inspect} to #{options.resource.inspect}"
+      res.mixins << mxn
+    end
+  end
+
+  def helper_attach_context_vars(options, res)
+    # TODO: find a better/universal way to do contextualization
+    return unless options.context_vars
+    Occi::Log.debug "with context variables: #{options.context_vars}"
+
+    options.context_vars.each_pair do |var, val|
+      schema = nil
+      mxn_attrs = Occi::Core::Attributes.new
+
+      case var
+      when :public_key
+        schema = "http://schemas.openstack.org/instance/credentials#"
+        mxn_attrs['org.openstack.credentials.publickey.name'] = {}
+        mxn_attrs['org.openstack.credentials.publickey.data'] = {}
+      when :user_data
+        schema = "http://schemas.openstack.org/compute/instance#"
+        mxn_attrs['org.openstack.compute.user_data'] = {}
+      else
+        schema = "http://schemas.ogf.org/occi/core#"
+      end
+
+      mxn = Occi::Core::Mixin.new(schema, var.to_s, 'OS contextualization mixin', mxn_attrs)
+      res.mixins << mxn
+
+      case var
+      when :public_key
+        res.attributes['org.openstack.credentials.publickey.name'] = 'Public SSH key'
+        res.attributes['org.openstack.credentials.publickey.data'] = val
+      when :user_data
+        res.attributes['org.openstack.compute.user_data'] = val
+      else
+        # do nothing
+      end
+    end
+  end
+
+end

data/lib/occi/cli/helpers/delete_helper.rb

@@ -0,0 +1,23 @@
+module Occi::Cli::Helpers::DeleteHelper
+
+  def helper_delete(options, output = nil)
+    unless resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) || options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
+      message = "Resource #{options.resource.inspect} cannot be deleted!"
+
+      Occi::Log.error message
+      raise ArgumentError, message
+    end
+
+    if delete(options.resource)
+      Occi::Log.info "Resource #{options.resource.inspect} successfully removed!"
+    else
+      message = "Failed to remove resource #{options.resource.inspect}!"
+
+      Occi::Log.error message
+      raise message
+    end
+
+    true
+  end
+
+end

data/lib/occi/cli/helpers/describe_helper.rb

@@ -0,0 +1,28 @@
+module Occi::Cli::Helpers::DescribeHelper
+
+  def helper_describe(options, output = nil)
+    if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) || options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
+      Occi::Log.debug "#{options.resource.inspect} is a resource type, type identifier or an actual resource."
+
+      found = Occi::Core::Resources.new
+      found.merge describe(options.resource)
+    elsif mixin_types.include?(options.resource) || mixin_type_identifiers.include?(options.resource)
+      Occi::Log.debug "#{options.resourcre.inspect} is a mixin type or type identifier."
+
+      found = Occi::Core::Mixins.new
+      found.merge mixins(options.resource)
+    else
+      Occi::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      raise "Unknown resource #{options.resource.inspect}, there is nothing to describe here!"
+    end
+
+    helper_describe_output(found, options, output)
+  end
+
+  def helper_describe_output(found, options, output)
+    return found unless output
+
+    puts output.format(found)
+  end
+
+end

data/lib/occi/cli/helpers/list_helper.rb

@@ -0,0 +1,26 @@
+module Occi::Cli::Helpers::ListHelper
+
+  def helper_list(options, output = nil)
+    found = []
+
+    if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource)
+      Occi::Log.debug "#{options.resource.inspect} is a resource type."
+      found = list options.resource
+    elsif mixin_types.include?(options.resource) || mixin_type_identifiers.include?(options.resource)
+      Occi::Log.debug "#{options.resource.inspect} is a mixin type."
+      found = mixin_list options.resource
+    else
+      Occi::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      raise "Unknown resource #{options.resource.inspect}, there is nothing to list here!"
+    end
+
+    helper_list_output(found, options, output)
+  end
+
+  def helper_list_output(found, options, output)
+    return found unless output
+
+    puts output.format(found)
+  end
+
+end

data/lib/occi/cli/helpers/trigger_helper.rb

@@ -0,0 +1,7 @@
+module Occi::Cli::Helpers::TriggerHelper
+
+  def helper_trigger(options, output = nil)
+    raise "Not yet implemented!"
+  end
+
+end

data/lib/occi/cli/helpers.rb

@@ -1,212 +1,12 @@
 # a bunch of OCCI client helpers for bin/occi
-module Occi::Cli
-  module Helpers
+module Occi::Cli::Helpers; end
 
-    def helper_list(options, output = nil)
-      found = []
+# load all
+Dir[File.join(File.dirname(__FILE__), 'helpers', '*.rb')].each { |file| require file.gsub('.rb', '') }
 
-      if resource_types.include? options.resource
-        Occi::Log.debug "#{options.resource} is a resource type."
-        found = list options.resource
-      elsif mixin_types.include? options.resource
-        Occi::Log.debug "#{options.resource} is a mixin type."
-        found = mixins options.resource
-      else
-        Occi::Log.warn "I have no idea what #{options.resource} is ..."
-        raise "Unknown resource #{options.resource}, there is nothing to list here!"
-      end
-
-      helper_list_output(found, options, output)
-    end
-
-    def helper_list_output(found, options, output)
-      return found unless output
-
-      helper_formatter_output(found, output, :locations, options.resource.to_sym)
-
-      nil
-    end
-
-    def helper_describe(options, output = nil)
-      found = []
-
-      if resource_types.include?(options.resource) || options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
-        Occi::Log.debug "#{options.resource} is a resource type or an actual resource."
-
-        found = describe(options.resource)
-      elsif mixin_types.include? options.resource
-        Occi::Log.debug "#{options.resourcre} is a mixin type."
-
-        mixins(options.resource).each do |mxn|
-          mxn = mxn.split("#").last
-          found << mixin(mxn, options.resource, true)
-        end
-      elsif mixin_types.include? options.resource.split('#').first
-        Occi::Log.debug "#{options.resource} is a specific mixin type."
-
-        mxn_type,mxn = options.resource.split('#')
-        found << mixin(mxn, mxn_type, true)
-      else
-        Occi::Log.warn "I have no idea what #{options.resource} is ..."
-        raise "Unknown resource #{options.resource}, there is nothing to describe here!"
-      end
-
-      helper_describe_output(found, options, output)
-    end
-
-    def helper_describe_output(found, options, output)
-      return found unless output
-
-      if options.resource.start_with? options.endpoint
-        # resource contains full endpoint URI
-        # e.g., http://localhost:3300/network/adfgadf-daf5a6df4afadf-adfad65f4ad
-        resource_type = options.resource.split('/')[3].to_sym
-      elsif options.resource.start_with? '/'
-        # resource contains a path relative to endpoint URI
-        # e.g., /network/adfgadf-daf5a6df4afadf-adfad65f4ad
-        resource_type = options.resource.split('/')[1].to_sym
-      elsif mixin_types.include? options.resource.split('#').first
-        # resource contains a mixin with a type
-        # e.g., os_tpl#debian6
-        resource_type = options.resource.split('#').first.to_sym
-      else
-        # resource probably contains RAW resource_type
-        resource_type = options.resource.to_sym
-      end
-
-      helper_formatter_output(found, output, :resources, resource_type)
-
-      nil
-    end
-
-    def helper_create(options, output = nil)
-      location = nil
-
-      if resource_types.include? options.resource
-        Occi::Log.debug "#{options.resource} is a resource type."
-        raise "Not yet implemented!" unless options.resource.include? "compute"
-
-        res = resource options.resource
-
-        Occi::Log.debug "Creating #{options.resource}:\n#{res.inspect}"
-
-        helper_attach_links(options, res)
-        helper_attach_mixins(options, res)
-        helper_attach_context_vars(options, res)
-
-        # TODO: set other attributes
-        # TODO: OCCI-OS uses occi.compute.hostname instead of title
-        res.title = options.attributes[:title]
-        res.hostname = options.attributes[:title]
-
-        Occi::Log.debug "Creating #{options.resource}:\n#{res.inspect}"
-
-        location = create res
-      else
-        Occi::Log.warn "I have no idea what #{options.resource} is ..."
-        raise "Unknown resource #{options.resource}, there is nothing to create here!"
-      end
-
-      return location if output.nil?
-
-      puts location
-    end
-
-    def helper_attach_links(options, res)
-      return unless options.links
-      Occi::Log.debug "with links: #{options.links}"
-
-      options.links.each do |link|
-        if link.start_with? options.endpoint
-          link.gsub!(options.endpoint.chomp('/'), '')
-        end
-
-        if link.include? "/storage/"
-          Occi::Log.debug "Adding storagelink to #{options.resource}"
-          res.storagelink link
-        elsif link.include? "/network/"
-          Occi::Log.debug "Adding networkinterface to #{options.resource}"
-          res.networkinterface link
-        else
-          raise "Unknown link type #{link}, stopping here!"
-        end
-      end
-    end
-
-    def helper_attach_mixins(options, res)
-      return unless options.mixins
-      Occi::Log.debug "with mixins: #{options.mixins}"
-
-      options.mixins.keys.each do |type|
-        Occi::Log.debug "Adding mixins of type #{type} to #{options.resource}"
-
-        options.mixins[type].each do |name|
-          mxn = mixin name, type
-
-          raise "Unknown mixin #{type}##{name}, stopping here!" unless mxn
-          Occi::Log.debug "Adding mixin #{mxn} to #{options.resource}"
-          res.mixins << mxn
-        end
-      end
-    end
-
-    def helper_attach_context_vars(options, res)
-      # TODO: find a better/universal way to do contextualization
-      return unless options.context_vars
-      Occi::Log.debug "with context variables: #{options.context_vars}"
-
-      options.context_vars.each_pair do |var, val|
-        schema = nil
-        mxn_attrs = Occi::Core::Attributes.new
-
-        case var
-        when :public_key
-          schema = "http://schemas.openstack.org/instance/credentials#"
-          mxn_attrs['org.openstack.credentials.publickey.name'] = {}
-          mxn_attrs['org.openstack.credentials.publickey.data'] = {}
-        when :user_data
-          schema = "http://schemas.openstack.org/compute/instance#"
-          mxn_attrs['org.openstack.compute.user_data'] = {}
-        else
-          schema = "http://schemas.ogf.org/occi/core#"
-        end
-
-        mxn = Occi::Core::Mixin.new(schema, var.to_s, 'OS contextualization mixin', mxn_attrs)
-        res.mixins << mxn
-
-        case var
-        when :public_key
-          res.attributes['org.openstack.credentials.publickey.name'] = 'Public SSH key'
-          res.attributes['org.openstack.credentials.publickey.data'] = val
-        when :user_data
-          res.attributes['org.openstack.compute.user_data'] = val
-        else
-          # do nothing
-        end
-      end
-    end
-
-    def helper_delete(options, output = nil)
-      if delete(options.resource)
-        Occi::Log.info "Resource #{options.resource} successfully removed!"
-      else
-        raise "Failed to remove resource #{options.resource}!"
-      end
-
-      true
-    end
-
-    def helper_trigger(options, output = nil)
-      raise "Not yet implemented!"
-    end
-
-    def helper_formatter_output(found, output, format_symbol, resource_type)
-      if Occi::Cli::ResourceOutputFactory.allowed_resource_types.include? resource_type
-        puts output.format(found, format_symbol, resource_type)
-      else
-        Occi::Log.warn "Not printing, resource type [#{resource_type.to_s}] is not supported!"
-      end
-    end
-
-  end
-end
+extend Occi::Cli::Helpers::CommonHelper
+extend Occi::Cli::Helpers::ListHelper
+extend Occi::Cli::Helpers::DescribeHelper
+extend Occi::Cli::Helpers::CreateHelper
+extend Occi::Cli::Helpers::DeleteHelper
+extend Occi::Cli::Helpers::TriggerHelper

data/lib/occi/cli/occi_opts.rb

@@ -15,6 +15,9 @@ module Occi::Cli
     LOG_OUTPUTS = [:stdout, :stderr].freeze
     ALLOWED_CONTEXT_VARS = [:public_key, :user_data].freeze
 
+    MIXIN_REGEXP = /^(https?:\/\/\S+?)#(\S+)$/
+    CONTEXT_REGEXP = ATTR_REGEXP = /^(.+?)=(.+)$/
+
     def self.parse(args, test_env = false)
 
       @@quiet = test_env
@@ -45,7 +48,7 @@ module Occi::Cli
 
       options.output_format = :plain
 
-      options.mixins = nil
+      options.mixins = Occi::Core::Mixins.new
       options.links = nil
       options.attributes = nil
       options.context_vars = nil
@@ -66,7 +69,7 @@ occi --endpoint https://localhost:3300/ --action list --resource resource_tpl --
 
 occi --endpoint https://localhost:3300/ --action describe --resource os_tpl#debian6 --auth x509
 
-occi --endpoint https://localhost:3300/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attributes title="My rOCCI VM" --auth x509
+occi --endpoint https://localhost:3300/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attribute title="My rOCCI VM" --auth x509
 
 occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd4f654sf65g4-s5fg65sfg465sfg-sf65g46sf5g4sdfg --auth x509}
 
@@ -163,22 +166,18 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
                 "--resource RESOURCE",
                 String,
                 "Resource to be queried (e.g. network, compute, storage etc.), required") do |resource|
-          # TODO: find a way to remove this OCCI-OS compatibility hack
-          resource = 'os_tpl' if resource == 'os'
-          resource = 'resource_tpl' if resource == 'resource'
-
           options.resource = resource
         end
 
         opts.on("-t",
-                "--attributes ATTRS",
+                "--attribute ATTRS",
                 Array,
                 "Comma separated attributes for new resources such as title=\"Name\", required") do |attributes|
-          options.attributes = {}
+          options.attributes ||= {}
 
           attributes.each do |attribute|
-            ary = /^(.+?)=(.+)$/.match(attribute).to_a.drop 1
-            raise ArgumentError, "Attributes must always contain ATTR=VALUE pairs!" if ary.length != 2
+            ary = ATTR_REGEXP.match(attribute).to_a.drop 1
+            raise ArgumentError, "Attribute must always contain ATTR=VALUE pairs!" unless ary.length == 2
 
             options.attributes[ary[0].to_sym] = ary[1]
           end
@@ -187,12 +186,12 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
         opts.on("-T",
                 "--context CTX_VARS",
                 Array,
-                "Comma separated context variables for new compute resources such as SSH_KEY=\"ssh-rsa dfsdf...adfdf== user@localhost\"") do |context|
-          options.context_vars = {}
+                "Comma separated context variables for new compute resources such as public_key=\"ssh-rsa dfsdf...adfdf== user@localhost\"") do |context|
+          options.context_vars ||= {}
 
           context.each do |ctx|
-            ary = /^(.+?)=(.+)$/.match(ctx).to_a.drop 1
-            raise ArgumentError, "Context variables must always contain ATTR=VALUE pairs!" if ary.length != 2
+            ary = CONTEXT_REGEXP.match(ctx).to_a.drop 1
+            raise ArgumentError, "Context variables must always contain ATTR=VALUE pairs!" unless ary.length == 2
 
             symbol = ary[0].to_sym
             if ALLOWED_CONTEXT_VARS.include?(symbol)
@@ -222,32 +221,29 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
 
         opts.on("-M",
                 "--mixin NAME",
-                String,
-                "Type and name of the mixin as TYPE#NAME (e.g. os_tpl#monitoring, resource_tpl#medium)") do |mixin|
-          parts = /^(\S+?)#(\S+)$/.match(mixin)
-          raise "Unknown mixin format! Use TYPE#NAME!" unless parts
-
-          parts = parts.to_a.drop(1)
+                Array,
+                "Type and name of the mixin as SCHEME#NAME (e.g. http://localhost/os_tpl#monitoring, http://localhost/resource_tpl#medium)") do |mixins|
+          options.mixins ||= Occi::Core::Mixins.new
 
-          # TODO: find a way to remove this OCCI-OS compatibility hack
-          parts[0] = 'os_tpl' if parts[0] == 'os'
-          parts[0] = 'resource_tpl' if parts[0] == 'resource'
+          mixins.each do |mixin|
+            parts = MIXIN_REGEXP.match(mixin).to_a.drop(1)
+            raise "Unknown mixin format #{mixin.inspect}! Use SCHEME#NAME!" unless parts.length == 2
 
-          options.mixins = {} unless options.mixins
-          options.mixins[parts[0]] = [] unless options.mixins[parts[0]]
-          options.mixins[parts[0]] << parts[1]
+            options.mixins << Occi::Core::Mixin.new("#{parts[0]}#", parts[1])
+          end
         end
 
         opts.on("-j",
                 "--link URI",
-                String,
-                "Link specified resource to the resource being created, only for action CREATE and resource COMPUTE") do |link|
-          link_relative_path = URI(link).path
-
-          raise ArgumentError, "Specified link URI is not valid!" unless link_relative_path.start_with? '/'
+                Array,
+                "Link specified resource to the resource being created, only for action CREATE and resource COMPUTE") do |links|
+          options.links ||= []
 
-          options.links = [] unless options.links
-          options.links << link_relative_path
+          links.each do |link|
+            link_relative_path = URI(link).path
+            raise ArgumentError, "Specified link URI is not valid!" unless link_relative_path.start_with? '/'
+            options.links << link_relative_path
+          end
         end
 
         opts.on("-g",

data/lib/occi/cli/resource_output_factory.rb

@@ -6,108 +6,83 @@ module Occi::Cli
   class ResourceOutputFactory
 
     @@allowed_formats = [:json, :plain, :json_pretty].freeze
-    @@allowed_resource_types = [:compute, :storage, :network, :os_tpl, :resource_tpl].freeze
-    @@allowed_data_types = [:locations, :resources].freeze
 
     attr_reader :output_format
 
     def initialize(output_format = :plain)
-      raise "Unsupported output format!" unless @@allowed_formats.include? output_format
+      raise Occi::Cli::Errors::FormatterOutputTypeError,
+            "Format #{output_format.inspect} is not supported!" unless @@allowed_formats.include? output_format
       @output_format = output_format
     end
 
-    def format(data, data_type, resource_type)
-      raise "Data has to be in an array!" unless data.is_a? Array
-      raise "Unsupported resource type! Got: #{resource_type.to_s}" unless @@allowed_resource_types.include? resource_type
-      raise "Unsupported data type! Got: #{data_type.to_s}" unless @@allowed_data_types.include? data_type
-
-      # validate incoming data
-      if data_type == :resources
-        data.each do |occi_collection|
-          raise "I need the resources to be in a Collection!" unless occi_collection.respond_to? :as_json
-        end
+    def format(data)
+      # construct a method name from data type and output format
+      if data.kind_of? Occi::Core::Resources
+        method = "resources_to_#{@output_format}".to_sym
+      elsif data.kind_of? Occi::Core::Mixins
+        method = "mixins_to_#{@output_format}".to_sym
+      elsif data.kind_of? Array
+        raise Occi::Cli::Errors::FormatterInputTypeError,
+              "Arrays with #{data.first.class.name.inspect} are not supported!" unless data.first.nil? || data.first.kind_of?(String)
+        method = "locations_to_#{@output_format}".to_sym
+      else
+        raise Occi::Cli::Errors::FormatterInputTypeError,
+              "Data format #{data.class.name.inspect} is not supported!"
       end
 
-      # construct method name from data type and output format
-      method = (data_type.to_s + "_to_" + output_format.to_s).to_sym
-
-      send method, data, resource_type
+      send method, data
     end
 
     def self.allowed_formats
       @@allowed_formats
     end
 
-    def self.allowed_resource_types
-      @@allowed_resource_types
-    end
-
-    def self.allowed_data_types
-      @@allowed_data_types
+    def resources_to_json(occi_resources)
+      # generate JSON document from Occi::Core::Resources
+      if @output_format == :json_pretty
+        JSON.pretty_generate occi_resources.as_json
+      else
+        JSON.generate occi_resources.as_json
+      end
     end
+    alias_method :resources_to_json_pretty, :resources_to_json
+    alias_method :mixins_to_json, :resources_to_json
+    alias_method :mixins_to_json_pretty, :resources_to_json
 
-    def resources_to_json(occi_resources, resource_type)
-      # generate JSON document from an array of JSON objects
+    def locations_to_json(url_locations)
+      # generate JSON document from an array of strings
       if @output_format == :json_pretty
-        JSON.pretty_generate occi_resources
+        JSON.pretty_generate locations
       else
-        JSON.generate occi_resources
+        JSON.generate locations
       end
     end
-    alias_method :resources_to_json_pretty, :resources_to_json
+    alias_method :locations_to_json_pretty, :locations_to_json
 
-    def resources_to_plain(occi_resources, resource_type)
+    def resources_to_plain(occi_resources)
       # using ERB templates for known resource and mixin types
-      file = "#{File.expand_path('..', __FILE__)}/templates/#{resource_type.to_s}.erb"
+      file = "#{File.expand_path('..', __FILE__)}/templates/resources.erb"
       template = ERB.new(File.new(file).read, nil, '-')
 
-      formatted_output = "\n"
-
-      occi_resources.each do |occi_resource|
-        json_resource = occi_resource.as_json
-        next unless json_resource
-
-        if json_resource.resources && json_resource.resources.first
-          attributes = json_resource.resources.first.attributes
-          next unless attributes && attributes.occi
-
-          links = json_resource.links || []
-        end
-
-        formatted_output << template.result(binding)
-      end
+      formatted_output = ""
+      formatted_output << template.result(binding) unless occi_resources.blank?
 
       formatted_output
     end
 
-    def locations_to_json(url_locations, resource_type)
-      # give all locatios a common key and convert to JSON
-      locations = { resource_type => [] }
+    def mixins_to_plain(occi_resources)
+      # using ERB templates for known resource and mixin types
+      file = "#{File.expand_path('..', __FILE__)}/templates/mixins.erb"
+      template = ERB.new(File.new(file).read, nil, '-')
 
-      url_locations.each do |location|
-        location = location.split("/").last if [:os_tpl, :resource_tpl].include? resource_type
-        locations[resource_type] << location
-      end
+      formatted_output = ""
+      formatted_output << template.result(binding) unless occi_resources.blank?
 
-      # generate JSON document from an array of strings
-      if @output_format == :json_pretty
-        JSON.pretty_generate locations
-      else
-        JSON.generate locations
-      end
+      formatted_output
     end
-    alias_method :locations_to_json_pretty, :locations_to_json
-
-    def locations_to_plain(url_locations, resource_type)
-      # just an attempt to make the array more readable 
-      output = "\n#{resource_type.to_s.capitalize} locations:\n"
-
-      url_locations.each do |location|
-        location = location.split("/").last if [:os_tpl, :resource_tpl].include? resource_type
-        output << "\t" << location << "\n"
-      end
 
-      "#{output}\n"
+    def locations_to_plain(url_locations)
+      url_locations.join("\n")
     end
 
   end

data/lib/occi/cli/templates/mixins.erb

@@ -0,0 +1,9 @@
+<%- # We always get Occi::Core::Mixins -%>
+<%- occi_resources.each do |mixin| -%>
+[<%= mixin.type_identifier %>]
+	Title:        <%= mixin.title %>
+	Term:         <%= mixin.term %>
+	Location:     <%= mixin.location %>
+
+
+<%- end -%>

data/lib/occi/cli/templates/resources.erb

@@ -0,0 +1,25 @@
+<%- # We always get Occi::Core::Resources -%>
+<%- occi_resources.each do |resource| -%>
+[<%= resource.kind.type_identifier %>]
+    <%- resource.attributes.names.each_pair do |attribute, value| -%>
+    <%= attribute %> = <%= value %>
+    <%- end -%>
+
+    <%- resource.links.each do |link| -%>
+    [<%= link.kind.type_identifier %>]
+        <%- link.attributes.names.each_pair do |attribute, value| -%>
+        <%= attribute %> = <%= value %>
+        <%- end -%>
+
+    <%- end -%>
+
+    <%- resource.mixins.each do |mixin| -%>
+    [<%= mixin.type_identifier %>]
+        Title:        <%= mixin.title %>
+        Term:         <%= mixin.term %>
+        Location:     <%= mixin.location %>
+
+    <%- end -%>
+
+
+<%- end -%>

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.1.0" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.0.beta.2" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/lib/occi-cli.rb

@@ -4,6 +4,12 @@ require 'occi-api'
 module Occi::Cli; end
 
 require 'occi/cli/version'
+require 'occi/cli/errors'
 require 'occi/cli/occi_opts'
 require 'occi/cli/resource_output_factory'
+
+# get DSL definitions
+extend Occi::Api::Dsl
+
+# include helpers
 require 'occi/cli/helpers'

data/occi-cli.gemspec

@@ -19,18 +19,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'occi-api', '~> 4.1.0'
+  gem.add_dependency 'occi-api', '= 4.2.0.beta.2'
   gem.add_dependency 'highline'
   gem.add_dependency 'json'
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "builder"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "yard"
-  gem.add_development_dependency "yard-sinatra"
-  gem.add_development_dependency "yard-rspec"
-  gem.add_development_dependency "yard-cucumber"
-
   gem.required_ruby_version     = ">= 1.9.3"
 end

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
-require 'occi-cli'
 
 # enable coverage reports
 if ENV['COVERAGE']
   require 'simplecov'
+
+  SimpleCov.add_filter "/spec/"
   SimpleCov.start
 end
 
+require 'occi-cli'
+
 RSpec.configure do |c|
   # in RSpec 3 this will no longer be necessary.
   c.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.0
-  prerelease: 
+  version: 4.2.0.beta.2
+  prerelease: 6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -11,24 +11,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0.beta.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -61,134 +61,6 @@ dependencies:
     - - ! '>='
       - !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-sinatra
-  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'
-- !ruby/object:Gem::Dependency
-  name: yard-cucumber
-  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: This gem is a client implementation of the Open Cloud Computing Interface
   in Ruby
 email:
@@ -213,14 +85,20 @@ files:
 - config/warble.rb
 - doc/macosx.md
 - lib/occi-cli.rb
+- lib/occi/cli/errors.rb
+- lib/occi/cli/errors/formatter_input_type_error.rb
+- lib/occi/cli/errors/formatter_output_type_error.rb
 - lib/occi/cli/helpers.rb
+- lib/occi/cli/helpers/common_helper.rb
+- lib/occi/cli/helpers/create_helper.rb
+- lib/occi/cli/helpers/delete_helper.rb
+- lib/occi/cli/helpers/describe_helper.rb
+- lib/occi/cli/helpers/list_helper.rb
+- lib/occi/cli/helpers/trigger_helper.rb
 - lib/occi/cli/occi_opts.rb
 - lib/occi/cli/resource_output_factory.rb
-- lib/occi/cli/templates/compute.erb
-- lib/occi/cli/templates/network.erb
-- lib/occi/cli/templates/os_tpl.erb
-- lib/occi/cli/templates/resource_tpl.erb
-- lib/occi/cli/templates/storage.erb
+- lib/occi/cli/templates/mixins.erb
+- lib/occi/cli/templates/resources.erb
 - lib/occi/cli/version.rb
 - occi-cli.gemspec
 - spec/occi/cli/helpers_spec.rb
@@ -243,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/occi/cli/templates/compute.erb

@@ -1,22 +0,0 @@
-<%- # We always get a JSON -%>
-COMPUTE:
-  ID:       <%= attributes.occi.core.id %>
-  TITLE:    <%= attributes.occi.core.title || attributes.occi.compute.hostname %>
-  STATE:    <%= attributes.occi.compute.state %>
-  MEMORY:   <%= attributes.occi.compute.memory %> GB
-  CORES:    <%= attributes.occi.compute.cores %>
-  LINKS:
-  <%- links.each do |link| -%>
-    <%- next unless link && link.attributes -%>
-
-    LINK "<%= link.kind %>":
-      ID:          <%= link.attributes.occi.core.id %>
-      TITLE:       <%= link.attributes.occi.core.title || link.target.split('/').last %>
-      TARGET:      <%= link.target %>
-      <% if link.attributes.occi.networkinterface %>
-      IP ADDRESS:  <%= link.attributes.occi.networkinterface.address %>
-      MAC ADDRESS: <%= link.attributes.occi.networkinterface.mac %>
-      <% elsif link.attributes.occi.storagelink %>
-      MOUNT POINT: <%= link.attributes.occi.storagelink.deviceid %>
-      <%- end -%>
-  <% end if links %>

data/lib/occi/cli/templates/network.erb

@@ -1,8 +0,0 @@
-<%- # We always get a JSON -%>
-NETWORK:
-  ID:           <%= attributes.occi.core.id %>
-  TITLE:        <%= attributes.occi.core.title || attributes.occi.network.label %>
-  STATE:        <%= attributes.occi.network.state %>
-  ALLOCATION:   <%= attributes.occi.network.allocation || (attributes.occi.networkinterface && attributes.occi.networkinterface.allocation) %>
-  ADDRESS:      <%= attributes.occi.network.address || (attributes.occi.networkinterface && attributes.occi.networkinterface.address) %>
-

data/lib/occi/cli/templates/os_tpl.erb

@@ -1,6 +0,0 @@
-<%- # We always get a JSON -%>
-OS_TPL:
-  TITLE:        <%= json_resource.title %>
-  TERM:         <%= json_resource.term %>
-  LOCATION:     <%= json_resource.location %>
-

data/lib/occi/cli/templates/resource_tpl.erb

@@ -1,6 +0,0 @@
-<%- # We always get a JSON -%>
-RESOURCE_TPL:
-  TITLE:        <%= json_resource.title %>
-  TERM:         <%= json_resource.term %>
-  LOCATION:     <%= json_resource.location %>
-

data/lib/occi/cli/templates/storage.erb

@@ -1,7 +0,0 @@
-<%- # We always get a JSON -%>
-STORAGE:
-  ID:           <%= attributes.occi.core.id %>
-  TITLE:        <%= attributes.occi.core.title %>
-  STATE:        <%= attributes.occi.storage.state%>
-  DESCRIPTION:  <%= attributes.occi.core.summary %>
-