vagrant-hp 0.1.2 → 0.1.3

data/lib/vagrant-hp/action/read_ssh_info.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module HP
@@ -13,12 +13,12 @@ module VagrantPlugins
       class ReadSSHInfo
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::read_ssh_info")
+          @logger = Log4r::Logger.new('vagrant_hp::action::read_ssh_info')
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:hp_compute], env[:machine])
-
+          env[:machine_ssh_info] = read_ssh_info(env[:hp_compute],
+                                                 env[:machine])
           @app.call(env)
         end
 
@@ -29,7 +29,8 @@ module VagrantPlugins
           server = hp.servers.get(machine.id)
           if server.nil?
             # The machine can't be found
-            @logger.info("Machine couldn't be found, assuming it got destroyed.")
+            @logger.info('Machine couldn''t be found,
+                         assuming it got destroyed.')
             machine.id = nil
             return nil
           end
@@ -39,10 +40,10 @@ module VagrantPlugins
           # Read the DNS info
           return {
             # Usually there should only be one public IP
-            :host => server.public_ip_address,
-            :port => 22,
-            :username => config.ssh_username,
-            :private_key_path => config.ssh_private_key_path,
+            host:              server.public_ip_address,
+            port:              22,
+            username:          config.ssh_username,
+            private_key_path:  config.ssh_private_key_path,
           }
         end
       end

data/lib/vagrant-hp/action/read_state.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module HP
@@ -13,7 +13,7 @@ module VagrantPlugins
       class ReadState
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::read_state")
+          @logger = Log4r::Logger.new('vagrant_hp::action::read_state')
         end
 
         def call(env)
@@ -27,9 +27,11 @@ module VagrantPlugins
 
           # Find the machine
           server = hp.servers.get(machine.id)
-          if server.nil? || [:"shutting-down", :terminated].include?(server.state.to_sym)
+          if server.nil? ||
+              [:"shutting-down", :terminated].include?(server.state.to_sym)
             # The machine can't be found
-            @logger.info("Machine not found or terminated, assuming it got destroyed.")
+            @logger.info(
+                'Machine not found or terminated, assuming it got destroyed.')
             machine.id = nil
             return :not_created
           end

data/lib/vagrant-hp/action/sync_folders.rb

@@ -3,9 +3,9 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "log4r"
+require 'log4r'
 
-require "vagrant/util/subprocess"
+require 'vagrant/util/subprocess'
 
 module VagrantPlugins
   module HP
@@ -15,7 +15,11 @@ module VagrantPlugins
       class SyncFolders
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::sync_folders")
+          @logger = Log4r::Logger.new('vagrant_hp::action::sync_folders')
+        end
+
+        def ssh_key_options(ssh_info)
+            Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
         end
 
         def call(env)
@@ -24,7 +28,7 @@ module VagrantPlugins
           ssh_info = env[:machine].ssh_info
 
           env[:machine].config.vm.synced_folders.each do |id, data|
-            next if data[:hostpath] == "."
+            next if data[:hostpath] == '.'
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
 
@@ -32,9 +36,9 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
-            env[:ui].info(I18n.t("vagrant_hp.rsync_folder",
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
+            env[:ui].info(I18n.t('vagrant_hp.rsync_folder',
+                                hostpath: hostpath,
+                                guestpath: guestpath))
 
             # Create the guest path
             env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
@@ -43,17 +47,16 @@ module VagrantPlugins
 
             # Rsync over to the guest path using the SSH info
             command = [
-              "rsync", "--verbose", "--archive", "-z",
-              "-e", "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{ssh_info[:port]} -i '#{ssh_info[:private_key_path]}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+              'rsync', '--verbose', '--archive', '-z',
+              '-e', "ssh -o StrictHostKeyChecking=no -p #{ssh_info[:port]} #{ssh_key_options(ssh_info)}",
+              hostpath, "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
               raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
+                    guestpath: guestpath,
+                    hostpath: hostpath,
+                    stderr: r.stderr
             end
           end
         end

data/lib/vagrant-hp/action/test.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'fog'
+
+hp_access_key = "Y5SKH1MU6HZ2PEM9ZNZL"
+hp_secret_key = "YA2BJr98R3hDK7IwpIkHXlDCDo9GG+GIuqhflPqQ"
+hp_tenant_id  = "87309806546461"
+
+
+connection = Fog::Compute.new(
+    provider: :hp,
+    version: 'v2',
+    hp_access_key: hp_access_key,
+    hp_secret_key: hp_secret_key,
+    hp_tenant_id: hp_tenant_id,
+    hp_avl_zone: 'az-1.region-a.geo-1'
+)
+
+puts "++++++++++++++++++++++++++"
+puts "hp_avl_zone: #{connection.inspect}"
+puts "++++++++++++++++++++++++++"
+puts "key_pairs: #{connection.key_pairs}"
+puts "++++++++++++++++++++++++++"

data/lib/vagrant-hp/action/timed_provision.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "vagrant-hp/util/timer"
+require 'vagrant-hp/util/timer'
 
 module VagrantPlugins
   module HP
@@ -12,14 +12,14 @@ module VagrantPlugins
       # provisioner runs.
       class TimedProvision < Vagrant::Action::Builtin::Provision
         def run_provisioner(env, p)
-          env[:ui].info("Insde TimedProvision")
+          env[:ui].info('Inside TimedProvision')
           timer = Util::Timer.time do
             super
           end
 
           env[:metrics] ||= {}
-          env[:metrics]["provisioner_times"] ||= []
-          env[:metrics]["provisioner_times"] << [p.class.to_s, timer]
+          env[:metrics]['provisioner_times'] ||= []
+          env[:metrics]['provisioner_times'] << [p.class.to_s, timer]
         end
       end
     end

data/lib/vagrant-hp/action/warn_networks.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
 
         def call(env)
           if env[:machine].config.vm.networks.length > 0
-            env[:ui].warn(I18n.t("vagrant_hp.warn_networks"))
+            env[:ui].warn(I18n.t('vagrant_hp.warn_networks'))
           end
 
           @app.call(env)

data/lib/vagrant-hp/config.rb

@@ -3,12 +3,11 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "vagrant"
+require 'vagrant'
 
 module VagrantPlugins
   module HP
-    class Config < Vagrant.plugin("2", :config)
-
+    class Config < Vagrant.plugin('2', :config)
       attr_accessor :access_key
 
       attr_accessor :secret_key
@@ -31,9 +30,9 @@ module VagrantPlugins
 
       attr_accessor :security_groups
 
-      def initialize(region_specific=false)
+      def initialize(region_specific = false)
         @access_key = UNSET_VALUE
-        @secret_key= UNSET_VALUE
+        @secret_key = UNSET_VALUE
         @server_name = UNSET_VALUE
         @private_ip_address = UNSET_VALUE
         @keypair_name = UNSET_VALUE
@@ -58,7 +57,8 @@ module VagrantPlugins
         super.tap do |result|
           # Copy over the region specific flag. "True" is retained if either
           # has it.
-          new_region_specific = other.instance_variable_get(:@__region_specific)
+          new_region_specific = other.instance_variable_get(
+                                                          :@__region_specific)
           result.instance_variable_set(
             :@__region_specific, new_region_specific || @__region_specific)
 
@@ -91,7 +91,7 @@ module VagrantPlugins
         @image = nil if @image == UNSET_VALUE
 
         # Default instance type is an standard.small
-        @flavor = "standard.small" if @flavor == UNSET_VALUE
+        @flavor = 'standard.small' if @flavor == UNSET_VALUE
 
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE
@@ -101,7 +101,7 @@ module VagrantPlugins
 
         # Default availability-zone is az1. This is sensible because HP Cloud
         # generally defaults to this as well.
-        @availability_zone = "az1" if @availability_zone == UNSET_VALUE
+        @availability_zone = 'az1' if @availability_zone == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
         # `config.ssh` values are used.
@@ -116,39 +116,39 @@ module VagrantPlugins
         errors = []
         warnings = []
         messages = []
-            
-        # access_key: required    
-        errors << I18n.t("vagrant_hp.config.access_key_required") \
+
+        # access_key: required
+        errors << I18n.t('vagrant_hp.config.access_key_required') \
           if @access_key.nil?
 
         # secret_key: required
-        errors << I18n.t("vagrant_hp.config.secret_key_required") \
+        errors << I18n.t('vagrant_hp.config.secret_key_required') \
           if @secret_key.nil?
 
         # tenant_id: required
-        errors << I18n.t("vagrant_hp.config.tenant_id_required") \
+        errors << I18n.t('vagrant_hp.config.tenant_id_required') \
           if @tenant_id.nil?
 
         # keypair_name: required
-        errors << I18n.t("vagrant_hp.config.keypair_name_required") \
+        errors << I18n.t('vagrant_hp.config.keypair_name_required') \
           if @keypair_name.nil?
 
         # image: required
-        errors << I18n.t("vagrant_hp.config.image_required") \
+        errors << I18n.t('vagrant_hp.config.image_required') \
           if @image.nil?
 
         # ssh_private_key_path: required
-        errors << I18n.t("vagrant_hp.config.ssh_private_key_path") \
+        errors << I18n.t('vagrant_hp.config.ssh_private_key_path') \
           if @ssh_private_key_path.nil?
 
-        { "HP Provider" => errors }
+        { 'HP Provider' => errors }
       end
 
       # This gets the configuration for a specific region. It shouldn't
       # be called by the general public and is only used internally.
       def get_region_config(name)
-        if !@__finalized
-          raise "Configuration must be finalized before calling this method."
+        unless @__finalized
+          raise 'Configuration must be finalized before calling this method.'
         end
 
         # Return the compiled region config

data/lib/vagrant-hp/errors.rb

@@ -3,13 +3,13 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "vagrant"
+require 'vagrant'
 
 module VagrantPlugins
   module HP
     module Errors
       class VagrantHPError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_hp.errors")
+        error_namespace('vagrant_hp.errors')
       end
 
       class FogError < VagrantHPError

data/lib/vagrant-hp/plugin.rb

@@ -4,28 +4,28 @@
 #
 
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The Vagrant HP plugin must be run within Vagrant."
+  raise 'The Vagrant HP plugin must be run within Vagrant.'
 end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.1.0"
-  raise "The Vagrant HP plugin is only compatible with Vagrant 1.1+"
+if Vagrant::VERSION < '1.1.0'
+  raise 'The Vagrant HP plugin is only compatible with Vagrant 1.1+'
 end
 
 module VagrantPlugins
   module HP
-    class Plugin < Vagrant.plugin("2")
-      name "HP"
+    class Plugin < Vagrant.plugin('2')
+      name 'HP'
       description <<-DESC
       This plugin installs a provider that allows Vagrant to manage
       machines in HP Cloud.
       DESC
 
       config(:hp, :provider) do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
 
@@ -35,23 +35,23 @@ module VagrantPlugins
         setup_i18n
 
         # Return the provider
-        require_relative "provider"
+        require_relative 'provider'
         Provider
       end
 
       # This initializes the internationalization strings.
       def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", HP.source_root)
+        I18n.load_path << File.expand_path('locales/en.yml', HP.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
@@ -62,12 +62,12 @@ module VagrantPlugins
         # 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
         # logs as long as we have a valid level.
         if level
-          logger = Log4r::Logger.new("vagrant_hp")
+          logger = Log4r::Logger.new('vagrant_hp')
           logger.outputters = Log4r::Outputter.stderr
           logger.level = level
           logger = nil

data/lib/vagrant-hp/provider.rb

@@ -3,12 +3,12 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "log4r"
-require "vagrant"
+require 'log4r'
+require 'vagrant'
 
 module VagrantPlugins
   module HP
-    class Provider < Vagrant.plugin("2", :provider)
+    class Provider < Vagrant.plugin('2', :provider)
       def initialize(machine)
         @machine = machine
       end
@@ -26,7 +26,7 @@ module VagrantPlugins
         # Run a custom action called "read_ssh_info" which does what it
         # says and puts the resulting SSH info into the `:machine_ssh_info`
         # key in the environment.
-        env = @machine.action("read_ssh_info")
+        env = @machine.action('read_ssh_info')
         env[:machine_ssh_info]
       end
 
@@ -34,7 +34,7 @@ module VagrantPlugins
         # Run a custom action we define called "read_state" which does
         # what it says. It puts the state in the `:machine_state_id`
         # key in the environment.
-        env = @machine.action("read_state")
+        env = @machine.action('read_state')
 
         state_id = env[:machine_state_id]
 
@@ -47,7 +47,7 @@ module VagrantPlugins
       end
 
       def to_s
-        id = @machine.id.nil? ? "new" : @machine.id
+        id = @machine.id.nil? ? 'new' : @machine.id
         "HP (#{id})"
       end
     end