vagrant-vcloud 0.1.2 → 0.2.0

data/lib/vagrant-vcloud/errors.rb

@@ -1,10 +1,10 @@
-require "vagrant"
+require 'vagrant'
 
 module VagrantPlugins
   module VCloud
     module Errors
       class VCloudError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_vcloud.errors")
+        error_namespace('vagrant_vcloud.errors')
       end
       class RsyncError < VCloudError
         error_key(:rsync_error)
@@ -41,7 +41,7 @@ module VagrantPlugins
         error_key(:forward_port_collision)
       end
       class SubnetErrors < VCloudError
-        error_namespace("vagrant_vcloud.errors.subnet_errors")
+        error_namespace('vagrant_vcloud.errors.subnet_errors')
       end
       class InvalidSubnet < SubnetErrors
         error_key(:invalid_subnet)
@@ -50,7 +50,7 @@ module VagrantPlugins
         error_key(:subnet_too_small)
       end
       class RestError < VCloudError
-        error_namespace("vagrant_vcloud.errors.rest_errors")
+        error_namespace('vagrant_vcloud.errors.rest_errors')
       end
       class ObjectNotFound < RestError
         error_key(:object_not_found)

data/lib/vagrant-vcloud/model/forwarded_port.rb

@@ -46,10 +46,12 @@ module VagrantPlugins
 
           options ||= {}
           @auto_correct = false
-          @auto_correct = options[:auto_correct] if options.has_key?(:auto_correct)
+          if options.key?(:auto_correct)
+            @auto_correct = options[:auto_correct]
+          end
           @guest_ip = options[:guest_ip] || nil
           @host_ip = options[:host_ip] || nil
-          @protocol = options[:protocol] || "tcp"
+          @protocol = options[:protocol] || 'tcp'
         end
 
         # This corrects the host port and changes it to the given new port.

data/lib/vagrant-vcloud/plugin.rb

@@ -1,21 +1,22 @@
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The Vagrant vCloud plugin must be run within Vagrant."
+  raise 'The Vagrant vCloud plugin must be run within Vagrant.'
 end
 
-if Vagrant::VERSION < "1.2.0"
-  raise "The Vagrant vCloud plugin is only compatible with Vagrant 1.2+"
+if Vagrant::VERSION < '1.2.0'
+  fail 'The Vagrant vCloud plugin is only compatible with Vagrant 1.2+'
 end
 
 module VagrantPlugins
   module VCloud
     class Plugin < Vagrant.plugin('2')
-      name "vCloud"
-      description "Allows Vagrant to manage machines with VMware vCloud Director(R)"
+      name 'VMware vCloud Director Provider'
+      description 'Allows Vagrant to manage machines with VMware vCloud
+                    Director(R)'
 
       config(:vcloud, :provider) do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
 
@@ -25,22 +26,29 @@ module VagrantPlugins
         setup_i18n
 
         # Return the provider
-        require_relative "provider"
+        require_relative 'provider'
         Provider
       end
 
+      # Added a vagrant vcloud-status command to enhance troubleshooting and
+      # visibility.
+      command('vcloud-status') do
+        require_relative 'command'
+        Command
+      end
+
       def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", VCloud.source_root)
+        I18n.load_path << File.expand_path('locales/en.yml', VCloud.source_root)
         I18n.reload!
       end
 
       # This sets up our log level to be whatever VAGRANT_LOG is.
       def self.setup_logging
-        require "log4r"
+        require 'log4r'
 
         level = nil
         begin
-          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
+          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
         rescue NameError
           # This means that the logging constant wasn't found,
           # which is fine. We just keep `level` as `nil`. But
@@ -48,31 +56,33 @@ module VagrantPlugins
           level = nil
         end
 
-        # Some constants, such as "true" resolve to booleans, so the
+        # Some constants, such as 'true' resolve to booleans, so the
         # above error checking doesn't catch it. This will check to make
         # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
+        level = nil unless level.is_a?(Integer)
 
-        # Set the logging level on all "vagrant" namespaced
+        # Set the logging level on all 'vagrant' namespaced
         # logs as long as we have a valid level.
         if level
-          logger = Log4r::Logger.new("vagrant_vcloud")
+          logger = Log4r::Logger.new('vagrant_vcloud')
           logger.outputters = Log4r::Outputter.stderr
           logger.level = level
-          logger = nil
+          # logger = nil
         end
       end
     end
     module Driver
-      autoload :Meta, File.expand_path("../driver/meta", __FILE__)
-      autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
+      autoload :Meta, File.expand_path('../driver/meta', __FILE__)
+      autoload :Version_5_1, File.expand_path('../driver/version_5_1', __FILE__)
     end
     module Model
-      autoload :ForwardedPort, File.expand_path("../model/forwarded_port", __FILE__)
+      autoload :ForwardedPort,
+               File.expand_path('../model/forwarded_port', __FILE__)
     end
 
     module Util
-      autoload :CompileForwardedPorts, File.expand_path("../util/compile_forwarded_ports", __FILE__)
+      autoload :CompileForwardedPorts,
+               File.expand_path('../util/compile_forwarded_ports', __FILE__)
     end
   end
 end

data/lib/vagrant-vcloud/provider.rb

@@ -1,5 +1,5 @@
-require "log4r"
-require "vagrant"
+require 'log4r'
+require 'vagrant'
 
 module VagrantPlugins
   module VCloud
@@ -15,17 +15,17 @@ module VagrantPlugins
       end
 
       def ssh_info
-        env = @machine.action("read_ssh_info")
+        env = @machine.action('read_ssh_info')
         env[:machine_ssh_info]
       end
 
       def state
-        env = @machine.action("read_state")
+        env = @machine.action('read_state')
 
         state_id = env[:machine_state_id]
 
         # Translate into short/long descriptions
-        short = state_id.to_s.gsub("_", " ")
+        short = state_id.to_s.gsub('_', ' ')
         long  = I18n.t("vagrant_vcloud.states.#{state_id}")
 
         # Return the MachineState object
@@ -33,7 +33,7 @@ module VagrantPlugins
       end
 
       def to_s
-        id = @machine.id.nil? ? "new" : @machine.id
+        id = @machine.id.nil? ? 'new' : @machine.id
         "vCloud (#{id})"
       end
     end

data/lib/vagrant-vcloud/util/compile_forwarded_ports.rb

@@ -1,4 +1,4 @@
-require "vagrant/util/scoped_hash_override"
+require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
   module VCloud

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = "0.1.2"
+    VERSION = '0.2.0'
   end
 end

data/locales/en.yml

@@ -4,11 +4,12 @@ en:
     will_not_destroy: "VM will not be destroyed"
     vm_already_running: "VM is already running"
     vm_halted_cannot_suspend: "VM is not running or already suspended, cannot suspend it."
-    rsync_not_found_warning: |-
-      Warning! Folder sync disabled because the rsync binary is missing.
-      Make sure rsync is installed and the binary can be found in the PATH.
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
+    sync:
+      rsync_not_found_warning: |-
+        Warning! Folder sync disabled because the rsync binary is missing.
+        Make sure rsync is installed and the binary can be found in the PATH.
+      rsync_folder: |-
+        Rsyncing folder: %{hostpath} => %{guestpath}
     config: 
       api_version: "Configuration must specify a vCloud API version (default=5.1)"
       catalog_name: "Configuration must specify a vCloud Director Catalog (for the VM templates images)"

data/vagrant-vcloud.gemspec

@@ -11,19 +11,22 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.summary = 'VMware vCloud Director® provider'
   s.description = 'Enables Vagrant to manage machines with VMware vCloud Director®.'
-  
+
   s.add_runtime_dependency 'i18n', '~> 0.6.4'
   s.add_runtime_dependency 'log4r', '~> 1.1.10'
-  s.add_runtime_dependency 'nokogiri', '~> 1.6.0'
+  s.add_runtime_dependency 'nokogiri', '~> 1.5.5'
   s.add_runtime_dependency 'httpclient', '~> 2.3.4.1'
   s.add_runtime_dependency 'ruby-progressbar', '~> 1.1.1'
   s.add_runtime_dependency 'netaddr', '~> 1.5.0'
+  # Adding awesome_print because it's just awesome to read XML
+  s.add_runtime_dependency 'awesome_print', '~> 1.2.0'
+  s.add_runtime_dependency 'terminal-table', '~> 1.4.5'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec-core', '~> 2.12.2'
+  s.add_development_dependency 'rspec-expectations', '~> 2.12.1'
+  s.add_development_dependency 'rspec-mocks', '~> 2.12.1'
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec-core", "~> 2.12.2"
-  s.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  s.add_development_dependency "rspec-mocks", "~> 2.12.1"
-  
   s.files = `git ls-files`.split($/)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +188,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -177,6 +206,7 @@ files:
 - lib/vagrant-vcloud/action/forward_ports.rb
 - lib/vagrant-vcloud/action/handle_nat_port_collisions.rb
 - lib/vagrant-vcloud/action/inventory_check.rb
+- lib/vagrant-vcloud/action/is_bridged.rb
 - lib/vagrant-vcloud/action/is_created.rb
 - lib/vagrant-vcloud/action/is_paused.rb
 - lib/vagrant-vcloud/action/is_running.rb
@@ -192,6 +222,7 @@ files:
 - lib/vagrant-vcloud/action/suspend.rb
 - lib/vagrant-vcloud/action/sync_folders.rb
 - lib/vagrant-vcloud/action/unmap_port_forwardings.rb
+- lib/vagrant-vcloud/command.rb
 - lib/vagrant-vcloud/config.rb
 - lib/vagrant-vcloud/driver/base.rb
 - lib/vagrant-vcloud/driver/meta.rb