occi-cli 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 65e10804d47573dec0a66e2b3c787414f459de59
-  data.tar.gz: 54c7e23213d0571c2a702f1a7869e5f761f462c7
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmQ1MzBkMjVlYzUwYjU1NmQxNjQzODM5MTUwMjZmOTU2MWQyOGJkNQ==
+  data.tar.gz: !binary |-
+    ZThhODJiYjFlNmNjNDIxNGVhYzlkMThhZTVmYThlNjc5MTI3MmRiMg==
 SHA512:
-  metadata.gz: eb575a9516a736fa9bafb3e71f9a4920c564953ce1588d18dc499a6590398df5130fbd064b519dd6a08574b4284be017e228438cec972b2313b9f207ce1717d3
-  data.tar.gz: 9eb16ad029683427ff326ca544715155e7bd12b2a4e11d9141bf17e1997178d8fb1a8030b5b780e55f696eb2a50de5c9c1278ee0cc8e8901cca84ed5c78f7fc9
+  metadata.gz: !binary |-
+    N2IzNTZkMDljOTVmMjMzNWIxMmUzZWQ3MTYyYzc2MzM0ZmRhNWY2Y2M5N2Zl
+    MzNhNDM0NzcxYmRhODU1Mzg4ZTI2YzE4OWJlNzFhNzhiNWNhN2ZkYTYwYTUz
+    NzU5YzZiMGQ2NzU4MjNiM2FlODU3MTMzMjg0NzZjYzA3MjVlYmM=
+  data.tar.gz: !binary |-
+    YTZjYzE0YWIxNjBlMGRkYTYxMGEwNWE0ZWUyYmMyZjZiY2I5NWJjNGM0MzE4
+    MWM3OTkxZDcxMTM5NTBiNzA4NzEzZGU4YjZmOWVmOGVhNTZmMzJiNWQyMmM1
+    Y2VlODQzMDUwNjZmOGNmZjc2MjZmYTVlMGE0ODYwNmZmYzhjZTQ=

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

@@ -4,8 +4,12 @@ module Occi::Cli::Helpers::DescribeHelper
     if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) || options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
       Occi::Cli::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)
+      resources_or_links = describe(options.resource)
+      if resources_or_links.kind_of?(Occi::Core::Resources) || resources_or_links.kind_of?(Occi::Core::Links)
+        found = resources_or_links
+      else
+        found = Occi::Core::Resources.new
+      end
     elsif mixin_types.include?(options.resource) || mixin_type_identifiers.include?(options.resource)
       Occi::Cli::Log.debug "#{options.resource.inspect} is a mixin type or type identifier."
 

data/lib/occi/cli/resource_output_factory.rb

@@ -19,6 +19,8 @@ module Occi::Cli
       # 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::Links
+        method = "links_to_#{@output_format}".to_sym
       elsif data.kind_of? Occi::Core::Mixins
         method = "mixins_to_#{@output_format}".to_sym
       elsif data.kind_of? Array
@@ -56,6 +58,8 @@ module Occi::Cli
       "#{output_first}#{output_ary.join(separator)}#{output_last}"
     end
     alias_method :resources_to_json_pretty, :resources_to_json
+    alias_method :links_to_json, :resources_to_json
+    alias_method :links_to_json_pretty, :resources_to_json
     alias_method :mixins_to_json, :resources_to_json
     alias_method :mixins_to_json_pretty, :resources_to_json
 
@@ -70,7 +74,7 @@ module Occi::Cli
     alias_method :locations_to_json_pretty, :locations_to_json
 
     def resources_to_plain(occi_resources)
-      # using ERB templates for known resource and mixin types
+      # using ERB templates for known resource types
       file = "#{File.expand_path('..', __FILE__)}/templates/resources.erb"
       template = ERB.new(File.new(file).read, nil, '-')
 
@@ -80,13 +84,24 @@ module Occi::Cli
       formatted_output
     end
 
-    def mixins_to_plain(occi_resources)
-      # using ERB templates for known resource and mixin types
+    def links_to_plain(occi_links)
+      # using ERB templates for known link types
+      file = "#{File.expand_path('..', __FILE__)}/templates/links.erb"
+      template = ERB.new(File.new(file).read, nil, '-')
+
+      formatted_output = ""
+      formatted_output << template.result(binding) unless occi_links.blank?
+
+      formatted_output
+    end
+
+    def mixins_to_plain(occi_mixins)
+      # using ERB templates for known mixin types
       file = "#{File.expand_path('..', __FILE__)}/templates/mixins.erb"
       template = ERB.new(File.new(file).read, nil, '-')
 
       formatted_output = ""
-      formatted_output << template.result(binding) unless occi_resources.blank?
+      formatted_output << template.result(binding) unless occi_mixins.blank?
 
       formatted_output
     end

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

@@ -0,0 +1,18 @@
+<%- # We always get Occi::Core::Links -%>
+<%- unless occi_links.blank? -%><%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %><%- end %>
+<%- occi_links.each do |link| -%>
+[[ <%= link.kind.type_identifier %> ]]
+    <%- link.attributes.names.each_pair do |attribute, value| -%>
+<%= attribute %> = <%= value %>
+    <%- end -%>
+
+Mixins:
+    <%- link.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/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| -%>
+<%- unless occi_mixins.blank? -%><%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %><%- end %>
+<%- occi_mixins.each do |mixin| -%>
 [[ <%= mixin.type_identifier %> ]]
 title:        <%= mixin.title %>
 term:         <%= mixin.term %>

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

@@ -23,8 +23,8 @@ Mixins:
     <%- 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 %> ]]
+    <%- resource.actions.each do |action| %>
+    [[ <%= action.type_identifier %> ]]
     <%- end -%>
 <%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) -%>
 

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.2.0" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.1" 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'
+  gem.add_dependency 'occi-api', '~> 4.2.1'
   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
+  version: 4.2.1
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is a client implementation of the Open Cloud Computing Interface
@@ -95,6 +95,7 @@ files:
 - 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/links.erb
 - lib/occi/cli/templates/mixins.erb
 - lib/occi/cli/templates/resources.erb
 - lib/occi/cli/version.rb
@@ -113,12 +114,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []