occi-cli 4.2.0.beta.16 → 4.2.0.beta.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae47add82d1e227122778d88ee9a300dfb63873
-  data.tar.gz: 938818b0e0210f0fd3dfe7c90d546f4da81b1829
+  metadata.gz: 553184ed6a0cfbe4fe8835f91acf30717c20ce54
+  data.tar.gz: e4745d6bb27fa7a13f69ea25ce2cd37e401ff494
 SHA512:
-  metadata.gz: 73dca9cb77e9018df43f469db3253f688915407c842c1c896d95562bea9394f02149ad1308f56dd8b47f254a7cb30b8b67ae365d40217f9fe4edaf6e8f63f95c
-  data.tar.gz: 0d8c8f459612f1bbf8ffc150252805baf6399cff58f5e5471084a79d47830cfcf1c08678d1f2af980947a48b18fcb22f656a9a1dd5f86bd05e5b2090b6483e9e
+  metadata.gz: 82d2282727f225d9b991c608e0bdeb1533118776ab2df4d1a26792a1938b8dfa2e29d94cda06bb25f2508d74ce5e4b39a818dfdd3411fd9cf63447a250bc2fc6
+  data.tar.gz: 45c25be34249f9f08607d735c3cc1facf79099cadfc2e0b3b2ed7147aeafb704638fea808e179cb7ef6a5c130d5411a5ff2c06ba2f58e92184ea21584bbc7f3c

data/README.md

@@ -14,14 +14,10 @@ Requirements
 * RubyGems have to be installed
 * Rake has to be installed (e.g., `gem install rake`)
 
-### Dependencies
-* `libxslt1-dev` or `libxslt-devel`
-* `libxml2-dev`or `libxml2-devel`
-
 ### Examples
 #### For distros based on Debian:
 ~~~
-apt-get install ruby rubygems ruby-dev libxslt1-dev libxml2-dev
+apt-get install ruby rubygems ruby-dev
 ~~~
 ~~~
 ruby -v
@@ -31,7 +27,7 @@ ruby -v
 
 #### For distros based on RHEL:
 ~~~
-yum install libxml2-devel libxslt-devel ruby-devel openssl-devel gcc gcc-c++ ruby rubygems
+yum install ruby-devel openssl-devel gcc gcc-c++ ruby rubygems
 ~~~
 ~~~
 ruby -v
@@ -146,7 +142,7 @@ To describe a specific OS template or Resource template use
 
 To create a compute resource with mixins use
 
-    occi --endpoint https://<ENDPOINT>:<PORT>/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attributes title="My rOCCI VM" --auth x509
+    occi --endpoint https://<ENDPOINT>:<PORT>/ --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attribute occi.core.title="My rOCCI VM" --auth x509
 
 To delete a compute resource use
 

data/lib/occi/cli/occi_opts/cli_examples.erb

@@ -6,7 +6,7 @@
 occi --endpoint <%= ENDPOINT -%> --action list --resource os_tpl
 occi --endpoint <%= ENDPOINT -%> --action list --resource resource_tpl
 occi --endpoint <%= ENDPOINT -%> --action describe --resource os_tpl#debian6
-occi --endpoint <%= ENDPOINT -%> --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attribute title="My rOCCI VM"
+occi --endpoint <%= ENDPOINT -%> --action create --resource compute --mixin os_tpl#debian6 --mixin resource_tpl#small --attribute occi.core.title="My rOCCI VM"
 occi --endpoint <%= ENDPOINT -%> --action delete --resource /compute/65sd4f654sf65g4-s5fg65sfg465sfg-sf65g46sf5g4sdfg
 
 ## Listing resources
@@ -41,7 +41,8 @@ occi --endpoint <%= ENDPOINT -%> --action delete --resource <%= res -%>
 
 ## Triggering actions on resources
 <% %w(compute network storage).each do |res| %>
-occi --endpoint <%= ENDPOINT -%> --action trigger --trigger-action action_type#action_term [ --attribute attribute_name='attribute_value' ]+ --resource <%= res -%>
+occi --endpoint <%= ENDPOINT -%> --action trigger --trigger-action action_scheme#action_term [ --attribute attribute_name='attribute_value' ]+ --resource <%= res -%>
+occi --endpoint <%= ENDPOINT -%> --action trigger --trigger-action action_term [ --attribute attribute_name='attribute_value' ]+ --resource <%= res -%>
 <% end %>
 
 ## Other

data/lib/occi/cli/occi_opts.rb

@@ -10,7 +10,7 @@ module Occi::Cli
   class OcciOpts
 
     AUTH_METHODS = [:x509, :basic, :digest, :none].freeze
-    MEDIA_TYPES = ["application/occi+json", "application/occi+xml", "text/plain,text/occi", "text/plain"].freeze
+    MEDIA_TYPES = ["application/occi+json", "text/plain,text/occi", "text/plain", "text/occi"].freeze
     ACTIONS = [:list, :describe, :create, :delete, :trigger, :link, :unlink].freeze
     LOG_OUTPUTS = [:stdout, :stderr].freeze
     LOG_LEVELS = [:debug, :error, :fatal, :info, :unknown, :warn].freeze

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.2.0.beta.16" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.0.beta.17" 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.15'
+  gem.add_dependency 'occi-api', '= 4.2.0.beta.16'
   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.16
+  version: 4.2.0.beta.17
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.15
+        version: 4.2.0.beta.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.15
+        version: 4.2.0.beta.16
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement