occi-cli 4.2.5 → 4.3.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680ab69d1c40a75b5a9df25119035c83c2cab917
-  data.tar.gz: 88cba70109d019f3c07bec4e781b05a429e4d928
+  metadata.gz: 6619c059a9c212ac56867b6a511709f491203d83
+  data.tar.gz: 3314928f191fb6d332fd19db78b1ab62b70d2bb2
 SHA512:
-  metadata.gz: e0dec2c46c8d8c5d0afc355578aeaadaac3075399beca6cb5f9725d37696b48aa32324e8df7df51de46423b0efe1a3a37d319b9cb0a5fb92e44cddbe46036cb1
-  data.tar.gz: f5af0130cb7a243e4934fbe4c36220877607ac0ecc34597e45aa4fd5e76461d332278c667afed16e2b43b24c73aed621a26b65dde6ed5de0ac4719e97f466990
+  metadata.gz: 2cf34b18bae42981a5951f7753393b50ea031434d1e0b35caa2fa2b88b7351899f7e236a39623c166150bb7693b6b916679aaf538b563420bcc34b8d8b4a637e
+  data.tar.gz: b939222b11c1d02ca20052d9be6a1d75e4eabb3f4c7cc3e9e117719d49c191e65ba1f93e822a08e10ea4d1ea9a22e9054c4ce92f542549a14900d813459743d6

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -26,9 +26,9 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: oraclejdk7
-    - rvm: 2.1.1
+    - rvm: 2.1
       jdk: openjdk7
-    - rvm: 2.1.1
+    - rvm: 2.1
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: openjdk7
@@ -42,3 +42,4 @@ branches:
     - 4.0.x
     - 4.1.x
     - 4.2.x
+    - 4.3.x

data/README.md

@@ -1,18 +1,17 @@
 rOCCI-cli - A Ruby OCCI Framework
 =================================
 
-[![Build Status](https://secure.travis-ci.org/gwdg/rOCCI-cli.png)](http://travis-ci.org/gwdg/rOCCI-cli)
-[![Dependency Status](https://gemnasium.com/gwdg/rOCCI-cli.png)](https://gemnasium.com/gwdg/rOCCI-cli)
+[![Build Status](https://secure.travis-ci.org/EGI-FCTF/rOCCI-cli.png)](http://travis-ci.org/EGI-FCTF/rOCCI-cli)
+[![Dependency Status](https://gemnasium.com/EGI-FCTF/rOCCI-cli.png)](https://gemnasium.com/EGI-FCTF/rOCCI-cli)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/occi-cli.png)](https://badge.fury.io/rb/occi-cli)
-[![Code Climate](https://codeclimate.com/github/gwdg/rOCCI-cli.png)](https://codeclimate.com/github/gwdg/rOCCI-cli)
+[![Code Climate](https://codeclimate.com/github/EGI-FCTF/rOCCI-cli.png)](https://codeclimate.com/github/EGI-FCTF/rOCCI-cli)
 
 Requirements
 ------------
 
 ### Ruby
-* Ruby 1.9.3 is required
+* Ruby 1.9.3 or newer is required
 * RubyGems have to be installed
-* Rake has to be installed (e.g., `gem install rake`)
 
 ### Examples
 #### For distros based on Debian:
@@ -46,12 +45,10 @@ Installation
 
 To install the most recent stable version
 
-    gem install rake
     gem install occi-cli
 
 To install the most recent beta version
 
-    gem install rake
     gem install occi-cli --pre
 
 ### From source (dev)
@@ -62,7 +59,7 @@ To install the most recent beta version
 
 To build and install the bleeding edge version from master
 
-    git clone git://github.com/gwdg/rOCCI-cli.git
+    git clone git://github.com/EGI-FCTF/rOCCI-cli.git
     cd rOCCI-cli
     gem install bundler
     bundle install
@@ -75,7 +72,7 @@ To build and install the bleeding edge version from master
 
 To build a Java jar file from master use
 
-    git clone git://github.com/gwdg/rOCCI-cli.git
+    git clone git://github.com/EGI-FCTF/rOCCI-cli.git
     cd rOCCI-cli
     gem install bundler
     bundle install
@@ -151,6 +148,11 @@ To delete a compute resource use
 Changelog
 ---------
 
+### Version 4.3
+* Updated dependencies
+* Powered by rOCCI-core 4.3.x
+* New `discover` functionality
+
 ### Version 4.2
 * Droppped the interactive mode (it might return in the future)
 * Updated internals
@@ -225,7 +227,7 @@ Development
 
 Checkout latest version from GIT:
 
-    git clone git://github.com/gwdg/rOCCI-cli.git
+    git clone git://github.com/EGI-FCTF/rOCCI-cli.git
 
 Change to rOCCI-cli folder
 
@@ -237,11 +239,11 @@ Install dependencies for deployment
 
 ### Code Documentation
 
-[Code Documentation for rOCCI-cli by YARD](http://rubydoc.info/github/gwdg/rOCCI-cli/)
+[Code Documentation for rOCCI-cli by YARD](http://rubydoc.info/github/EGI-FCTF/rOCCI-cli/)
 
 ### Continuous integration
 
-[Continuous integration for rOCCI-cli by Travis-CI](http://travis-ci.org/gwdg/rOCCI-cli/)
+[Continuous integration for rOCCI-cli by Travis-CI](http://travis-ci.org/EGI-FCTF/rOCCI-cli/)
 
 ### Contribute
 

data/bin/occi

@@ -55,7 +55,7 @@ begin
   connect :http, options
 rescue OpenSSL::SSL::SSLError => ssl_ex
   # generic SSL error raised whilst establishing a connection
-  # possibly an untrusted server cert or invalid user credentials 
+  # possibly an untrusted server cert or invalid user credentials
   Occi::Cli::Log.fatal "An SSL error occurred! Please, make sure your credentials " \
                   "are valid and recognized by the endpoint! Message: #{ssl_ex.message}"
 
@@ -146,6 +146,8 @@ begin
       helper_delete options, output
     when :trigger
       helper_trigger options, output
+    when :discover
+      helper_discover options, output
     when :refresh
       refresh
     when :skip, :test, :dry_run

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

@@ -0,0 +1,29 @@
+module Occi::Cli::Helpers::DiscoverHelper
+
+  def helper_discover(options, output = nil)
+    found = Occi::Core::Kinds.new
+
+    case options.entity_type
+    when :resource
+      # get everything related to Occi::Core::Resource
+      resource_type_identifiers.each { |resource_ti| found << model.get_by_id(resource_ti) }
+    when :link
+      # get everything related to Occi::Core::Link
+      link_type_identifiers.each { |link_ti| found << model.get_by_id(link_ti) }
+    else
+      Occi::Cli::Log.warn "Attempting to discover an " \
+                          "unknown entity type #{options.entity_type.to_s.inspect}"
+      raise "Unknown entity type #{options.entity_type.to_s.inspect}, " \
+            "terminating discovery!"
+    end
+
+    helper_discover_output(found, options, output)
+  end
+
+  def helper_discover_output(found, options, output)
+    return found unless output
+
+    puts output.format(found)
+  end
+
+end

data/lib/occi/cli/helpers.rb

@@ -10,4 +10,5 @@ extend Occi::Cli::Helpers::DescribeHelper
 extend Occi::Cli::Helpers::CreateHelper
 extend Occi::Cli::Helpers::DeleteHelper
 extend Occi::Cli::Helpers::TriggerHelper
-extend Occi::Cli::Helpers::LinkHelper
+extend Occi::Cli::Helpers::LinkHelper
+extend Occi::Cli::Helpers::DiscoverHelper

data/lib/occi/cli/occi_opts.rb

@@ -11,9 +11,10 @@ module Occi::Cli
 
     AUTH_METHODS = [:x509, :basic, :digest, :none].freeze
     MEDIA_TYPES = ["application/occi+json", "text/plain,text/occi", "text/plain", "text/occi"].freeze
-    ACTIONS = [:list, :describe, :create, :delete, :trigger, :link, :unlink].freeze
+    ACTIONS = [:list, :describe, :create, :delete, :trigger, :link, :unlink, :discover].freeze
     LOG_OUTPUTS = [:stdout, :stderr].freeze
     LOG_LEVELS = [:debug, :error, :fatal, :info, :unknown, :warn].freeze
+    ENTITY_TYPES = [:resource, :link].freeze
 
     REQ_CREATE_ATTRS = ["occi.core.title"].freeze
 
@@ -199,6 +200,13 @@ module Occi::Cli
           options.trigger_action = Occi::Cli::OcciOpts::Helper.parse_action(trigger_action)
         end
 
+        opts.on("-i",
+                "--entity-type TYPE",
+                ENTITY_TYPES,
+                "Entity types to perform discovery on, only: [#{ENTITY_TYPES.join('|')}]") do |entity_type|
+          options.entity_type = entity_type
+        end
+
         opts.on("-l",
                 "--log-to OUTPUT",
                 LOG_OUTPUTS,
@@ -387,7 +395,11 @@ module Occi::Cli
         mandatory << :links
       end
 
-      mandatory.concat [:resource, :action]
+      if options.action == :discover
+        mandatory.concat [:entity_type]
+      else
+        mandatory.concat [:resource, :action]
+      end
 
       mandatory
     end

data/lib/occi/cli/resource_output_factory.rb

@@ -23,6 +23,8 @@ module Occi::Cli
         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? Occi::Core::Kinds
+        method = "kinds_to_#{@output_format}".to_sym
       elsif data.kind_of? Array
         raise Occi::Cli::Errors::FormatterInputTypeError,
               "Arrays with #{data.first.class.name.inspect} are not supported!" unless data.first.nil? || data.first.kind_of?(String)
@@ -140,6 +142,43 @@ module Occi::Cli
       url_locations.join("\n")
     end
 
+    def kinds_to_plain(occi_kinds)
+      # using ERB templates for known kinds
+      file = "#{File.expand_path('..', __FILE__)}/templates/kinds.erb"
+      template = ERB.new(File.new(file).read, nil, '-')
+
+      formatted_output = ""
+      formatted_output << template.result(binding) unless occi_kinds.blank?
+
+      formatted_output
+    end
+
+    def kinds_to_json(occi_kinds)
+      # generate JSON document from Occi::Core::Kinds
+      occi_kinds = occi_kinds.to_a
+
+      if @output_format.to_s.end_with? '_pretty'
+        output_first = "[\n"
+        output_ary = occi_kinds.collect do |r|
+          JSON.pretty_generate(r.as_json.to_hash)
+        end
+        separator = ",\n"
+        output_last = "\n]"
+      else
+        output_first = "["
+        output_ary = occi_kinds.collect do |r|
+          JSON.generate(r.as_json.to_hash)
+        end
+        separator = ","
+        output_last = "]"
+      end
+
+      "#{output_first}#{output_ary.join(separator)}#{output_last}"
+    end
+    alias_method :kinds_to_json_pretty, :kinds_to_json
+    alias_method :kinds_to_json_extended_pretty, :kinds_to_json
+    alias_method :kinds_to_json_extended, :kinds_to_json
+
   end
 
 end

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

@@ -0,0 +1,27 @@
+<%- # We always get Occi::Core::Kinds -%>
+<%- unless occi_kinds.blank? -%><%= '#' * (HighLine::SystemExtensions.terminal_size.first - 1) %><%- end %>
+<%- occi_kinds.each do |kind| -%>
+[[ <%= kind.type_identifier %> ]]
+>> title:      <%= kind.title %>
+>> parent:     <%= kind.parent %>
+>> location:   <%= kind.location %>
+>> related to: <%= kind.related.join(', ') %>
+
+Attributes:
+    <%- kind.attributes.names.each_pair do |attribute, properties| %>
+    [[ <%= attribute %> ]]
+    | type:        <%= properties.type %>
+    | required:    <%= properties.required %>
+    | mutable:     <%= properties.mutable %>
+    | default:     <%= properties.default %>
+    | description: <%= properties.description %>
+    | pattern:     <%= properties.pattern %>
+    <%- end -%>
+
+Actions:
+    <%- kind.actions.each do |action| %>
+    [[ <%= action.type_identifier %> ]]
+    <%- 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.5" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.3.0.beta.2" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -8,20 +8,20 @@ Gem::Specification.new do |gem|
   gem.name          = "occi-cli"
   gem.version       = Occi::Cli::VERSION
   gem.authors       = ["Florian Feldhaus","Piotr Kasprzak", "Boris Parak"]
-  gem.email         = ["florian.feldhaus@gwdg.de", "piotr.kasprzak@gwdg.de", "xparak@mail.muni.cz"]
+  gem.email         = ['florian.feldhaus@gmail.com', 'piotr.kasprzak@gwdg.de', 'parak@cesnet.cz']
   gem.description   = %q{This gem is a client implementation of the Open Cloud Computing Interface in Ruby}
   gem.summary       = %q{Executable OCCI client}
-  gem.homepage      = 'https://github.com/gwdg/rOCCI-cli'
+  gem.homepage      = 'https://github.com/EGI-FCTF/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")
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency 'occi-api', '~> 4.2.5'
-  gem.add_dependency 'json'
-  gem.add_dependency 'highline'
+  gem.add_dependency 'occi-api', '~> 4.3.0.beta.2'
+  gem.add_dependency 'json', '~> 1.8', '>= 1.8.1'
+  gem.add_dependency 'highline', '~> 1.6', '>= 1.6.21'
 
-  gem.required_ruby_version     = ">= 1.9.3"
+  gem.required_ruby_version = ">= 1.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.3.0.beta.2
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,65 +10,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.3.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.3.0.beta.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.21
 description: This gem is a client implementation of the Open Cloud Computing Interface
   in Ruby
 email:
-- florian.feldhaus@gwdg.de
+- florian.feldhaus@gmail.com
 - piotr.kasprzak@gwdg.de
-- xparak@mail.muni.cz
+- parak@cesnet.cz
 executables:
 - occi
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - AUTHORS
 - Gemfile
 - LICENSE
@@ -87,6 +99,7 @@ files:
 - lib/occi/cli/helpers/create_helper.rb
 - lib/occi/cli/helpers/delete_helper.rb
 - lib/occi/cli/helpers/describe_helper.rb
+- lib/occi/cli/helpers/discover_helper.rb
 - lib/occi/cli/helpers/link_helper.rb
 - lib/occi/cli/helpers/list_helper.rb
 - lib/occi/cli/helpers/trigger_helper.rb
@@ -95,6 +108,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/kinds.erb
 - lib/occi/cli/templates/links.erb
 - lib/occi/cli/templates/mixins.erb
 - lib/occi/cli/templates/resources.erb
@@ -104,7 +118,7 @@ files:
 - spec/occi/cli/occi_opts_spec.rb
 - spec/occi/cli/resource_output_factory_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/gwdg/rOCCI-cli
+homepage: https://github.com/EGI-FCTF/rOCCI-cli
 licenses:
 - Apache License, Version 2.0
 metadata: {}
@@ -114,14 +128,14 @@ 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2