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

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmVhNmZkM2RmN2ZhZjRkOTI1MWYyM2I3YzQyZTk3MjNkYzIzNGJkMA==
+  data.tar.gz: !binary |-
+    NTIyZTVmNDhiZjQ3ZTg2MjVmNThmMTU1OTA3YzZiMzE4NWFlYWMxNQ==
+SHA512:
+  metadata.gz: !binary |-
+    MmNjNjVhNjc2MmQ1MTA5MzRjMTQ1NjRjMGE2OTE3YjIwYzkwZjUxNmU2ODg4
+    MGY5ZjdkMGVkOThiY2VlMDNlMmNmMTQzNDY0Y2QwMzJmMDI4N2Y0MmJiMjhj
+    NDFkNTAyZDk2ZjIxMzhmN2JmN2MwNTAxN2M3ODkyZWRmYjMzZjM=
+  data.tar.gz: !binary |-
+    M2M1MmFjNTZmNzZhMTAwYzhiYTk4ODJjNjE5NzkxNzE2ZmYyNGMwYTQ0Y2Yy
+    NzM3NGMwMWIzZmY3MzI3ZjUzZDZkNzRiOTgxZDkyNmViZDQ1MDdhYzVlODll
+    NDI2Mzc5ZjU1ZTVmMzE5NjdlMmYwMmM1ZjRkZjdkNWY4Zjc1YzE=

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

@@ -9,6 +9,11 @@ module Occi::Cli
       MIXIN_REGEXP = ACTION_REGEXP = /^(\S+?)#(\S+)$/
       CONTEXT_REGEXP = ATTR_REGEXP = /^(\S+?)=(.+)$/
 
+      ATTR_NUM_EXP = /num\((?<number>\d+)\)/
+      ATTR_BOOL_EXP = /bool\((?<bool>true|false)\)/
+      ATTR_FLOAT_EXP = /float\((?<float>\d+\.\d+)\)/
+      ATTR_INVALID_EXP = /num\(.*\)|bool\(.*\)|float\(.*\)/
+
       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
@@ -38,6 +43,7 @@ module Occi::Cli
         raise ArgumentError, "Attribute must always contain ATTR=VALUE pairs!" unless ary.length == 2
 
         ary[0] = "occi.core.#{ary[0]}" unless ary[0].include?('.')
+        ary[1] = parse_attribute_value(ary[1])
         
         ary
       end
@@ -56,6 +62,23 @@ module Occi::Cli
         Occi::Core::Action.new("#{parts[0]}#", parts[1])
       end
 
+      def self.parse_attribute_value(value)
+        result = value
+
+        ATTR_NUM_EXP =~ value
+        result = Regexp.last_match(:number).to_i if Regexp.last_match(:number)
+
+        ATTR_BOOL_EXP =~ value
+        result = (Regexp.last_match(:bool) == 'true' ? true : false) if Regexp.last_match(:bool)
+
+        ATTR_FLOAT_EXP =~ value
+        result = Regexp.last_match(:float).to_f if Regexp.last_match(:float)
+
+        raise ArgumentError, "Failed to cast attribute value #{result.inspect}!" if ATTR_INVALID_EXP =~ result.to_s
+
+        result
+      end
+
     end
   end
 end

data/lib/occi/cli/occi_opts.rb

@@ -362,10 +362,8 @@ module Occi::Cli
       end
 
       if options.action == :create
-        if options.links
+        if options.mixins.blank? && options.resource == 'compute'
           mandatory << :links
-        else
-          mandatory << :mixins
         end
 
         mandatory << :attributes

data/lib/occi/cli/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.6
-  prerelease: 6
+  version: 4.2.0.beta.7
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-08 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
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,26 +105,25 @@ files:
 homepage: https://github.com/gwdg/rOCCI-cli
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Executable OCCI client
 test_files: []