occi-cli 4.3.4 → 4.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed4fdb3246ce1cf2f09791a0cdb34102cdbac4f
-  data.tar.gz: 66cf0cdcf5d6c519357c834ab78b3f49bd3de419
+  metadata.gz: 39502c62d6a033b34cabcf442032b7635fb98df7
+  data.tar.gz: 0a3f0bfa74eca163676ebadf446392ee0bc82b2d
 SHA512:
-  metadata.gz: 30499156112eb63ba71a600aed6b689a15a3fc71211754e8193b7ed74e8cc76bec4c3cf36aec7eee275134ec30bbf389721ebc8b81a59926b71570e8d876b5b1
-  data.tar.gz: 856b1f6728377740a504adc2c01a4b0b02218b97a221b19f4e1ea1cd55240a0eb3934fa6297b9c72c3673a90bcbf859973de7944c293f0f70c912d002b759fc6
+  metadata.gz: 6f997d695d5621b74f7522d96b5b95e212bc4b9a2c30ee499fc564654655fbe107dc69730f256cfaa70616e606e429c2521242f72c9dcbd66eb9b7ecac8fb332
+  data.tar.gz: 476c7fc25ca9d74fc902d88ddaf813f6b50d87582dbda51afcb79ff70527a5a49b7162fdfdc85618acca516894ae02e996c50c354a049cec6ee2d200cd9714ba

data/Gemfile

@@ -1,14 +1,3 @@
 source "https://rubygems.org/"
 
 gemspec
-
-group :development do
-  gem 'warbler', :git => 'git://github.com/jruby/warbler.git', :ref => 'ce3ce4df137504822e4cbb9399dee7e7dd767c44'
-  gem 'rubygems-tasks', :git => 'git://github.com/postmodern/rubygems-tasks.git'
-  gem "rspec"
-  gem "rake"
-  gem "builder"
-  gem "simplecov"
-  gem "yard"
-  gem "yard-rspec"
-end

data/lib/occi-cli.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'occi-api'
+require 'timeout'
 
 module Occi::Cli; end
 

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

@@ -1,5 +1,7 @@
 module Occi::Cli::Helpers::CreateHelper
 
+  MIN_TIMEOUT = 5
+
   def helper_create(options, output = nil)
     location = nil
 
@@ -43,8 +45,25 @@ module Occi::Cli::Helpers::CreateHelper
     #res.check
 
     Occi::Cli::Log.debug "Creating #{options.resource.inspect}: #{res.inspect}"
+    new_link = create(res)
+    helper_create_wait(new_link, options.wait_for_active) if options.wait_for_active > 0
+
+    new_link
+  end
 
-    create res
+  def helper_create_wait(resource_link, timeout)
+    begin
+      Timeout::timeout(timeout) {
+        Occi::Cli::Log.debug "Starting #{timeout}s wait period for #{resource_link.inspect} to become active"
+        while true
+          desrc = describe(resource_link).first
+          break if !desrc.respond_to?(:state) || desrc.state == 'active'
+          sleep MIN_TIMEOUT
+        end
+      }
+    rescue Timeout::Error
+      Occi::Cli::Log.warn "Attempted to wait #{timeout}s for #{resource_link.inspect} to become active"
+    end
   end
 
   def helper_create_attach_links(options, res)

data/lib/occi/cli/occi_opts.rb

@@ -240,6 +240,14 @@ module Occi::Cli
           end
         end
 
+        opts.on("-w",
+                "--wait-for-active TIMEOUT",
+                Integer,
+                "Wait for TIMEOUT seconds for the created resource to become 'active' before returning, " \
+                "defaults to 0 seconds (will be interpreted as 'disabled')") do |wait_for_active|
+          options.wait_for_active = wait_for_active
+        end
+
         opts.on_tail("-z",
                      "--examples",
                      "Show usage examples") do |examples|
@@ -329,6 +337,7 @@ module Occi::Cli
 
       options.endpoint = "http://localhost:3000"
       options.timeout = nil
+      options.wait_for_active = 0
 
       options.auth = {}
       options.auth.type = "none"

data/lib/occi/cli/version.rb

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

data/occi-cli.gemspec

@@ -23,5 +23,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json', '~> 1.8', '>= 1.8.1'
   gem.add_dependency 'highline', '~> 1.6', '>= 1.6.21'
 
+  gem.add_development_dependency 'bundler', '~> 1.12'
+  gem.add_development_dependency 'rake', '~> 11.0'
+  gem.add_development_dependency 'rspec', '~> 3.4'
+  gem.add_development_dependency 'simplecov', '~> 0.11'
+  gem.add_development_dependency 'pry', '~> 0.10'
+  gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
+  gem.add_development_dependency 'yard', '~> 0.8'
+
   gem.required_ruby_version = ">= 1.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -72,6 +72,104 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: This gem is a client implementation of the Open Cloud Computing Interface
   in Ruby
 email:
@@ -145,8 +243,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Executable OCCI client
-test_files: []
+test_files:
+- spec/occi/cli/helpers_spec.rb
+- spec/occi/cli/occi_opts_spec.rb
+- spec/occi/cli/resource_output_factory_spec.rb
+- spec/spec_helper.rb