occi-cli 4.0.0.alpha.1 → 4.0.0.alpha.2

data/Gemfile

@@ -10,3 +10,7 @@ end
 platforms :jruby do
   gem 'jruby-openssl' if ((defined? JRUBY_VERSION) && (JRUBY_VERSION.split('.')[1].to_i < 7))
 end
+
+platforms :ruby_18 do
+      gem 'oniguruma'
+end

data/bin/occi

@@ -41,8 +41,6 @@ Occi::Log.debug "Options: #{options}"
 if options.auth[:password].nil? || options.auth[:user_cert_password].nil?
   Occi::Log.debug "Password is not set, asking for it now ..."
 
-  say("\n")
-
   options.auth[:user_cert_password] = ask("Enter a password: ") {
       |q| q.echo = false
   } unless options.auth[:type] == "none" || (options.auth[:voms] && options.auth[:type] == "x509")
@@ -244,7 +242,7 @@ begin
 
           options.mixins = {}
           (1..number_of_mixins).each do |mixin_number|
-            mixin = ask("What mixin should I mix in? ") { |q| q.validate = /\A\w+#\w+\Z/ }
+            mixin = ask("What mixin should I mix in? ") { |q| q.validate = /^\S+?#\S+$/ }
             parts = mixin.split("#")
 
             options.mixins[parts[0]] = [] if options.mixins[parts[0]].nil?

data/lib/occi/cli/occi_opts.rb

@@ -203,9 +203,10 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
                 "--mixin NAME",
                 String,
                 "Type and name of the mixin as TYPE#NAME (e.g. os_tpl#monitoring, resource_tpl#medium)") do |mixin|
-          parts = mixin.split("#")
+          parts = /^(\S+?)#(\S+)$/.match(mixin)
+          raise "Unknown mixin format! Use TYPE#NAME!" unless parts
 
-          raise "Unknown mixin format! Use TYPE#NAME!" unless parts.length == 2
+          parts = parts.to_a.drop(1)
 
           options.mixins = {} if options.mixins.nil?
           options.mixins[parts[0]] = [] if options.mixins[parts[0]].nil?
@@ -282,7 +283,13 @@ occi --endpoint https://localhost:3300/ --action delete --resource /compute/65sd
           if @@quiet
             exit true
           else
-            puts Occi::Cli::VERSION
+            if options.debug
+              puts "CLI:  #{Occi::Cli::VERSION}"
+              puts "API:  #{Occi::Api::VERSION}"
+              puts "Core: #{Occi::VERSION}"
+            else
+              puts Occi::Cli::VERSION
+            end
             exit! true
           end
         end

data/lib/occi/cli/resource_output_factory.rb

@@ -5,7 +5,7 @@ module Occi::Cli
 
   class ResourceOutputFactory
 
-    @@allowed_formats = [:json, :plain].freeze
+    @@allowed_formats = [:json, :plain, :json_pretty].freeze
     @@allowed_resource_types = [:compute, :storage, :network, :os_tpl, :resource_tpl].freeze
     @@allowed_data_types = [:locations, :resources].freeze
 
@@ -31,7 +31,7 @@ module Occi::Cli
       # construct method name from data type and output format
       method = (data_type.to_s + "_to_" + output_format.to_s).to_sym
 
-      ResourceOutputFactory.send method, data, resource_type
+      send method, data, resource_type
     end
 
     def self.allowed_formats
@@ -46,27 +46,41 @@ module Occi::Cli
       @@allowed_data_types
     end
 
-    def self.resources_to_json(occi_resources, resource_type)
-      # generate JSON document from an array of JSON objects 
-      JSON.generate occi_resources
+    def resources_to_json(occi_resources, resource_type)
+      # generate JSON document from an array of JSON objects
+      if @output_format == :json_pretty
+        JSON.pretty_generate occi_resources
+      else
+        JSON.generate occi_resources
+      end
     end
+    alias_method :resources_to_json_pretty, :resources_to_json
 
-    def self.resources_to_plain(occi_resources, resource_type)
+    def resources_to_plain(occi_resources, resource_type)
       # using ERB templates for known resource and mixin types
-      file = File.expand_path("..", __FILE__) + '/templates/' + resource_type.to_s + ".erb"
-      template = ERB.new File.new(file).read
+      file = "#{File.expand_path('..', __FILE__)}/templates/#{resource_type.to_s}.erb"
+      template = ERB.new(File.new(file).read, nil, '-')
 
-      formatted_output = ""
+      formatted_output = "\n"
 
       occi_resources.each do |occi_resource|
         json_resource = occi_resource.as_json
-        formatted_output << template.result(binding) unless json_resource.nil? || json_resource.empty?
+        next unless json_resource
+
+        if json_resource.resources && json_resource.resources.first
+          attributes = json_resource.resources.first.attributes
+          next unless attributes && attributes.occi
+
+          links = json_resource.links || []
+        end
+
+        formatted_output << template.result(binding)
       end
 
       formatted_output
     end
 
-    def self.locations_to_json(url_locations, resource_type)
+    def locations_to_json(url_locations, resource_type)
       # give all locatios a common key and convert to JSON
       locations = { resource_type => [] }
 
@@ -75,19 +89,25 @@ module Occi::Cli
         locations[resource_type] << location
       end
 
-      locations.to_json
+      # generate JSON document from an array of strings
+      if @output_format == :json_pretty
+        JSON.pretty_generate locations
+      else
+        JSON.generate locations
+      end
     end
+    alias_method :locations_to_json_pretty, :locations_to_json
 
-    def self.locations_to_plain(url_locations, resource_type)
+    def locations_to_plain(url_locations, resource_type)
       # just an attempt to make the array more readable 
-      output = "\n" + resource_type.to_s.capitalize + " locations:\n"
+      output = "\n#{resource_type.to_s.capitalize} locations:\n"
 
       url_locations.each do |location|
         location = location.split("/").last if [:os_tpl, :resource_tpl].include? resource_type
         output << "\t" << location << "\n"
       end
 
-      output
+      "#{output}\n"
     end
 
   end

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

@@ -1,18 +1,22 @@
-<%# We always get a JSON %>
+<%- # We always get a JSON -%>
 COMPUTE:
-  ID:       <%= json_resource.resources.first.attributes.occi.core.id %>
-  TITLE:    <%= json_resource.resources.first.attributes.occi.core.title %>
-  STATE:    <%= json_resource.resources.first.attributes.occi.compute.state %>
+  ID:       <%= attributes.occi.core.id %>
+  TITLE:    <%= attributes.occi.core.title || attributes.occi.compute.hostname %>
+  STATE:    <%= attributes.occi.compute.state %>
+  MEMORY:   <%= attributes.occi.compute.memory %> GB
+  CORES:    <%= attributes.occi.compute.cores %>
   LINKS:
-  <% if json_resource.links %><% json_resource.links.each do |link| %>
+  <%- links.each do |link| -%>
+    <%- next unless link && link.attributes -%>
+
     LINK "<%= link.kind %>":
       ID:          <%= link.attributes.occi.core.id %>
-      TITLE:       <%= link.attributes.occi.core.title %>
+      TITLE:       <%= link.attributes.occi.core.title || link.target.split('/').last %>
       TARGET:      <%= link.target %>
       <% if link.attributes.occi.networkinterface %>
       IP ADDRESS:  <%= link.attributes.occi.networkinterface.address %>
       MAC ADDRESS: <%= link.attributes.occi.networkinterface.mac %>
       <% elsif link.attributes.occi.storagelink %>
       MOUNT POINT: <%= link.attributes.occi.storagelink.deviceid %>
-      <% end %>
-  <% end %><% end %>
+      <%- end -%>
+  <% end if links %>

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

@@ -1,9 +1,8 @@
-<%# We always get a JSON %>
+<%- # We always get a JSON -%>
 NETWORK:
-  ID:           <%= json_resource.resources.first.attributes.occi.core.id %>
-  TITLE:        <%= json_resource.resources.first.attributes.occi.core.title %>
-  STATE:        <%= json_resource.resources.first.attributes.occi.network.state %>
-  ALLOCATION:   <%= json_resource.resources.first.attributes.occi.network.allocation %>
-  ADDRESS:      <%= json_resource.resources.first.attributes.occi.network.address %>
-
+  ID:           <%= attributes.occi.core.id %>
+  TITLE:        <%= attributes.occi.core.title || attributes.occi.network.label %>
+  STATE:        <%= attributes.occi.network.state %>
+  ALLOCATION:   <%= attributes.occi.network.allocation || (attributes.occi.networkinterface && attributes.occi.networkinterface.allocation) %>
+  ADDRESS:      <%= attributes.occi.network.address || (attributes.occi.networkinterface && attributes.occi.networkinterface.address) %>
 

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

@@ -1,7 +1,6 @@
-<%# We always get a JSON %>
+<%- # We always get a JSON -%>
 OS_TPL:
   TITLE:        <%= json_resource.title %>
   TERM:         <%= json_resource.term %>
   LOCATION:     <%= json_resource.location %>
 
-

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

@@ -1,7 +1,6 @@
-<%# We always get a JSON %>
+<%- # We always get a JSON -%>
 RESOURCE_TPL:
   TITLE:        <%= json_resource.title %>
   TERM:         <%= json_resource.term %>
   LOCATION:     <%= json_resource.location %>
 
-

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

@@ -1,8 +1,7 @@
-<%# We always get a JSON %>
+<%- # We always get a JSON -%>
 STORAGE:
-  ID:           <%= json_resource.resources.first.attributes.occi.core.id %>
-  TITLE:        <%= json_resource.resources.first.attributes.occi.core.title %>
-  STATE:        <%= json_resource.resources.first.attributes.occi.storage.state%>
-  DESCRIPTION:  <%= json_resource.resources.first.attributes.occi.core.summary %>
-
+  ID:           <%= attributes.occi.core.id %>
+  TITLE:        <%= attributes.occi.core.title %>
+  STATE:        <%= attributes.occi.storage.state%>
+  DESCRIPTION:  <%= attributes.occi.core.summary %>
 

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.0.0.alpha.1" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.0.0.alpha.2" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{OCCI is a collection of classes to simplify the implementation of the Open Cloud Computing API in Ruby}
   gem.summary       = %q{OCCI toolkit}
   gem.homepage      = 'https://github.com/gwdg/rOCCI-cli'
+  gem.license       = 'Apache License, Version 2.0'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -21,6 +22,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'occi-api'
   gem.add_dependency 'highline'
+  gem.add_dependency 'json'
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.1
+  version: 4.0.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -45,6 +45,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +230,8 @@ files:
 - spec/occi/cli/resource_output_factory_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gwdg/rOCCI-cli
-licenses: []
+licenses:
+- Apache License, Version 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: