occi-cli 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c64f0a254a8ad13bf87a32afd212cb92b565fe7
-  data.tar.gz: 9404dabf53b0b0b32b33a5943ae104402e0d32a8
+  metadata.gz: 923576b014280e1810eda84b47b89ea27fe5a239
+  data.tar.gz: 685817d6dc86d4e3c1c8e1407e5553bed93adf74
 SHA512:
-  metadata.gz: d9ee1c0c68c62028270518d0cbe267e1f1e143309150eeb01354354f1d132f4c66d345ff5f013ff76c53b8fd75e39439fc499935f747eee476badfe5ef4f81e2
-  data.tar.gz: 6c8780431ac94e0522802823d316d2cfea6fd4366e647070ee160f63a784c0973bf2ed89447d0940ea0be06db1f4365c9dcb116a283fd9e4cb4719aac486cf9f
+  metadata.gz: 5542e7d99378f2ceb4ae38cad6c4bbca6ba715ebb36e4f2ae710655709063db20ffe3d50b647dc073b8cfa71e4ca1fea8f0e4e80f6bb5695f102137e27483665
+  data.tar.gz: 2860ac0d49267d3040b36dd1fc7d2ba29aaa770cce3796f66379c4bb8df003ad59595bed0204f5b364983ebcf0f7944589351c27c824a5ac5ec726f200ad4095

data/bin/occi

@@ -21,6 +21,8 @@ require 'highline/import'
 
 require 'occi-cli'
 
+NONPASS_AUTHS = %w(none token).freeze
+
 # get arguments and validate/parse them to an ostruct
 options = Occi::Cli::OcciOpts.parse ARGV
 
@@ -42,7 +44,7 @@ if options.auth[:password].nil? || options.auth[:user_cert_password].nil?
 
   options.auth[:user_cert_password] = ask("Enter a password: ") {
       |q| q.echo = '*'
-  } unless options.auth[:type] == "none" || (options.auth[:voms] && options.auth[:type] == "x509")
+  } unless NONPASS_AUTHS.include?(options.auth[:type]) || (options.auth[:voms] && options.auth[:type] == "x509")
 
   options.auth[:password] = options.auth[:user_cert_password]
 end

data/lib/occi/cli/occi_opts.rb

@@ -9,7 +9,7 @@ module Occi::Cli
 
   class OcciOpts
 
-    AUTH_METHODS = [:x509, :basic, :digest, :none].freeze
+    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
     LOG_OUTPUTS = [:stdout, :stderr].freeze
@@ -121,6 +121,15 @@ module Occi::Cli
           options.auth.voms = true
         end
 
+        opts.on("-q",
+                "--token TOKEN",
+                String,
+                "A pre-generated token to be used for authentication purposes") do |token|
+          raise ArgumentError, "Token cannot be blank!" if token.blank?
+
+          options.auth.token = token
+        end
+
         opts.on("-y",
                 "--media-type MEDIA_TYPE",
                 MEDIA_TYPES,

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.3.2" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.3.3" 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.3', '>= 4.3.3'
+  gem.add_dependency 'occi-api', '~> 4.3', '>= 4.3.4'
   gem.add_dependency 'json', '~> 1.8', '>= 1.8.1'
   gem.add_dependency 'highline', '~> 1.6', '>= 1.6.21'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -21,7 +21,7 @@ dependencies:
         version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: 4.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement