occi-cli 4.2.0.beta.3 → 4.2.0.beta.6

data/bin/occi

@@ -17,6 +17,7 @@
 require 'rubygems'
 require 'pp'
 require 'openssl'
+require 'highline/import'
 
 require 'occi-cli'
 
@@ -40,7 +41,7 @@ if options.auth[:password].nil? || options.auth[:user_cert_password].nil?
   Occi::Log.debug "Password is not set, asking for it now ..."
 
   options.auth[:user_cert_password] = ask("Enter a password: ") {
-      |q| q.echo = false
+      |q| q.echo = '*'
   } unless options.auth[:type] == "none" || (options.auth[:voms] && options.auth[:type] == "x509")
 
   options.auth[:password] = options.auth[:user_cert_password]
@@ -139,14 +140,16 @@ begin
       helper_describe options, output
     when :create
       helper_create options, output
-    when :delete
+    when :link
+      helper_link options, output
+    when :delete, :unlink
       helper_delete options, output
     when :trigger
       helper_trigger options, output
     when :refresh
       refresh
-    when :skip
-      Occi::Log.info "Skipping this action, probably not implemented yet!"
+    when :skip, :test, :dry_run
+      Occi::Log.info "Just a connection test ..."
     else
       raise "Unknown action [#{options.action}]!"
   end

data/lib/occi/cli/helpers.rb

@@ -9,4 +9,5 @@ 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
+extend Occi::Cli::Helpers::TriggerHelper
+extend Occi::Cli::Helpers::LinkHelper

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

@@ -18,19 +18,16 @@ module Occi::Cli::Helpers::CreateHelper
   def helper_create_resource(options)
     Occi::Log.debug "#{options.resource.inspect} is a resource type."
 
-    # TODO: implement the rest
-    raise "Not yet implemented!" unless options.resource.include? "compute"
-
     res = resource(options.resource)
 
     Occi::Log.debug "Creating #{options.resource.inspect}: #{res.inspect}"
 
-    helper_attach_mixins(options, res)
+    helper_create_attach_mixins(options, res)
 
     if res.kind_of? Occi::Infrastructure::Compute
-      helper_attach_links(options, res)
+      helper_create_attach_links(options, res)
       # TODO: context vars are only attributes!
-      helper_attach_context_vars(options, res)
+      helper_create_attach_context_vars(options, res)
     end
 
     options.attributes.names.each_pair do |attribute, value|
@@ -50,7 +47,7 @@ module Occi::Cli::Helpers::CreateHelper
     create res
   end
 
-  def helper_attach_links(options, res)
+  def helper_create_attach_links(options, res)
     return unless options.links
     Occi::Log.debug "with links: #{options.links.inspect}"
 
@@ -71,7 +68,7 @@ module Occi::Cli::Helpers::CreateHelper
     end
   end
 
-  def helper_attach_mixins(options, res)
+  def helper_create_attach_mixins(options, res)
     return unless options.mixins
     Occi::Log.debug "with mixins: #{options.mixins.inspect}"
 
@@ -86,7 +83,7 @@ module Occi::Cli::Helpers::CreateHelper
     end
   end
 
-  def helper_attach_context_vars(options, res)
+  def helper_create_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.inspect}"

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

@@ -7,7 +7,7 @@ module Occi::Cli::Helpers::DescribeHelper
       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."
+      Occi::Log.debug "#{options.resource.inspect} is a mixin type or type identifier."
 
       found = Occi::Core::Mixins.new
       found.merge mixins(options.resource)

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

@@ -0,0 +1,76 @@
+module Occi::Cli::Helpers::LinkHelper
+
+  def helper_link(options, output = nil)
+    location = nil
+
+    unless options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
+      raise "Given resource is not a valid instance URL! #{options.resource.inspect}"
+    end
+
+    unless options.links.length == 1
+      raise "You can assign only one link at a time!"
+    end
+
+    link = sanitize_instance_link(options.links.first)
+    unless link.start_with?('/')
+      raise "Given link is not a valid instance URL! #{link.inspect}"
+    end
+
+    link_kind = helper_link_kind(options, link)
+    location = helper_link_create_link(options, link_kind, link)
+
+    return location if output.nil?
+
+    puts location
+  end
+
+  def helper_link_kind(options, link)
+    raise "No valid links given!" if link.blank?
+
+    case link
+    when /\/network\//
+      link_kind = model.get_by_id("http://schemas.ogf.org/occi/infrastructure#networkinterface")
+      raise "#{options.endpoint.inspect} does not support networkinterface links!" unless link_kind
+    when /\/storage\//
+      link_kind = model.get_by_id("http://schemas.ogf.org/occi/infrastructure#storagelink")
+      raise "#{options.endpoint.inspect} does not support storagelink links!" unless link_kind
+    else
+      raise "Unknown link target #{link.inspect}! Only network and storage targets are supported!"
+    end
+
+    link_kind
+  end
+
+  def helper_link_create_link(options, link_kind, link)
+    Occi::Log.debug "Linking #{link.inspect} to #{options.resource.inspect}"
+
+    link_instance = Occi::Core::Link.new(link_kind)
+    link_instance.source = sanitize_instance_link(options.resource)
+    link_instance.target = link
+
+    helper_link_attach_mixins(options.mixins, link_instance)
+
+    options.attributes.names.each_pair do |attribute, value|
+      link_instance.attributes[attribute.to_s] = value
+    end
+
+    create link_instance
+  end
+
+  def helper_link_attach_mixins(mixins, link)
+    return if mixins.blank?
+
+    Occi::Log.debug "with mixins: #{mixins.inspect}"
+
+    mixins.to_a.each do |mxn|
+      Occi::Log.debug "Adding mixin #{mxn.inspect} to #{link.inspect}"
+
+      mxn = model.get_by_id(mxn.type_identifier)
+      raise Occi::Cli::Errors::MixinLookupError,
+            "The specified mixin is not declared in the model! #{mxn.type_identifier.inspect}" if mxn.blank?
+
+      link.mixins << mxn
+    end
+  end
+
+end

data/lib/occi/cli/occi_opts.rb

@@ -1,7 +1,9 @@
-require 'ostruct'
 require 'optparse'
 require 'uri'
-require 'base64'
+require 'erb'
+
+# load all parts of OcciOpts
+Dir[File.join(File.dirname(__FILE__), 'occi_opts', '*.rb')].each { |file| require file.gsub('.rb', '') }
 
 module Occi::Cli
 
@@ -9,64 +11,21 @@ module Occi::Cli
 
     AUTH_METHODS = [:x509, :basic, :digest, :none].freeze
     MEDIA_TYPES = ["application/occi+json", "application/occi+xml", "text/plain,text/occi", "text/plain"].freeze
-    ACTIONS = [:list, :describe, :create, :delete, :trigger].freeze
+    ACTIONS = [:list, :describe, :create, :delete, :trigger, :link, :unlink].freeze
     LOG_OUTPUTS = [:stdout, :stderr].freeze
-    ALLOWED_CONTEXT_VARS = [:public_key, :user_data].freeze
     LOG_LEVELS = [:debug, :error, :fatal, :info, :unknown, :warn].freeze
 
-    MIXIN_REGEXP = /^(https?:\/\/\S+?)#(\S+)$/
-    CONTEXT_REGEXP = ATTR_REGEXP = /^(.+?)=(.+)$/
+    REQ_CREATE_ATTRS = ["occi.core.title"].freeze
 
     def self.parse(args, test_env = false)
 
       @@quiet = test_env
 
-      options = OpenStruct.new
-      
-      options.debug = false
-      
-      options.log = {}
-      options.log[:out] = STDERR
-      options.log[:level] = Occi::Log::ERROR
-
-      options.filter = nil
-      options.dump_model = false
-
-      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.auth[:ca_file] = nil
-      options.auth[:voms] = nil
-
-      options.output_format = :plain
-
-      options.mixins = Occi::Core::Mixins.new
-      options.links = nil
-      options.attributes = Occi::Core::Attributes.new
-      options.context_vars = nil
-      
-      # TODO: change media type back to occi+json after the rOCCI-server update
-      #options.media_type = "application/occi+json"
-      options.media_type = "text/plain,text/occi"
+      options = Hashie::Mash.new
+      set_defaults(options)
 
       opts = OptionParser.new do |opts|
-        opts.banner = %{Usage: occi [OPTIONS]
-
-Examples:
-
-occi --endpoint https://localhost:3300/ --action list --resource os_tpl --auth x509
-
-occi --endpoint https://localhost:3300/ --action list --resource resource_tpl --auth x509
-
-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 --attribute title="My rOCCI VM" --auth x509
-
-occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd4f654sf65g4-s5fg65sfg465sfg-sf65g46sf5g4sdfg --auth x509}
+        opts.banner = %{Usage: occi [OPTIONS]}
 
         opts.separator ""
         opts.separator "Options:"
@@ -81,33 +40,35 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
         opts.on("-n",
                 "--auth METHOD",
                 AUTH_METHODS,
-                "Authentication method, defaults to '#{options.auth[:type]}'") do |auth|
-          options.auth[:type] = auth.to_s
+                "Authentication method, only: [#{AUTH_METHODS.join('|')}], defaults " \
+                "to '#{options.auth.type}'") do |auth|
+          options.auth.type = auth.to_s
         end
 
         opts.on("-u",
                 "--username USER",
                 String,
-                "Username for basic or digest authentication, defaults to '#{options.auth[:username]}'") do |username|
-          options.auth[:username] = username
+                "Username for basic or digest authentication, defaults to " \
+                "'#{options.auth.username}'") do |username|
+          options.auth.username = username
         end
 
         opts.on("-p",
                 "--password PASSWORD",
                 String,
                 "Password for basic, digest and x509 authentication") do |password|
-          options.auth[:password] = password
-          options.auth[:user_cert_password] = password
+          options.auth.password = password
+          options.auth.user_cert_password = password
         end
 
         opts.on("-c",
                 "--ca-path PATH",
                 String,
-                "Path to CA certificates directory, defaults to '#{options.auth[:ca_path]}'") do |ca_path|
+                "Path to CA certificates directory, defaults to '#{options.auth.ca_path}'") do |ca_path|
           raise ArgumentError, "Path specified in --ca-path is not a directory!" unless File.directory? ca_path
           raise ArgumentError, "Path specified in --ca-path is not readable!" unless File.readable? ca_path
 
-          options.auth[:ca_path] = ca_path
+          options.auth.ca_path = ca_path
         end
 
         opts.on("-f",
@@ -117,116 +78,98 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
           raise ArgumentError, "File specified in --ca-file is not a file!" unless File.file? ca_file
           raise ArgumentError, "File specified in --ca-file is not readable!" unless File.readable? ca_file
 
-          options.auth[:ca_file] = ca_file
+          options.auth.ca_file = ca_file
         end
 
         opts.on("-F",
                 "--filter CATEGORY",
                 String,
-                "Category type identifier to filter categories from model, must be used together with the -m option") do |filter|
+                "Category type identifier to filter categories from model, must " \
+                "be used together with the -m option") do |filter|
           options.filter = filter
         end
 
         opts.on("-x",
                 "--user-cred FILE",
                 String,
-                "Path to user's x509 credentials, defaults to '#{options.auth[:user_cert]}'") do |user_cred|
+                "Path to user's x509 credentials, defaults to '#{options.auth.user_cert}'") do |user_cred|
           raise ArgumentError, "File specified in --user-cred is not a file!" unless File.file? user_cred
           raise ArgumentError, "File specified in --user-cred is not readable!" unless File.readable? user_cred
 
-          options.auth[:user_cert] = user_cred
+          options.auth.user_cert = user_cred
         end
 
         opts.on("-X",
                 "--voms",
                 "Using VOMS credentials; modifies behavior of the X509 authN module") do |voms|
 
-          options.auth[:voms] = true
+          options.auth.voms = true
         end
 
         opts.on("-y",
                 "--media-type MEDIA_TYPE",
                 MEDIA_TYPES,
-                "Media type for client <-> server communication, defaults to '#{options.media_type}'") do |media_type|
+                "Media type for client <-> server communication, only: [#{MEDIA_TYPES.join('|')}], " \
+                "defaults to '#{options.media_type}'") do |media_type|
           options.media_type = media_type
         end
 
         opts.on("-r",
                 "--resource RESOURCE",
                 String,
-                "Resource to be queried (e.g. network, compute, storage etc.), required") do |resource|
+                "Term, identifier or URI of a resource to be queried, required") do |resource|
           options.resource = resource
         end
 
         opts.on("-t",
                 "--attribute ATTRS",
                 Array,
-                "Comma separated attributes for new resources such as occi.core.title=\"Name\", required") do |attributes|
+                "Comma separated attributes for new resource instances, mandatory: " \
+                "[#{REQ_CREATE_ATTRS.join(', ')}]") do |attributes|
           options.attributes ||= Occi::Core::Attributes.new
 
           attributes.each do |attribute|
-            ary = ATTR_REGEXP.match(attribute).to_a.drop 1
-            raise ArgumentError, "Attribute must always contain ATTR=VALUE pairs!" unless ary.length == 2
-
-            ary[0] = "occi.core.#{ary[0]}" unless ary[0].include?('.')
-            options.attributes[ary[0]] = ary[1]
+            key, value = Occi::Cli::OcciOpts::Helper.parse_attribute(attribute)
+            options.attributes[key] = value
           end
         end
 
         opts.on("-T",
                 "--context CTX_VARS",
                 Array,
-                "Comma separated context variables for new compute resources such as public_key=\"ssh-rsa dfsdf...adfdf== user@localhost\"") do |context|
+                "Comma separated context variables for new 'compute' resource instances, " \
+                "only: [#{Occi::Cli::OcciOpts::Helper::ALLOWED_CONTEXT_VARS.join(', ')}]") do |context|
           options.context_vars ||= {}
 
           context.each do |ctx|
-            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)
-              context_data = ary[1]
-              if context_data.gsub!(/^file:\/\//,'')
-                raise 'File does not exist! #{context_data}' unless File.exist? context_data
-                context_data = File.read(context_data)
-              end
-
-              if symbol == :user_data
-                context_data = Base64.encode64(context_data).gsub("\n", '')
-              end
-
-              options.context_vars[symbol] = context_data.strip
-            else
-              Occi::Log.warn "Only #{ALLOWED_CONTEXT_VARS.join(', ')} context variables are supported! Skipping #{ary[0].to_s} ..."
-            end
+            key, value = Occi::Cli::OcciOpts::Helper.parse_context_variable(ctx)
+            options.context_vars[key] = value
           end
         end
 
         opts.on("-a",
                 "--action ACTION",
                 ACTIONS,
-                "Action to be performed on the resource, required") do |action|
+                "Action to be performed on a resource instance, required") do |action|
           options.action = action
         end
 
         opts.on("-M",
-                "--mixin NAME",
+                "--mixin IDENTIFIER",
                 Array,
-                "Type and name of the mixin as SCHEME#NAME (e.g. http://localhost/os_tpl#monitoring, http://localhost/resource_tpl#medium)") do |mixins|
+                "Identifier of a mixin, formatted as SCHEME#TERM or SHORT_SCHEME#TERM") do |mixins|
           options.mixins ||= Occi::Core::Mixins.new
 
           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 << Occi::Core::Mixin.new("#{parts[0]}#", parts[1])
+            options.mixins << Occi::Cli::OcciOpts::Helper.parse_mixin(mixin)
           end
         end
 
         opts.on("-j",
                 "--link URI",
                 Array,
-                "Link specified resource to the resource being created, only for action CREATE and resource COMPUTE") do |links|
+                "Link this resource to the resource being created, only for action " \
+                "'create' and resource 'compute'") do |links|
           options.links ||= []
 
           links.each do |link|
@@ -237,32 +180,49 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
         end
 
         opts.on("-g",
-                "--trigger-action TRIGGER",
+                "--trigger-action TRIGGER_ACTION",
                 String,
-                "Action to be triggered on the resource") do |trigger_action|
-          options.trigger_action = trigger_action
+                "Action to be triggered on the resource, formatted as SCHEME#TERM or SHORT_SCHEME#TERM") do |trigger_action|
+          options.trigger_action = Occi::Cli::OcciOpts::Helper.parse_action(trigger_action)
         end
 
         opts.on("-l",
                 "--log-to OUTPUT",
                 LOG_OUTPUTS,
-                "Log to the specified device, defaults to 'STDERR'") do |log_to|
-          options.log[:out] = STDOUT if log_to == :stdout or log_to == :STDOUT
+                "Log to the specified device, only: [#{LOG_OUTPUTS.join('|')}], defaults to 'stderr'") do |log_to|
+          options.log.out = STDOUT if log_to.to_s == "stdout"
         end
 
         opts.on("-o",
                 "--output-format FORMAT",
                 Occi::Cli::ResourceOutputFactory.allowed_formats,
-                "Output format, defaults to human-readable 'plain'") do |output_format|
+                "Output format, only: [#{Occi::Cli::ResourceOutputFactory.allowed_formats.join('|')}], " \
+                "defaults to '#{options.output_format}'") do |output_format|
           options.output_format = output_format
         end
 
         opts.on("-b",
                 "--log-level LEVEL",
                 LOG_LEVELS,
-                "Set the specified logging level, less intrusive than debug mode") do |log_level|
-          unless options.log[:level] == Occi::Log::DEBUG
-            options.log[:level] = Occi::Log.const_get(log_level.to_s.upcase)
+                "Set the specified logging level, only: [#{LOG_LEVELS.join('|')}]") do |log_level|
+          unless options.log.level == Occi::Log::DEBUG
+            options.log.level = Occi::Log.const_get(log_level.to_s.upcase)
+          end
+        end
+
+        opts.on_tail("-z",
+                     "--examples",
+                     "Show usage examples") do |examples|
+          if examples
+            if @@quiet
+              exit true
+            else
+              file = "#{File.expand_path('..', __FILE__)}/occi_opts/cli_examples.erb"
+              template = ERB.new(File.new(file).read, nil, '-')
+
+              puts template.result(binding)
+              exit! true
+            end
           end
         end
 
@@ -276,7 +236,7 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
                      "--debug",
                      "Enable debugging messages") do |debug|
           options.debug = debug
-          options.log[:level] = Occi::Log::DEBUG
+          options.log.level = Occi::Log::DEBUG
         end
 
         opts.on_tail("-h",
@@ -327,7 +287,52 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
 
     private
 
+    def self.set_defaults(options)
+      options.debug = false
+
+      options.log = {}
+      options.log.out = STDERR
+      options.log.level = Occi::Log::ERROR
+
+      options.filter = nil
+      options.dump_model = false
+
+      options.endpoint = "http://localhost:3000"
+
+      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.auth.ca_file = nil
+      options.auth.voms = nil
+
+      options.output_format = :plain
+
+      options.mixins = Occi::Core::Mixins.new
+      options.links = nil
+      options.attributes = Occi::Core::Attributes.new
+      options.context_vars = nil
+
+      # TODO: change media type back to occi+json after the rOCCI-server update
+      #options.media_type = "application/occi+json"
+      options.media_type = "text/plain,text/occi"
+
+      options
+    end
+
     def self.check_restrictions(options, opts)
+      check_incompatible_args(options, opts)
+
+      return if options.dump_model
+
+      mandatory = get_mandatory_args(options)
+      check_hash(options, mandatory, opts)
+
+      check_attributes(options.attributes, REQ_CREATE_ATTRS, opts) if options.action == :create
+    end
+
+    def self.check_incompatible_args(options, opts)
       if !options.dump_model && options.filter
         if @@quiet
           exit false
@@ -338,7 +343,7 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
         end
       end
 
-      if options.voms && options.auth[:type] != "x509"
+      if options.voms && options.auth.type != "x509"
         if @@quiet
           exit false
         else
@@ -347,9 +352,9 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
           exit!
         end
       end
+    end
 
-      return if options.dump_model
-
+    def self.get_mandatory_args(options)
       mandatory = []
 
       if options.action == :trigger
@@ -364,17 +369,15 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
         end
 
         mandatory << :attributes
-        check_attrs = true
       end
 
-      mandatory.concat [:resource, :action]
+      if options.action == :link
+        mandatory << :links
+      end
 
-      check_hash options, mandatory, opts
+      mandatory.concat [:resource, :action]
 
-      if check_attrs
-        mandatory = ["occi.core.title"]
-        check_attributes options.attributes, mandatory, opts
-      end
+      mandatory
     end
 
     def self.check_hash(hash, mandatory, opts)

data/lib/occi/cli/occi_opts/cli_examples.erb

@@ -0,0 +1,11 @@
+Examples:
+
+occi --endpoint https://localhost:3300/ --action list --resource os_tpl --auth x509
+
+occi --endpoint https://localhost:3300/ --action list --resource resource_tpl --auth x509
+
+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 --attribute title="My rOCCI VM" --auth x509
+
+occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd4f654sf65g4-s5fg65sfg465sfg-sf65g46sf5g4sdfg --auth x509

data/lib/occi/cli/occi_opts/occi_opts_helper.rb

@@ -0,0 +1,61 @@
+require 'base64'
+
+module Occi::Cli
+  class OcciOpts
+    module Helper
+
+      ALLOWED_CONTEXT_VARS = [:public_key, :user_data].freeze
+
+      MIXIN_REGEXP = ACTION_REGEXP = /^(\S+?)#(\S+)$/
+      CONTEXT_REGEXP = ATTR_REGEXP = /^(\S+?)=(.+)$/
+
+      def self.parse_context_variable(cvar)
+        ary = CONTEXT_REGEXP.match(cvar).to_a.drop 1
+        raise ArgumentError, "Context variables must always contain ATTR=VALUE pairs!" unless ary.length == 2
+
+        symbol = ary[0].to_sym
+        unless ALLOWED_CONTEXT_VARS.include?(symbol)
+          raise ArgumentError,
+                "Only #{ALLOWED_CONTEXT_VARS.join(', ')} context " \
+                "variables are supported! #{symbol.to_s.inspect}"
+        end
+
+        context_data = ary[1]
+        if context_data.gsub!(/^file:\/\//,'')
+          raise 'File does not exist! #{context_data}' unless File.exist? context_data
+          context_data = File.read(context_data)
+        end
+
+        if symbol == :user_data
+          context_data = Base64.encode64(context_data).gsub("\n", '')
+        end
+
+        [symbol, context_data.strip]
+      end
+
+      def self.parse_attribute(attribute)
+        ary = ATTR_REGEXP.match(attribute).to_a.drop 1
+        raise ArgumentError, "Attribute must always contain ATTR=VALUE pairs!" unless ary.length == 2
+
+        ary[0] = "occi.core.#{ary[0]}" unless ary[0].include?('.')
+        
+        ary
+      end
+
+      def self.parse_mixin(mixin)
+        parts = MIXIN_REGEXP.match(mixin).to_a.drop(1)
+        raise "Unknown mixin format '#{mixin.inspect}'! Use SCHEME#TERM or SHORT_SCHEME#TERM!" unless parts.length == 2
+
+        Occi::Core::Mixin.new("#{parts[0]}#", parts[1])
+      end
+
+      def self.parse_action(action)
+        parts = ACTION_REGEXP.match(action).to_a.drop(1)
+        raise "Unknown action format '#{action.inspect}'! Use SCHEME#TERM or SHORT_SCHEME#TERM!" unless parts.length == 2
+
+        Occi::Core::Action.new("#{parts[0]}#", parts[1])
+      end
+
+    end
+  end
+end

data/lib/occi/cli/version.rb

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

data/occi-cli.gemspec

@@ -19,8 +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.2.0.beta.2'
+  gem.add_dependency 'occi-api', '= 4.2.0.beta.6'
   gem.add_dependency 'json'
+  gem.add_dependency 'highline'
 
   gem.required_ruby_version     = ">= 1.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.3
+  version: 4.2.0.beta.6
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.2
+        version: 4.2.0.beta.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.2
+        version: 4.2.0.beta.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,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'
 description: This gem is a client implementation of the Open Cloud Computing Interface
   in Ruby
 email:
@@ -78,9 +94,12 @@ files:
 - 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/link_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/occi_opts/cli_examples.erb
+- lib/occi/cli/occi_opts/occi_opts_helper.rb
 - lib/occi/cli/resource_output_factory.rb
 - lib/occi/cli/templates/mixins.erb
 - lib/occi/cli/templates/resources.erb