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

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGEwNjllMjkwNjhmZWM1N2RmNjNkNzRjYWZmM2FmODZlMTg2N2FjMA==
-  data.tar.gz: !binary |-
-    ZDNjOTJjMjNmZjU1NTE3NjhiNmNkMDgzYzZkNWIwZTZjOTFlNWI5OA==
+SHA1:
+  metadata.gz: 07c20aa7d78d97f71d38b5864e8171f87518cd28
+  data.tar.gz: 6d71a666b9d39ccd5bc5c83777131743c723bf9c
 SHA512:
-  metadata.gz: !binary |-
-    NjdkNmI5MWM1ZGIwMTI3ZjJjYjM1NWJiN2ZmYTEzYTA4MDZhM2I1MTE2ZGYw
-    ZGJiMDU5ODE3MjlkNzAzOWI3Njg1OTk2NWZkYWJlODMwNTg1N2FiYmViODAx
-    Zjg2NDRjMDM0MDBjYzhlZTliZjJiYzZkYjY0MzRhNjljNDU2ZTg=
-  data.tar.gz: !binary |-
-    NTFjZTUyZTU1NWMzMjljMzE0NTk4NzIzMWY3MzM1MGRlNTlkOGJkNjQyNmE0
-    OTNiNGFhNzIyZGU0NDBkZTdjMzEwMjU3NTlkNWY5Yzc3Nzg4MzJkZjM5ZGM3
-    ZjgwY2E3ZDgyNWNmOTA5ZTk3YmI2NTZiNWE0YTFlYTFjNmQwOWE=
+  metadata.gz: ac651f1a84eb8a2266ad2f49398a95b683016b0a5610f75f168165784ec660d1a7c2b76f60295f5e1ec01e29d3feae0c54554fb23e1c60e240b9f1ffd7116e73
+  data.tar.gz: 03eb7bd97cb212d3f289f4806a78f0a4286bd6a04ecb71a2681afb9b1cbf9923d7e10ee45f263c8b4e17b1e5107dec9a22da06bcb4b4eccc25239dbfa2e0ccbe

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -25,10 +26,15 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: oraclejdk7
+    - rvm: 2.1.0
+      jdk: openjdk7
+    - rvm: 2.1.0
+      jdk: oraclejdk7
     - rvm: ruby-head
       jdk: openjdk7
     - rvm: ruby-head
       jdk: oraclejdk7
+  fast_finish: true
 
 branches:
   only:

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

@@ -1,7 +1,44 @@
 module Occi::Cli::Helpers::TriggerHelper
 
   def helper_trigger(options, output = nil)
-    raise "Not yet implemented!"
+    unless resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) \
+                                                     || \
+           options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
+      Occi::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      raise "Unknown resource #{options.resource.inspect}, there is nothing to trigger here!"
+    end
+
+    action_instance = Occi::Core::ActionInstance.new
+    action_instance.action = helper_trigger_normalize_action(options.trigger_action)
+    action_instance.attributes = options.attributes
+
+    if trigger(options.resource, action_instance)
+      Occi::Log.info "Action #{options.trigger_action.action.type_identifier.inspect} " \
+                     "triggered on #{options.resource.inspect}!"
+    else
+      message = "Failed to trigger an action on #{options.resource.inspect}!"
+      Occi::Log.error message
+      raise message
+    end
+
+    true
+  end
+
+  def helper_trigger_normalize_action(action)
+    return action if action_type_identifiers.include?(action.type_identifier)
+
+    ti = action_type_identifier(action.term)
+    if ti.blank?
+      message = "Failed to identify action #{action.type_identifier.inspect} in the model!"
+      Occi::Log.error message
+      raise message
+    end
+
+    splt = ti.split '#'
+    action.term = splt.last
+    action.scheme = "#{splt.first}#"
+
+    action
   end
 
 end

data/lib/occi/cli/occi_opts/occi_opts_helper.rb

@@ -6,7 +6,7 @@ module Occi::Cli
 
       ALLOWED_CONTEXT_VARS = [:public_key, :user_data].freeze
 
-      MIXIN_REGEXP = ACTION_REGEXP = /^(\S+?)#(\S+)$/
+      MIXIN_REGEXP = /^(\S+?)#(\S+)$/
       CONTEXT_REGEXP = ATTR_REGEXP = /^(\S+?)=(.+)$/
 
       ATTR_NUM_EXP = /num\((?<number>\d+)\)/
@@ -27,7 +27,7 @@ module Occi::Cli
 
         context_data = ary[1]
         if context_data.gsub!(/^file:\/\//,'')
-          raise 'File does not exist! #{context_data}' unless File.exist? context_data
+          raise "File does not exist! #{context_data.inspect}" unless File.exist? context_data
           context_data = File.read(context_data)
         end
 
@@ -42,7 +42,7 @@ module Occi::Cli
         ary = ATTR_REGEXP.match(attribute).to_a.drop 1
         raise ArgumentError, "Attribute must always contain ATTR=VALUE pairs!" unless ary.length == 2
 
-        ary[0] = "occi.core.#{ary[0]}" unless ary[0].include?('.')
+        # type-cast the value, if necessary
         ary[1] = parse_attribute_value(ary[1])
         
         ary
@@ -50,16 +50,20 @@ module Occi::Cli
 
       def self.parse_mixin(mixin)
         parts = MIXIN_REGEXP.match(mixin).to_a.drop(1)
-        raise "Unknown mixin format '#{mixin.inspect}'! Use SCHEME#TERM or SHORT_SCHEME#TERM!" unless parts.length == 2
+        raise "Unknown mixin format #{mixin.inspect}! Use SCHEME#TERM or SHORT_SCHEME#TERM!" unless parts.length == 2
 
         Occi::Core::Mixin.new("#{parts[0]}#", parts[1])
       end
 
       def self.parse_action(action)
-        parts = ACTION_REGEXP.match(action).to_a.drop(1)
-        raise "Unknown action format '#{action.inspect}'! Use SCHEME#TERM or SHORT_SCHEME#TERM!" unless parts.length == 2
+        raise "Unknown action format #{action.inspect}! Use SCHEME#TERM or TERM!" if action.blank?
+        parts = action.split('#')
 
-        Occi::Core::Action.new("#{parts[0]}#", parts[1])
+        if parts.size == 2
+          Occi::Core::Action.new("#{parts[0]}#", parts[1])
+        else
+          Occi::Core::Action.new("action#", parts.last)
+        end
       end
 
       def self.parse_attribute_value(value)

data/lib/occi/cli/occi_opts.rb

@@ -33,7 +33,7 @@ module Occi::Cli
         opts.on("-e",
                 "--endpoint URI",
                 String,
-                "OCCI server URI, defaults to '#{options.endpoint}'") do |endpoint|
+                "OCCI server URI, defaults to #{options.endpoint.inspect}") do |endpoint|
           options.endpoint = URI(endpoint).to_s
         end
 
@@ -41,7 +41,7 @@ module Occi::Cli
                 "--auth METHOD",
                 AUTH_METHODS,
                 "Authentication method, only: [#{AUTH_METHODS.join('|')}], defaults " \
-                "to '#{options.auth.type}'") do |auth|
+                "to #{options.auth.type.inspect}") do |auth|
           options.auth.type = auth.to_s
         end
 
@@ -49,7 +49,7 @@ module Occi::Cli
                 "--username USER",
                 String,
                 "Username for basic or digest authentication, defaults to " \
-                "'#{options.auth.username}'") do |username|
+                "#{options.auth.username.inspect}") do |username|
           options.auth.username = username
         end
 
@@ -64,7 +64,7 @@ module Occi::Cli
         opts.on("-c",
                 "--ca-path PATH",
                 String,
-                "Path to CA certificates directory, defaults to '#{options.auth.ca_path}'") do |ca_path|
+                "Path to CA certificates directory, defaults to #{options.auth.ca_path.inspect}") do |ca_path|
           raise ArgumentError, "Path specified in --ca-path is not a directory!" unless File.directory? ca_path
           raise ArgumentError, "Path specified in --ca-path is not readable!" unless File.readable? ca_path
 
@@ -92,7 +92,7 @@ module Occi::Cli
         opts.on("-x",
                 "--user-cred FILE",
                 String,
-                "Path to user's x509 credentials, defaults to '#{options.auth.user_cert}'") do |user_cred|
+                "Path to user's x509 credentials, defaults to #{options.auth.user_cert.inspect}") do |user_cred|
           raise ArgumentError, "File specified in --user-cred is not a file!" unless File.file? user_cred
           raise ArgumentError, "File specified in --user-cred is not readable!" unless File.readable? user_cred
 
@@ -110,7 +110,7 @@ module Occi::Cli
                 "--media-type MEDIA_TYPE",
                 MEDIA_TYPES,
                 "Media type for client <-> server communication, only: [#{MEDIA_TYPES.join('|')}], " \
-                "defaults to '#{options.media_type}'") do |media_type|
+                "defaults to #{options.media_type.inspect}") do |media_type|
           options.media_type = media_type
         end
 
@@ -122,9 +122,9 @@ module Occi::Cli
         end
 
         opts.on("-t",
-                "--attribute ATTRS",
+                "--attribute ATTR",
                 Array,
-                "Comma separated attributes for new resource instances, mandatory: " \
+                "An \"attribute='value'\" pair, mandatory attrs for creating new resource instances: " \
                 "[#{REQ_CREATE_ATTRS.join(', ')}]") do |attributes|
           options.attributes ||= Occi::Core::Attributes.new
 
@@ -135,9 +135,9 @@ module Occi::Cli
         end
 
         opts.on("-T",
-                "--context CTX_VARS",
+                "--context CTX_VAR",
                 Array,
-                "Comma separated context variables for new 'compute' resource instances, " \
+                "A \"context_variable='value'\" pair for new 'compute' resource instances, " \
                 "only: [#{Occi::Cli::OcciOpts::Helper::ALLOWED_CONTEXT_VARS.join(', ')}]") do |context|
           options.context_vars ||= {}
 
@@ -181,7 +181,7 @@ module Occi::Cli
         opts.on("-g",
                 "--trigger-action ACTION",
                 String,
-                "Action to be triggered on the resource, formatted as SCHEME#TERM or SHORT_SCHEME#TERM") do |trigger_action|
+                "Action to be triggered on the resource, formatted as SCHEME#TERM or TERM") do |trigger_action|
           options.trigger_action = Occi::Cli::OcciOpts::Helper.parse_action(trigger_action)
         end
 
@@ -196,7 +196,7 @@ module Occi::Cli
                 "--output-format FORMAT",
                 Occi::Cli::ResourceOutputFactory.allowed_formats,
                 "Output format, only: [#{Occi::Cli::ResourceOutputFactory.allowed_formats.join('|')}], " \
-                "defaults to '#{options.output_format}'") do |output_format|
+                "defaults to #{options.output_format.to_s.inspect}") do |output_format|
           options.output_format = output_format
         end
 

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.2.0.beta.8" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.0.beta.10" 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.beta.7'
+  gem.add_dependency 'occi-api', '= 4.2.0.beta.10'
   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.beta.8
+  version: 4.2.0.beta.10
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-11 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.beta.7
+        version: 4.2.0.beta.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.7
+        version: 4.2.0.beta.10
 - !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
@@ -112,12 +112,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: 1.3.1
 requirements: []