occi-cli 4.2.0.beta.10 → 4.2.0.beta.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c20aa7d78d97f71d38b5864e8171f87518cd28
-  data.tar.gz: 6d71a666b9d39ccd5bc5c83777131743c723bf9c
+  metadata.gz: b54d0223fb76443e72601cd87d6df9d0aafed156
+  data.tar.gz: 671984bb540d744450db92fa5399bb3ccaf5f624
 SHA512:
-  metadata.gz: ac651f1a84eb8a2266ad2f49398a95b683016b0a5610f75f168165784ec660d1a7c2b76f60295f5e1ec01e29d3feae0c54554fb23e1c60e240b9f1ffd7116e73
-  data.tar.gz: 03eb7bd97cb212d3f289f4806a78f0a4286bd6a04ecb71a2681afb9b1cbf9923d7e10ee45f263c8b4e17b1e5107dec9a22da06bcb4b4eccc25239dbfa2e0ccbe
+  metadata.gz: de066e40000d7a346c873c484ba615ff1a75fbb343add9802a46397883a598c64c9604e73f04d4fe95d524f961bc3479eb3b37ddb6ddaaf2b99c14589f5feca4
+  data.tar.gz: 62276194ab5fc31ae431c4d69e247630f2fe96440dc4f21d02dcd3244b750bc4ad4ac63f8dd3c1f5e84ea1f5456ce9da76cb6556c4650c29f25b87d49027c8b5

data/lib/occi/cli/occi_opts.rb

@@ -45,6 +45,14 @@ module Occi::Cli
           options.auth.type = auth.to_s
         end
 
+        opts.on("-k",
+                "--timeout SEC",
+                Integer,
+                "Default timeout for all HTTP connections, in seconds") do |timeout|
+          raise "Timeout has to be a number larger than 0!" if timeout < 1
+          options.timeout = timeout
+        end
+
         opts.on("-u",
                 "--username USER",
                 String,
@@ -297,6 +305,7 @@ module Occi::Cli
       options.dump_model = false
 
       options.endpoint = "http://localhost:3000"
+      options.timeout = nil
 
       options.auth = {}
       options.auth.type = "none"

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

@@ -1,6 +1,6 @@
 <%- # We always get Occi::Core::Mixins -%>
+<%- unless occi_resources.blank? -%><%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %><%- end %>
 <%- occi_resources.each do |mixin| -%>
-<%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %>
 [[ <%= mixin.type_identifier %> ]]
 title:        <%= mixin.title %>
 term:         <%= mixin.term %>

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

@@ -1,13 +1,13 @@
 <%- # We always get Occi::Core::Resources -%>
+<%- unless occi_resources.blank? -%><%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %><%- end %>
 <%- occi_resources.each do |resource| -%>
-<%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %>
 [[ <%= resource.kind.type_identifier %> ]]
     <%- resource.attributes.names.each_pair do |attribute, value| -%>
 <%= attribute %> = <%= value %>
     <%- end -%>
 
 Links:
-    <%- resource.links.each do |link| %>
+    <%- resource.links.to_a.reject { |l| l.rel && l.rel.to_s.match(/^\S+\/action#\S+$/) }.each do |link| %>
     [[ <%= link.kind.type_identifier %> ]]
         <%- link.attributes.names.each_pair do |attribute, value| -%>
     <%= attribute %> = <%= value %>
@@ -21,6 +21,11 @@ Mixins:
     term:         <%= mixin.term %>
     location:     <%= mixin.location %>
     <%- end -%>
+
+Actions:
+    <%- resource.links.to_a.select { |l| l.rel && l.rel.to_s.match(/^\S+\/action#\S+$/) }.each do |action| %>
+    [[ <%= action.rel.to_s %> ]]
+    <%- 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.10" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.0.beta.11" unless defined?(::Occi::Cli::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.10
+  version: 4.2.0.beta.11
 platform: ruby
 authors:
 - Florian Feldhaus