occi-cli 4.3.8 → 4.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a341bc7371e29952c0cb3ba168f5c27bccb1294b
-  data.tar.gz: a8a9b10ddbc10cf1f4cedd1d37cea658cba7f6e1
+  metadata.gz: d514c601aafd16b93f02d405c5a6040fd1d6cc65
+  data.tar.gz: 5d5ed74ecc16de22e0162183cade0f6880313001
 SHA512:
-  metadata.gz: 20f32d739425091128847a2192addb0686fc336ceba19d95a6b3f2244c89e5e2b2dc7c0761d153ec467f5d316b7970c84d08001d7a3a5f3687e511ba1c4f91ab
-  data.tar.gz: 9b46ce16250c85dbef517cddc6132921af5596cabeec27218ebdee5aff845e2eb4fbe73035b1220ab6e255d9d7c6794a5680b7fb426e239344cd85ea8be87957
+  metadata.gz: 740921fa7ba5e6b0bb0dc93ddba8f890a7a94766128295655247da436e7986c83d8c1f092318de2e5f44f8966468601e899c79af3619c79c675ef606aedcc771
+  data.tar.gz: dae114bc9c927dc6bb91d30f1a404aa0e61f2e2eeac4e47db85e2498be9bdb063727686bc097d1ac308614876af41ba83ef12a498cc29cef44b4b00b02690bbd

data/bin/occi

@@ -150,6 +150,8 @@ begin
       helper_trigger options, output
     when :discover
       helper_discover options, output
+    when :update
+      helper_update options, output
     when :refresh
       refresh
     when :skip, :test, :dry_run

data/lib/occi/cli/helpers.rb

@@ -12,3 +12,4 @@ extend Occi::Cli::Helpers::DeleteHelper
 extend Occi::Cli::Helpers::TriggerHelper
 extend Occi::Cli::Helpers::LinkHelper
 extend Occi::Cli::Helpers::DiscoverHelper
+extend Occi::Cli::Helpers::UpdateHelper

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

@@ -12,14 +12,16 @@ module Occi::Cli::Helpers::TriggerHelper
     action_instance.action = helper_trigger_normalize_action(options.trigger_action)
     action_instance.attributes = options.attributes
 
-    if trigger(options.resource, action_instance)
-      Occi::Cli::Log.info "Action #{options.trigger_action.type_identifier.inspect} " \
-                     "triggered on #{options.resource.inspect}!"
-    else
+    res = trigger(options.resource, action_instance)
+    unless res
       message = "Failed to trigger an action on #{options.resource.inspect}!"
       Occi::Cli::Log.error message
       raise message
     end
+    Occi::Cli::Log.info "Action #{options.trigger_action.type_identifier.inspect} " \
+                        "triggered on #{options.resource.inspect}!"
+    return res unless output
+    puts output.format(res.to_a.collect { |m| m.type_identifier }) if res.kind_of? Occi::Core::Mixins
 
     true
   end
@@ -41,4 +43,4 @@ module Occi::Cli::Helpers::TriggerHelper
     action
   end
 
-end
+end

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

@@ -0,0 +1,34 @@
+module Occi::Cli::Helpers::UpdateHelper
+  def helper_update(options, output = nil)
+    unless resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) \
+                                                     || \
+           options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
+      Occi::Cli::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      raise "Unknown resource #{options.resource.inspect}, there is nothing to update here!"
+    end
+
+    raise "No updatable mixins were provided!" if options.mixins.blank?
+    mxns = ::Occi::Core::Mixins.new
+    options.mixins.to_a.each do |mxn|
+      Occi::Cli::Log.debug "Adding mixin #{mxn.inspect} to #{options.resource.inspect}"
+
+      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
+
+      mxns << orig_mxn
+    end
+
+    unless update(options.resource, mxns)
+      message = "Failed to update #{options.resource.inspect}!"
+      Occi::Cli::Log.error message
+      raise message
+    end
+    Occi::Cli::Log.info "Update performed on #{options.resource.inspect}!"
+
+    true
+  end
+end

data/lib/occi/cli/occi_opts.rb

@@ -11,7 +11,7 @@ module Occi::Cli
 
     AUTH_METHODS = [:x509, :token, :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, :discover].freeze
+    ACTIONS = [:list, :describe, :create, :delete, :trigger, :link, :unlink, :discover, :update].freeze
     LOG_OUTPUTS = [:stdout, :stderr].freeze
     LOG_LEVELS = [:debug, :error, :fatal, :info, :unknown, :warn].freeze
     ENTITY_TYPES = [:resource, :link].freeze
@@ -419,6 +419,10 @@ module Occi::Cli
         mandatory.concat [:resource, :action]
       end
 
+      if options.action == :update
+        mandatory << :mixins
+      end
+
       mandatory
     end
 

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.3.8" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.3.9" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -19,13 +19,13 @@ 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.3.8', '< 5'
+  gem.add_dependency 'occi-api', '>= 4.3.11', '< 5'
   gem.add_dependency 'json', '>= 1.8.1', '< 3'
   gem.add_dependency 'highline', '>= 1.6.21', '< 2'
   gem.add_dependency 'activesupport', '>= 4.0.0', '< 5'
 
   gem.add_development_dependency 'bundler', '>= 1.12', '< 2'
-  gem.add_development_dependency 'rubygems-tasks', '>= 0.2.4', '< 1'
+  gem.add_development_dependency 'rubygems-tasks', '>= 0.2.4', '< 0.3'
   gem.add_development_dependency 'rspec', '>= 3.5.0', '< 4'
   gem.add_development_dependency 'rake', '>= 12', '< 13'
   gem.add_development_dependency 'simplecov', '>= 0.13', '< 1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.8
+  version: 4.3.9
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.8
+        version: 4.3.11
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.8
+        version: 4.3.11
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -121,7 +121,7 @@ dependencies:
         version: 0.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
         version: 0.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,7 @@ files:
 - lib/occi/cli/helpers/link_helper.rb
 - lib/occi/cli/helpers/list_helper.rb
 - lib/occi/cli/helpers/trigger_helper.rb
+- lib/occi/cli/helpers/update_helper.rb
 - lib/occi/cli/log.rb
 - lib/occi/cli/occi_opts.rb
 - lib/occi/cli/occi_opts/cli_examples.erb
@@ -325,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Executable OCCI client