occi-cli 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16a411983d56d7c65b82929c86736782afa9095
-  data.tar.gz: aa72b75779620093adad0a8570f23af6ba29e4f1
+  metadata.gz: 98abbaa8d7ca36a46e0b2dd729eb944350dfe71e
+  data.tar.gz: 0a3fc8851f9860b36f2236a8f538998cfe3d64ef
 SHA512:
-  metadata.gz: fd7b8a10ef380ddf2cce77f925122c4c300a099e89141880fac1825ed4d4570b52e4946378782fd2b5b13f4528411068c32aa5667c788d5f390da287ecba9699
-  data.tar.gz: 3e2cf4d7c6170ca32ead56492c1d6ce0ab650972a69de2cadb5d48f60c27c523ba4e0477a68b17084624552c331105f7a853c3ccbabd90e2b9272feae63012cf
+  metadata.gz: dd2ca2ac7a610ecd5d3d6537b7914f89347dca8da2f553a361168d837ca6ef1222a200af8d3f08debe49a6ae11408d91686871d2b3aba6c134001370fcae1a7f
+  data.tar.gz: 6d636b97f017f7103e9e3ecbe9c14189caf36d5abdf38fb8c125ea91274c06da5015b8e10ae67448e9fcb079dd673cad1e745cf132e1e5d8ac7d077a3a0de44d

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -26,9 +26,9 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: oraclejdk7
-    - rvm: 2.1.0
+    - rvm: 2.1.1
       jdk: openjdk7
-    - rvm: 2.1.0
+    - rvm: 2.1.1
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: openjdk7

data/LICENSE

@@ -1,13 +1,19 @@
-Copyright (c) 2012 GWDG
+# @markup text
+
+The work represented by this source file is partially or entirely funded
+by the EGI-InSPIRE project through the European Commission's 7th Framework
+Programme (contract # INFSO-RI-261323)
+
+Copyright (c) 2012-2014 GWDG, CESNET
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

data/Rakefile

@@ -5,6 +5,9 @@ task :default => 'test'
 desc "Run all tests; includes rspec and coverage reports"
 task :test => 'rcov:all'
 
+desc "Run all tests; includes rspec and coverage reports"
+task :spec => 'test'
+
 Gem::Tasks.new(:build => {:tar => true, :zip => true}, :sign => {:checksum => true, :pgp => false})
 
 namespace :rcov do

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

@@ -22,9 +22,6 @@ occi --endpoint <%= ENDPOINT -%> --action describe --resource <%= res -%>
 ## Creating resources
 <% %w(compute network storage).each do |res| %>
 occi --endpoint <%= ENDPOINT -%> --action create [ --attribute attribute_name='attribute_value' ]+ [ --mixin mixin_type#mixin_term ]+ --resource <%= res -%>
-<% if res == 'compute' %>
-occi --endpoint <%= ENDPOINT -%> --action create [ --attribute attribute_name='attribute_value' ]+ [ --link /resource_type/instance_id ]+ --resource <%= res -%>
-<% end -%>
 <% end %>
 
 ## Linking/unlinking resources

data/lib/occi/cli/occi_opts.rb

@@ -89,6 +89,12 @@ module Occi::Cli
           options.auth.ca_file = ca_file
         end
 
+        opts.on("-s",
+                "--skip-ca-check",
+                "Skip server certificate verification [NOT recommended]") do
+          silence_warnings { OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE) }
+        end
+
         opts.on("-F",
                 "--filter CATEGORY",
                 String,
@@ -176,7 +182,7 @@ module Occi::Cli
         opts.on("-j",
                 "--link URI",
                 Array,
-                "URI of an instance to be linked with the given resource, applicable for actions 'create' and 'link'") do |links|
+                "URI of an instance to be linked with the given resource, applicable only for action 'link'") do |links|
           options.links ||= []
 
           links.each do |link|

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.2.3" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.4" 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.2'
+  gem.add_dependency 'occi-api', '~> 4.2.3'
   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.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-05-12 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.2
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Executable OCCI client