vmcu 0.3.17 → 0.3.17.1

data/lib/cli/commands/misc.rb

@@ -120,34 +120,48 @@ module VMC::Cli::Command
 
     end
 
-    def import_from_registry
-      require 'win32/registry'
+    def load_registry_targets
       keyname = 'Software\Uhuru\CloudTargets'
-      access = Win32::Registry::KEY_READ
       reg_targets = []
 
-      Win32::Registry::HKEY_CURRENT_USER.open(keyname, access) do |reg|
-        reg.each{|k|
-          t = reg[k]
-          if t[0] == 'isUhuruApi'
-            reg_targets << {:uhuruApi => true,
-                            :target_url => t[2],
-                            :auth_token => t[3],
-                            :cloud_team => t[4],
-                            # todo: get the cloud_domain
-                            :cloud_domain => t[6],
-                            :desc => "Uhuru AppCloud [#{t[2]}] / #{t[5]}"
-            }
-          end
-          if t[0] == 'notUhuruApi'
-            reg_targets << {:uhuruApi => false,
-                            :target_url => t[2],
-                            :auth_token => t[4],
-                            :desc => "Cloud Foundry  [#{t[2]}] / #{t[3]}"
-            }
-          end
+      Win32::Registry::HKEY_CURRENT_USER.open(keyname).each_value do |subkey, type, data|
+        if data[0] == 'isUhuruApi'
+          reg_targets << {:uhuruApi => true,
+                          :target_url => data[2],
+                          :auth_token => data[3],
+                          :cloud_team => data[4],
+                          # todo: get the cloud_domain
+                          :cloud_domain => data[6],
+                          :desc => "Uhuru AppCloud [#{data[2]}] / #{data[5]}"
+          }
+        end
+        if data[0] == 'notUhuruApi'
+          reg_targets << {:uhuruApi => false,
+                          :target_url => data[2],
+                          :auth_token => data[4],
+                          :desc => "Cloud Foundry  [#{data[2]}] / #{data[3]}"
+          }
+        end
+      end
+      reg_targets
+    end
 
-        }
+    def import_from_registry
+      reg_targets = []
+      begin
+        require 'win32/registry'
+        reg_targets = load_registry_targets
+      rescue LoadError
+        err "Unable not import data from Windows Registry"
+        exit 1
+      rescue
+        err "Unable not import data from Windows Registry"
+        exit 1
+      end
+
+      if reg_targets.length == 0
+        display "No targets to import"
+        exit
       end
 
       selected_target_desc = ask(

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.17'
+    VERSION = '0.3.17.1'
   end
 end

metadata

@@ -1,263 +1,211 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vmcu
-version: !ruby/object:Gem::Version
-  version: 0.3.17
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.3.17.1
 platform: ruby
-authors:
-- VMware; Uhurusoftware
+authors: 
+  - VMware; Uhurusoftware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.4
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: interact
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.6
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-description: Client library and CLI that provides access to the VMware Cloud Application
-  Platform + support for Uhuru AppCloud.
+
+date: 2012-05-09 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: json_pure
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.5.1
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.7.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rubyzip
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.9.4
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rest-client
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.6.1
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.7.0
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: terminal-table
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.4.2
+    type: :runtime
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: interact
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.4.0
+    type: :runtime
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: addressable
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.2.6
+    type: :runtime
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: uuidtools
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.1.0
+    type: :runtime
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.3.0
+    type: :development
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: webmock
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.5.0
+    type: :development
+    version_requirements: *id010
+description: Client library and CLI that provides access to the VMware Cloud Application Platform + support for Uhuru AppCloud.
 email: support@uhurusoftware.com
-executables:
-- vmcu
+executables: 
+  - vmcu
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
-files:
-- LICENSE
-- README.md
-- Rakefile
-- config/clients.yml
-- config/micro/offline.conf
-- config/micro/paths.yml
-- config/micro/refresh_ip.rb
-- lib/cli/commands/admin.rb
-- lib/cli/commands/apps.rb
-- lib/cli/commands/base.rb
-- lib/cli/commands/manifest.rb
-- lib/cli/commands/micro.rb
-- lib/cli/commands/misc.rb
-- lib/cli/commands/services.rb
-- lib/cli/commands/user.rb
-- lib/cli/config.rb
-- lib/cli/console_helper.rb
-- lib/cli/core_ext.rb
-- lib/cli/errors.rb
-- lib/cli/frameworks.rb
-- lib/cli/manifest_helper.rb
-- lib/cli/runner.rb
-- lib/cli/services_helper.rb
-- lib/cli/tunnel_helper.rb
-- lib/cli/usage.rb
-- lib/cli/version.rb
-- lib/cli/zip_util.rb
-- lib/cli.rb
-- lib/vmc/client.rb
-- lib/vmc/const.rb
-- lib/vmc/micro/switcher/base.rb
-- lib/vmc/micro/switcher/darwin.rb
-- lib/vmc/micro/switcher/dummy.rb
-- lib/vmc/micro/switcher/linux.rb
-- lib/vmc/micro/switcher/windows.rb
-- lib/vmc/micro/vmrun.rb
-- lib/vmc/micro.rb
-- lib/vmc.rb
-- caldecott_helper/Gemfile
-- caldecott_helper/Gemfile.lock
-- caldecott_helper/server.rb
-- bin/vmcu
+
+extra_rdoc_files: 
+  - README.md
+  - LICENSE
+files: 
+  - LICENSE
+  - README.md
+  - Rakefile
+  - config/clients.yml
+  - config/micro/offline.conf
+  - config/micro/paths.yml
+  - config/micro/refresh_ip.rb
+  - lib/cli.rb
+  - lib/vmc.rb
+  - lib/cli/config.rb
+  - lib/cli/console_helper.rb
+  - lib/cli/core_ext.rb
+  - lib/cli/errors.rb
+  - lib/cli/frameworks.rb
+  - lib/cli/manifest_helper.rb
+  - lib/cli/runner.rb
+  - lib/cli/services_helper.rb
+  - lib/cli/tunnel_helper.rb
+  - lib/cli/usage.rb
+  - lib/cli/version.rb
+  - lib/cli/zip_util.rb
+  - lib/cli/commands/admin.rb
+  - lib/cli/commands/apps.rb
+  - lib/cli/commands/base.rb
+  - lib/cli/commands/manifest.rb
+  - lib/cli/commands/micro.rb
+  - lib/cli/commands/misc.rb
+  - lib/cli/commands/services.rb
+  - lib/cli/commands/user.rb
+  - lib/vmc/client.rb
+  - lib/vmc/const.rb
+  - lib/vmc/micro.rb
+  - lib/vmc/micro/vmrun.rb
+  - lib/vmc/micro/switcher/base.rb
+  - lib/vmc/micro/switcher/darwin.rb
+  - lib/vmc/micro/switcher/dummy.rb
+  - lib/vmc/micro/switcher/linux.rb
+  - lib/vmc/micro/switcher/windows.rb
+  - caldecott_helper/Gemfile
+  - caldecott_helper/Gemfile.lock
+  - caldecott_helper/server.rb
+  - bin/vmcu
 homepage: http://www.uhurusoftware.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Client library and CLI that provides access to the VMware Cloud Application
-  Platform + support for Uhuru AppCloud.
+summary: Client library and CLI that provides access to the VMware Cloud Application Platform + support for Uhuru AppCloud.
 test_files: []
+