vagrant-hp 0.1.0 → 0.1.1

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

@@ -1,24 +1,24 @@
-#
-# Author:: Mohit Sethi (<mohit@sethis.in>)
-# Copyright:: Copyright (c) 2013 Mohit Sethi.
-#
-
-module VagrantPlugins
-  module HP
-    module Action
-      class WarnNetworks
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:machine].config.vm.networks.length > 0
-            env[:ui].warn(I18n.t("vagrant_hp.warn_networks"))
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Mohit Sethi (<mohit@sethis.in>)
+# Copyright:: Copyright (c) 2013 Mohit Sethi.
+#
+
+module VagrantPlugins
+  module HP
+    module Action
+      class WarnNetworks
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env[:machine].config.vm.networks.length > 0
+            env[:ui].warn(I18n.t("vagrant_hp.warn_networks"))
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-hp/config.rb

@@ -1,157 +1,159 @@
-#
-# Author:: Mohit Sethi (<mohit@sethis.in>)
-# Copyright:: Copyright (c) 2013 Mohit Sethi.
-#
-
-require "vagrant"
-
-module VagrantPlugins
-  module HP
-    class Config < Vagrant.plugin("2", :config)
-
-      attr_accessor :access_key
-
-      attr_accessor :secret_key
-
-      attr_accessor :tenant_id
-
-      attr_accessor :availability_zone
-
-      attr_accessor :flavor
-
-      attr_accessor :image
-
-      attr_accessor :server_name
-
-      attr_accessor :keypair_name
-
-      attr_accessor :ssh_private_key_path
-
-      attr_accessor :ssh_username
-
-      def initialize(region_specific=false)
-        @access_key = UNSET_VALUE
-        @secret_key= UNSET_VALUE
-        @server_name = UNSET_VALUE
-        @private_ip_address = UNSET_VALUE
-        @keypair_name = UNSET_VALUE
-        @tenant_id = UNSET_VALUE
-        @availability_zone = UNSET_VALUE
-        @image = UNSET_VALUE
-        @ssh_private_key_path = UNSET_VALUE
-        @ssh_username = UNSET_VALUE
-        @flavor = UNSET_VALUE
-
-        @__compiled_region_configs = {}
-        @__finalized = false
-        @__region_config = {}
-        @__region_specific = region_specific
-      end
-
-      #-------------------------------------------------------------------
-      # Internal methods.
-      #-------------------------------------------------------------------
-
-      def merge(other)
-        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)
-          result.instance_variable_set(
-            :@__region_specific, new_region_specific || @__region_specific)
-
-          # Go through all the region configs and prepend ours onto
-          # theirs.
-          new_region_config = other.instance_variable_get(:@__region_config)
-          @__region_config.each do |key, value|
-            new_region_config[key] ||= []
-            new_region_config[key] = value + new_region_config[key]
-          end
-
-          # Set it
-          result.instance_variable_set(:@__region_config, new_region_config)
-
-          # Merge in the tags
-          result.tags.merge!(self.tags)
-          result.tags.merge!(other.tags)
-        end
-      end
-
-      def finalize!
-        # The access keys default to nil
-        @access_key = nil if @access_key == UNSET_VALUE
-        @secret_key = nil if @secret_key == UNSET_VALUE
-        @tenant_id = nil if @tenant_id == UNSET_VALUE
-
-        @server_name = nil if @server_name == UNSET_VALUE
-
-        # AMI must be nil, since we can't default that
-        @image = nil if @image == UNSET_VALUE
-
-        # Default instance type is an standard.small
-        @flavor = "standard.small" if @flavor == UNSET_VALUE
-
-        # Keypair defaults to nil
-        @keypair_name = nil if @keypair_name == UNSET_VALUE
-
-        # Default the private IP to nil since VPC is not default
-        @private_ip_address = nil if @private_ip_address == UNSET_VALUE
-
-        # 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
-
-        # The SSH values by default are nil, and the top-level config
-        # `config.ssh` values are used.
-        @ssh_private_key_path = nil if @ssh_private_key_path == UNSET_VALUE
-        @ssh_username = nil if @ssh_username == UNSET_VALUE
-
-        # Mark that we finalized
-        @__finalized = true
-      end
-
-      def validate(machine)
-        errors = []
-        warnings = []
-        messages = []
-            
-        # 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") \
-          if @secret_key.nil?
-
-        # 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") \
-          if @keypair_name.nil?
-
-        # 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") \
-          if @ssh_private_key_path.nil?
-
-        { "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."
-        end
-
-        # Return the compiled region config
-        @__compiled_region_configs[name] || self
-      end
-    end
-  end
-end
+#
+# Author:: Mohit Sethi (<mohit@sethis.in>)
+# Copyright:: Copyright (c) 2013 Mohit Sethi.
+#
+
+require "vagrant"
+
+module VagrantPlugins
+  module HP
+    class Config < Vagrant.plugin("2", :config)
+
+      attr_accessor :access_key
+
+      attr_accessor :secret_key
+
+      attr_accessor :tenant_id
+
+      attr_accessor :availability_zone
+
+      attr_accessor :flavor
+
+      attr_accessor :image
+
+      attr_accessor :server_name
+
+      attr_accessor :keypair_name
+
+      attr_accessor :ssh_private_key_path
+
+      attr_accessor :ssh_username
+
+      attr_accessor :security_groups
+
+      def initialize(region_specific=false)
+        @access_key = UNSET_VALUE
+        @secret_key= UNSET_VALUE
+        @server_name = UNSET_VALUE
+        @private_ip_address = UNSET_VALUE
+        @keypair_name = UNSET_VALUE
+        @tenant_id = UNSET_VALUE
+        @availability_zone = UNSET_VALUE
+        @image = UNSET_VALUE
+        @ssh_private_key_path = UNSET_VALUE
+        @ssh_username = UNSET_VALUE
+        @flavor = UNSET_VALUE
+
+        @__compiled_region_configs = {}
+        @__finalized = false
+        @__region_config = {}
+        @__region_specific = region_specific
+      end
+
+      #-------------------------------------------------------------------
+      # Internal methods.
+      #-------------------------------------------------------------------
+
+      def merge(other)
+        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)
+          result.instance_variable_set(
+            :@__region_specific, new_region_specific || @__region_specific)
+
+          # Go through all the region configs and prepend ours onto
+          # theirs.
+          new_region_config = other.instance_variable_get(:@__region_config)
+          @__region_config.each do |key, value|
+            new_region_config[key] ||= []
+            new_region_config[key] = value + new_region_config[key]
+          end
+
+          # Set it
+          result.instance_variable_set(:@__region_config, new_region_config)
+
+          # Merge in the tags
+          result.tags.merge!(self.tags)
+          result.tags.merge!(other.tags)
+        end
+      end
+
+      def finalize!
+        # The access keys default to nil
+        @access_key = nil if @access_key == UNSET_VALUE
+        @secret_key = nil if @secret_key == UNSET_VALUE
+        @tenant_id = nil if @tenant_id == UNSET_VALUE
+
+        @server_name = nil if @server_name == UNSET_VALUE
+
+        # AMI must be nil, since we can't default that
+        @image = nil if @image == UNSET_VALUE
+
+        # Default instance type is an standard.small
+        @flavor = "standard.small" if @flavor == UNSET_VALUE
+
+        # Keypair defaults to nil
+        @keypair_name = nil if @keypair_name == UNSET_VALUE
+
+        # Default the private IP to nil since VPC is not default
+        @private_ip_address = nil if @private_ip_address == UNSET_VALUE
+
+        # 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
+
+        # The SSH values by default are nil, and the top-level config
+        # `config.ssh` values are used.
+        @ssh_private_key_path = nil if @ssh_private_key_path == UNSET_VALUE
+        @ssh_username = nil if @ssh_username == UNSET_VALUE
+
+        # Mark that we finalized
+        @__finalized = true
+      end
+
+      def validate(machine)
+        errors = []
+        warnings = []
+        messages = []
+            
+        # 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") \
+          if @secret_key.nil?
+
+        # 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") \
+          if @keypair_name.nil?
+
+        # 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") \
+          if @ssh_private_key_path.nil?
+
+        { "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."
+        end
+
+        # Return the compiled region config
+        @__compiled_region_configs[name] || self
+      end
+    end
+  end
+end

data/lib/vagrant-hp/errors.rb

@@ -1,24 +1,24 @@
-#
-# Author:: Mohit Sethi (<mohit@sethis.in>)
-# Copyright:: Copyright (c) 2013 Mohit Sethi.
-#
-
-require "vagrant"
-
-module VagrantPlugins
-  module HP
-    module Errors
-      class VagrantHPError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_hp.errors")
-      end
-
-      class FogError < VagrantHPError
-        error_key(:fog_error)
-      end
-
-      class RsyncError < VagrantHPError
-        error_key(:rsync_error)
-      end
-    end
-  end
-end
+#
+# Author:: Mohit Sethi (<mohit@sethis.in>)
+# Copyright:: Copyright (c) 2013 Mohit Sethi.
+#
+
+require "vagrant"
+
+module VagrantPlugins
+  module HP
+    module Errors
+      class VagrantHPError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant_hp.errors")
+      end
+
+      class FogError < VagrantHPError
+        error_key(:fog_error)
+      end
+
+      class RsyncError < VagrantHPError
+        error_key(:rsync_error)
+      end
+    end
+  end
+end

data/lib/vagrant-hp/plugin.rb

@@ -1,78 +1,78 @@
-#
-# Author:: Mohit Sethi (<mohit@sethis.in>)
-# Copyright:: Copyright (c) 2013 Mohit Sethi.
-#
-
-begin
-  require "vagrant"
-rescue LoadError
-  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+"
-end
-
-module VagrantPlugins
-  module 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"
-        Config
-      end
-
-      provider(:hp) do
-        # Setup logging and i18n
-        setup_logging
-        setup_i18n
-
-        # Return the 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.reload!
-      end
-
-      # This sets up our log level to be whatever VAGRANT_LOG is.
-      def self.setup_logging
-        require "log4r"
-
-        level = nil
-        begin
-          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
-          # we tell the user.
-          level = nil
-        end
-
-        # 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)
-
-        # 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.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Mohit Sethi (<mohit@sethis.in>)
+# Copyright:: Copyright (c) 2013 Mohit Sethi.
+#
+
+begin
+  require "vagrant"
+rescue LoadError
+  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+"
+end
+
+module VagrantPlugins
+  module 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"
+        Config
+      end
+
+      provider(:hp) do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        # Return the 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.reload!
+      end
+
+      # This sets up our log level to be whatever VAGRANT_LOG is.
+      def self.setup_logging
+        require "log4r"
+
+        level = nil
+        begin
+          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
+          # we tell the user.
+          level = nil
+        end
+
+        # 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)
+
+        # 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.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
+    end
+  end
+end