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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmVhNmZkM2RmN2ZhZjRkOTI1MWYyM2I3YzQyZTk3MjNkYzIzNGJkMA==
+    ZGEwNjllMjkwNjhmZWM1N2RmNjNkNzRjYWZmM2FmODZlMTg2N2FjMA==
   data.tar.gz: !binary |-
-    NTIyZTVmNDhiZjQ3ZTg2MjVmNThmMTU1OTA3YzZiMzE4NWFlYWMxNQ==
+    ZDNjOTJjMjNmZjU1NTE3NjhiNmNkMDgzYzZkNWIwZTZjOTFlNWI5OA==
 SHA512:
   metadata.gz: !binary |-
-    MmNjNjVhNjc2MmQ1MTA5MzRjMTQ1NjRjMGE2OTE3YjIwYzkwZjUxNmU2ODg4
-    MGY5ZjdkMGVkOThiY2VlMDNlMmNmMTQzNDY0Y2QwMzJmMDI4N2Y0MmJiMjhj
-    NDFkNTAyZDk2ZjIxMzhmN2JmN2MwNTAxN2M3ODkyZWRmYjMzZjM=
+    NjdkNmI5MWM1ZGIwMTI3ZjJjYjM1NWJiN2ZmYTEzYTA4MDZhM2I1MTE2ZGYw
+    ZGJiMDU5ODE3MjlkNzAzOWI3Njg1OTk2NWZkYWJlODMwNTg1N2FiYmViODAx
+    Zjg2NDRjMDM0MDBjYzhlZTliZjJiYzZkYjY0MzRhNjljNDU2ZTg=
   data.tar.gz: !binary |-
-    M2M1MmFjNTZmNzZhMTAwYzhiYTk4ODJjNjE5NzkxNzE2ZmYyNGMwYTQ0Y2Yy
-    NzM3NGMwMWIzZmY3MzI3ZjUzZDZkNzRiOTgxZDkyNmViZDQ1MDdhYzVlODll
-    NDI2Mzc5ZjU1ZTVmMzE5NjdlMmYwMmM1ZjRkZjdkNWY4Zjc1YzE=
+    NTFjZTUyZTU1NWMzMjljMzE0NTk4NzIzMWY3MzM1MGRlNTlkOGJkNjQyNmE0
+    OTNiNGFhNzIyZGU0NDBkZTdjMzEwMjU3NTlkNWY5Yzc3Nzg4MzJkZjM5ZGM3
+    ZjgwY2E3ZDgyNWNmOTA5ZTk3YmI2NTZiNWE0YTFlYTFjNmQwOWE=

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

@@ -75,11 +75,14 @@ module Occi::Cli::Helpers::CreateHelper
     options.mixins.to_a.each do |mxn|
       Occi::Log.debug "Adding mixin #{mxn.inspect} to #{options.resource.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?
+      orig_mxn = model.get_by_id(mxn.type_identifier)
+      if orig_mxn.blank?
+        orig_mxn = mixin(mxn.term, mxn.scheme.chomp('#'), true)
+        raise Occi::Cli::Errors::MixinLookupError,
+            "The specified mixin is not declared in the model! #{mxn.type_identifier.inspect}" if orig_mxn.blank?
+      end
 
-      res.mixins << mxn
+      res.mixins << orig_mxn
     end
   end
 

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

@@ -9,8 +9,19 @@ module Occi::Cli::Helpers::DescribeHelper
     elsif mixin_types.include?(options.resource) || mixin_type_identifiers.include?(options.resource)
       Occi::Log.debug "#{options.resource.inspect} is a mixin type or type identifier."
 
+      found = mixins(options.resource)
+      found = mixins(options.resource, true) if found.blank?
+    elsif options.resource.include?('#')
+      Occi::Log.debug "#{options.resource.inspect} might be a specific mixin identifier."
+
+      potential_mixin = options.resource.split('/').last.split('#')
+      raise "Given resource is not a specific mixin identifier! #{options.resource.inspect}" unless potential_mixin.size == 2
+
+      mxn = mixin(potential_mixin[1], potential_mixin[0], true)
+      raise "Given mixin could not be found in the model! #{options.resource.inspect}" if mxn.blank?
+
       found = Occi::Core::Mixins.new
-      found.merge mixins(options.resource)
+      found << mxn
     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!"

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

@@ -65,11 +65,14 @@ module Occi::Cli::Helpers::LinkHelper
     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
+      orig_mxn = model.get_by_id(mxn.type_identifier)
+      if orig_mxn.blank?
+        orig_mxn = mixin(mxn.term, mxn.scheme.chomp('#'), true)
+        raise Occi::Cli::Errors::MixinLookupError,
+            "The specified mixin is not declared in the model! #{mxn.type_identifier.inspect}" if orig_mxn.blank?
+      end
+
+      link.mixins << orig_mxn
     end
   end
 

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

@@ -1,11 +1,75 @@
-Examples:
+<%- ENDPOINT = 'http://localhost:3000/' -%>
+# Examples
 
-occi --endpoint https://localhost:3300/ --action list --resource os_tpl --auth x509
+## Quick reference guide
 
-occi --endpoint https://localhost:3300/ --action list --resource resource_tpl --auth x509
+occi --endpoint <%= ENDPOINT -%> --action list --resource os_tpl
+occi --endpoint <%= ENDPOINT -%> --action list --resource resource_tpl
+occi --endpoint <%= ENDPOINT -%> --action describe --resource os_tpl#debian6
+occi --endpoint <%= ENDPOINT -%> --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attribute title="My rOCCI VM"
+occi --endpoint <%= ENDPOINT -%> --action delete --resource /compute/65sd4f654sf65g4-s5fg65sfg465sfg-sf65g46sf5g4sdfg
 
-occi --endpoint https://localhost:3300/ --action describe --resource os_tpl#debian6 --auth x509
+## Listing resources
+<% %w(compute network storage os_tpl resource_tpl).each do |res| %>
+occi --endpoint <%= ENDPOINT -%> --action list --resource <%= res -%>
+<% end %>
 
-occi --endpoint https://localhost:3300/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attribute title="My rOCCI VM" --auth x509
+## Describing resources
+<% %w(compute network storage os_tpl resource_tpl).each do |res| %>
+occi --endpoint <%= ENDPOINT -%> --action describe --resource <%= res -%>
+<% end %>
+
+## Creating resources
+<% %w(compute network storage).each do |res| %>
+occi --endpoint <%= ENDPOINT -%> --action create [ --attribute attribute_name='attribute_value' ]+ [ --mixin mixin_type#mixin_term ]+ --resource <%= res -%>
+<% if res == 'compute' %>
+occi --endpoint <%= ENDPOINT -%> --action create [ --attribute attribute_name='attribute_value' ]+ [ --link /resource_type/instance_id ]+ --resource <%= res -%>
+<% end -%>
+<% end %>
+
+## Linking/unlinking resources
+<% %w(compute).each do |res| %>
+<%- %w(network storage).each do |res_link| -%>
+occi --endpoint <%= ENDPOINT -%> --action link --resource /<%= res -%>/instance_id --link /<%= res_link -%>/instance_id
+<%- end -%>
+<% end -%>
+
+## Deleting resources
+<% %w(compute network storage).each do |res| %>
+occi --endpoint <%= ENDPOINT -%> --action delete --resource <%= res -%>
+<% end %>
+
+## Triggering actions on resources
+<% %w(compute network storage).each do |res| %>
+occi --endpoint <%= ENDPOINT -%> --action trigger --trigger-action action_type#action_term [ --attribute attribute_name='attribute_value' ]+ --resource <%= res -%>
+<% end %>
+
+## Other
+
+### Authentication
+
+occi --endpoint <%= ENDPOINT -%> [ --auth none ]
+occi --endpoint <%= ENDPOINT -%> --auth basic [ --username user ] [ --password pass ]
+occi --endpoint <%= ENDPOINT -%> --auth digest [ --username user ] [ --password pass ]
+occi --endpoint <%= ENDPOINT -%> --auth x509 [ --user-cred /home/user/.globus/usercred.pem ] [ --ca-file /etc/grid-security/certificates/ca.pem ] [ --ca-path /etc/grid-security/certificates ] [ --voms ] [ --password pass ]
+occi --endpoint <%= ENDPOINT -%> --auth x509 --user-cred /home/user/.globus/usercred.pem
+occi --endpoint <%= ENDPOINT -%> --auth x509 --user-cred /tmp/x509_1000 --voms
+occi --endpoint <%= ENDPOINT -%> --auth x509 --user-cred /tmp/x509_1000 --ca-path /etc/grid-security/certificates --voms
+
+### Media types
+<% Occi::Cli::OcciOpts::MEDIA_TYPES.each do |mt| %>
+occi --endpoint <%= ENDPOINT -%> [ ... ] --media-type <%= mt -%>
+<% end %>
+
+### Output formats
+<% Occi::Cli::ResourceOutputFactory.allowed_formats.each do |af| %>
+occi --endpoint <%= ENDPOINT -%> [ ... ] --output-format <%= af -%>
+<% end %>
+
+### Attribute values (type-casting)
+
+occi --endpoint <%= ENDPOINT -%> [ ... ] --attribute attribute_name='attribute_value'
+occi --endpoint <%= ENDPOINT -%> [ ... ] --attribute attribute_name='num(attribute_value)'
+occi --endpoint <%= ENDPOINT -%> [ ... ] --attribute attribute_name='float(attribute_value)'
+occi --endpoint <%= ENDPOINT -%> [ ... ] --attribute attribute_name='bool(attribute_value)'
 
-occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd4f654sf65g4-s5fg65sfg465sfg-sf65g46sf5g4sdfg --auth x509

data/lib/occi/cli/occi_opts.rb

@@ -168,8 +168,7 @@ module Occi::Cli
         opts.on("-j",
                 "--link URI",
                 Array,
-                "Link this resource to the resource being created, only for action " \
-                "'create' and resource 'compute'") do |links|
+                "URI of an instance to be linked with the given resource, applicable for actions 'create' and 'link'") do |links|
           options.links ||= []
 
           links.each do |link|
@@ -180,7 +179,7 @@ module Occi::Cli
         end
 
         opts.on("-g",
-                "--trigger-action TRIGGER_ACTION",
+                "--trigger-action ACTION",
                 String,
                 "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)

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

@@ -1,9 +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 %>
-
-
+<%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %>
+[[ <%= mixin.type_identifier %> ]]
+title:        <%= mixin.title %>
+term:         <%= mixin.term %>
+location:     <%= mixin.location %>
+<%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %>
 <%- end -%>

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

@@ -1,25 +1,26 @@
 <%- # We always get Occi::Core::Resources -%>
 <%- occi_resources.each do |resource| -%>
-[<%= resource.kind.type_identifier %>]
+<%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %>
+[[ <%= resource.kind.type_identifier %> ]]
     <%- resource.attributes.names.each_pair do |attribute, value| -%>
-    <%= attribute %> = <%= value %>
+<%= attribute %> = <%= value %>
     <%- end -%>
 
-    <%- resource.links.each do |link| -%>
-    [<%= link.kind.type_identifier %>]
+Links:
+    <%- resource.links.each do |link| %>
+    [[ <%= link.kind.type_identifier %> ]]
         <%- link.attributes.names.each_pair do |attribute, value| -%>
-        <%= attribute %> = <%= value %>
+    <%= attribute %> = <%= value %>
         <%- end -%>
-
     <%- end -%>
 
-    <%- resource.mixins.each do |mixin| -%>
-    [<%= mixin.type_identifier %>]
-        Title:        <%= mixin.title %>
-        Term:         <%= mixin.term %>
-        Location:     <%= mixin.location %>
-
+Mixins:
+    <%- resource.mixins.each do |mixin| %>
+    [[ <%= mixin.type_identifier %> ]]
+    title:        <%= mixin.title %>
+    term:         <%= mixin.term %>
+    location:     <%= mixin.location %>
     <%- end -%>
-
+<%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) -%>
 
 <%- end -%>

data/lib/occi/cli/version.rb

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

data/occi-cli.gemspec

@@ -19,7 +19,7 @@ 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.6'
+  gem.add_dependency 'occi-api', '= 4.2.0.beta.7'
   gem.add_dependency 'json'
   gem.add_dependency 'highline'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.7
+  version: 4.2.0.beta.8
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.6
+        version: 4.2.0.beta.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.6
+        version: 4.2.0.beta.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement