vagrant-hp 0.1.0 → 0.1.1

data/lib/vagrant-hp/provider.rb

@@ -1,55 +1,55 @@
-#
-# Author:: Mohit Sethi (<mohit@sethis.in>)
-# Copyright:: Copyright (c) 2013 Mohit Sethi.
-#
-
-require "log4r"
-require "vagrant"
-
-module VagrantPlugins
-  module HP
-    class Provider < Vagrant.plugin("2", :provider)
-      def initialize(machine)
-        @machine = machine
-      end
-
-      def action(name)
-        # Attempt to get the action method from the Action class if it
-        # exists, otherwise return nil to show that we don't support the
-        # given action.
-        action_method = "action_#{name}"
-        return Action.send(action_method) if Action.respond_to?(action_method)
-        nil
-      end
-
-      def ssh_info
-        # 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_ssh_info]
-      end
-
-      def state
-        # 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")
-
-        state_id = env[:machine_state_id]
-
-        # Get the short and long description
-        short = I18n.t("vagrant_hp.states.short_#{state_id.to_s.downcase}")
-        long  = I18n.t("vagrant_hp.states.long_#{state_id.to_s.downcase}")
-
-        # Return the MachineState object
-        Vagrant::MachineState.new(state_id, short, long)
-      end
-
-      def to_s
-        id = @machine.id.nil? ? "new" : @machine.id
-        "HP (#{id})"
-      end
-    end
-  end
-end
+#
+# Author:: Mohit Sethi (<mohit@sethis.in>)
+# Copyright:: Copyright (c) 2013 Mohit Sethi.
+#
+
+require "log4r"
+require "vagrant"
+
+module VagrantPlugins
+  module HP
+    class Provider < Vagrant.plugin("2", :provider)
+      def initialize(machine)
+        @machine = machine
+      end
+
+      def action(name)
+        # Attempt to get the action method from the Action class if it
+        # exists, otherwise return nil to show that we don't support the
+        # given action.
+        action_method = "action_#{name}"
+        return Action.send(action_method) if Action.respond_to?(action_method)
+        nil
+      end
+
+      def ssh_info
+        # 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_ssh_info]
+      end
+
+      def state
+        # 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")
+
+        state_id = env[:machine_state_id]
+
+        # Get the short and long description
+        short = I18n.t("vagrant_hp.states.short_#{state_id.to_s.downcase}")
+        long  = I18n.t("vagrant_hp.states.long_#{state_id.to_s.downcase}")
+
+        # Return the MachineState object
+        Vagrant::MachineState.new(state_id, short, long)
+      end
+
+      def to_s
+        id = @machine.id.nil? ? "new" : @machine.id
+        "HP (#{id})"
+      end
+    end
+  end
+end

data/lib/vagrant-hp/util/timer.rb

@@ -1,17 +1,17 @@
-module VagrantPlugins
-  module HP
-    module Util
-      class Timer
-        # A basic utility method that times the execution of the given
-        # block and returns it.
-        def self.time
-          start_time = Time.now.to_f
-          yield
-          end_time = Time.now.to_f
-
-          end_time - start_time
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module HP
+    module Util
+      class Timer
+        # A basic utility method that times the execution of the given
+        # block and returns it.
+        def self.time
+          start_time = Time.now.to_f
+          yield
+          end_time = Time.now.to_f
+
+          end_time - start_time
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-hp/version.rb

@@ -1,10 +1,10 @@
-#
-# Author:: Mohit Sethi (<mohit@sethis.in>)
-# Copyright:: Copyright (c) 2013 Mohit Sethi.
-#
-
-module VagrantPlugins
-  module HP
-    VERSION = "0.1.0"
-  end
-end
+#
+# Author:: Mohit Sethi (<mohit@sethis.in>)
+# Copyright:: Copyright (c) 2013 Mohit Sethi.
+#
+
+module VagrantPlugins
+  module HP
+    VERSION = "0.1.1"
+  end
+end

data/locales/en.yml

@@ -1,91 +1,91 @@
-en:
-  vagrant_hp:
-    already_created: |-
-      The machine is already created.
-    launching_server: |-
-      Launching a server with the following settings...
-    launch_no_keypair: |-
-      Warning! You didn't specify a keypair to launch your instance with.
-      This can sometimes result in not being able to access your instance.
-    launch_vpc_warning: |-
-      Warning! You're launching this instance into a VPC without an
-      elastic IP. Please verify you're properly connected to a VPN so
-      you can access this machine, otherwise Vagrant will not be able
-      to SSH into it.
-    not_created: |-
-      Instance is not created. Please run `vagrant up` first.
-    ready: |-
-      Machine is booted and ready for use!
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
-    terminating: |-
-      Terminating the instance...
-    waiting_for_build: |-
-      Waiting for the server to be built...
-    waiting_for_ready: |-
-      Waiting for instance to become "ready"...
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
-    warn_networks: |-
-      Warning! The HP provider doesn't support any of the Vagrant
-      high-level network configurations (`config.vm.network`). They
-      will be silently ignored.
-    deleting_server: |-
-      "Attemping to delete server on HP Cloud"
-    finding_flavor: |-
-      Finding flavor for server...
-    finding_image: |-
-      Finding image for server...
-
-    default:
-      ssh_username_default: |-
-        No ssh_username provided, using "vagrant" as ssh_username
-
-    config:
-      access_key_required: |-
-        An access key is required, please specify via "access_key_id"
-      image_required: |-
-        An image is required, please specify via "image=<IMAGE_ID>" or "image=<IMAGE-NAME>"
-      ssh_private_key_path: |-
-        A private key is required, please specify via "ssh_private_key_path"
-      secret_key_required: |-
-        A secret key is required, please specify via "secret_key"
-      keypair_name_required: |-
-        A keypair name is required, please specify via "keypair_name".
-      tenant_id_required: |-
-        A tenant id is required, please specify via "tenant_id"
-
-    errors:
-      fog_error: |-
-        There was an error talking to HP. The error message is shown
-        below:
-
-        %{message}
-      rsync_error: |-
-        There was an error when attemping to rsync a share folder.
-        Please inspect the error message below for more info.
-
-        Host path: %{hostpath}
-        Guest path: %{guestpath}
-        Error: %{stderr}
-
-    states:
-      short_active: |-
-        active
-      long_active: |-
-        The server is up and running. Run `vagrant ssh` to access it.
-      short_build: |-
-        building
-      long_build: |-
-        The server is currently being built. You must wait for this to
-        complete before you can access it. You can delete the server, however,
-        by running `vagrant destroy`.
-      short_error: |-
-        error
-      long_error: |-
-        The server is in an erroneous state. Destroy the machine with
-        `vagrant destroy`.
-      short_not_created: |-
-        not created
-      long_not_created: |-
-        The server is not created. Run `vagrant up` to create it.
+en:
+  vagrant_hp:
+    already_created: |-
+      The machine is already created.
+    launching_server: |-
+      Launching a server with the following settings...
+    launch_no_keypair: |-
+      Warning! You didn't specify a keypair to launch your instance with.
+      This can sometimes result in not being able to access your instance.
+    launch_vpc_warning: |-
+      Warning! You're launching this instance into a VPC without an
+      elastic IP. Please verify you're properly connected to a VPN so
+      you can access this machine, otherwise Vagrant will not be able
+      to SSH into it.
+    not_created: |-
+      Instance is not created. Please run `vagrant up` first.
+    ready: |-
+      Machine is booted and ready for use!
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
+    terminating: |-
+      Terminating the instance...
+    waiting_for_build: |-
+      Waiting for the server to be built...
+    waiting_for_ready: |-
+      Waiting for instance to become "ready"...
+    waiting_for_ssh: |-
+      Waiting for SSH to become available...
+    warn_networks: |-
+      Warning! The HP provider doesn't support any of the Vagrant
+      high-level network configurations (`config.vm.network`). They
+      will be silently ignored.
+    deleting_server: |-
+      "Attemping to delete server on HP Cloud"
+    finding_flavor: |-
+      Finding flavor for server...
+    finding_image: |-
+      Finding image for server...
+
+    default:
+      ssh_username_default: |-
+        No ssh_username provided, using "vagrant" as ssh_username
+
+    config:
+      access_key_required: |-
+        An access key is required, please specify via "access_key_id"
+      image_required: |-
+        An image is required, please specify via "image=<IMAGE_ID>" or "image=<IMAGE-NAME>"
+      ssh_private_key_path: |-
+        A private key is required, please specify via "ssh_private_key_path"
+      secret_key_required: |-
+        A secret key is required, please specify via "secret_key"
+      keypair_name_required: |-
+        A keypair name is required, please specify via "keypair_name".
+      tenant_id_required: |-
+        A tenant id is required, please specify via "tenant_id"
+
+    errors:
+      fog_error: |-
+        There was an error talking to HP. The error message is shown
+        below:
+
+        %{message}
+      rsync_error: |-
+        There was an error when attemping to rsync a share folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Guest path: %{guestpath}
+        Error: %{stderr}
+
+    states:
+      short_active: |-
+        active
+      long_active: |-
+        The server is up and running. Run `vagrant ssh` to access it.
+      short_build: |-
+        building
+      long_build: |-
+        The server is currently being built. You must wait for this to
+        complete before you can access it. You can delete the server, however,
+        by running `vagrant destroy`.
+      short_error: |-
+        error
+      long_error: |-
+        The server is in an erroneous state. Destroy the machine with
+        `vagrant destroy`.
+      short_not_created: |-
+        not created
+      long_not_created: |-
+        The server is not created. Run `vagrant up` to create it.

data/spec/vagrant-hp/config_spec.rb

@@ -1,42 +1,42 @@
-require "vagrant-hp/config"
-
-describe VagrantPlugins::HP::Config do
-  let(:instance) { described_class.new }
-
-  describe "defaults" do
-    subject do
-      instance.tap do |o|
-        o.finalize!
-      end
-    end
-
-    its("access_key")                   { should be_nil }
-    its("tenant_id")                    { should be_nil }
-    its("availability_zone")            { should == "az1" }
-    its("image")                        { should be_nil }
-    its("keypair_name")                 { should be_nil }
-    its("secret_key")                   { should be_nil }
-    its("ssh_private_key_path")         { should be_nil }
-    its("ssh_username")                 { should be_nil }
-    its("flavor")                       { should == "standard.small" }
-    its("tenant_id")                    { should be_nil }
-    its("server_name")                  { should be_nil }
-  end
-
-  describe "overriding defaults" do
-    # I typically don't meta-program in tests, but this is a very
-    # simple boilerplate test, so I cut corners here. It just sets
-    # each of these attributes to "foo" in isolation, and reads the value
-    # and asserts the proper result comes back out.
-    [:access_key, :tenant_id, :availability_zone, :image,
-      :keypair_name,:secret_key,:ssh_private_key_path,:ssh_username,
-      :flavor,:tenant_id,:server_name].each do |attribute|
-
-      it "should not default #{attribute} if overridden" do
-        instance.send("#{attribute}=".to_sym, "foo")
-        instance.finalize!
-        instance.send(attribute).should == "foo"
-      end
-    end
-  end
-end
+require "vagrant-hp/config"
+
+describe VagrantPlugins::HP::Config do
+  let(:instance) { described_class.new }
+
+  describe "defaults" do
+    subject do
+      instance.tap do |o|
+        o.finalize!
+      end
+    end
+
+    its("access_key")                   { should be_nil }
+    its("tenant_id")                    { should be_nil }
+    its("availability_zone")            { should == "az1" }
+    its("image")                        { should be_nil }
+    its("keypair_name")                 { should be_nil }
+    its("secret_key")                   { should be_nil }
+    its("ssh_private_key_path")         { should be_nil }
+    its("ssh_username")                 { should be_nil }
+    its("flavor")                       { should == "standard.small" }
+    its("tenant_id")                    { should be_nil }
+    its("server_name")                  { should be_nil }
+  end
+
+  describe "overriding defaults" do
+    # I typically don't meta-program in tests, but this is a very
+    # simple boilerplate test, so I cut corners here. It just sets
+    # each of these attributes to "foo" in isolation, and reads the value
+    # and asserts the proper result comes back out.
+    [:access_key, :tenant_id, :availability_zone, :image,
+      :keypair_name,:secret_key,:ssh_private_key_path,:ssh_username,
+      :flavor,:tenant_id,:server_name].each do |attribute|
+
+      it "should not default #{attribute} if overridden" do
+        instance.send("#{attribute}=".to_sym, "foo")
+        instance.finalize!
+        instance.send(attribute).should == "foo"
+      end
+    end
+  end
+end

data/vagrant-hp.gemspec

@@ -1,59 +1,59 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-require "vagrant-hp/version"
-
-Gem::Specification.new do |s|
-  s.name          = "vagrant-hp"
-  s.version       = VagrantPlugins::HP::VERSION
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = "Mohit Sethi"
-  s.email         = "mohit@sethis.in"
-  s.homepage      = "http://github.com/mohitsethi/vagrant-hp"
-  s.summary       = "Enables Vagrant to manage machines on HP Cloud."
-  s.description   = "Enables Vagrant to manage machines on HP Cloud."
-
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "vagrant-hp"
-
-  s.add_runtime_dependency "fog", "~> 1.10.0"
-
-  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 "rubygems-bundler"
-
-  # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  s.files         = unignored_files
-  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-  s.require_path  = 'lib'
-end
+$:.unshift File.expand_path("../lib", __FILE__)
+require "vagrant-hp/version"
+
+Gem::Specification.new do |s|
+  s.name          = "vagrant-hp"
+  s.version       = VagrantPlugins::HP::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = "Mohit Sethi"
+  s.email         = "mohit@sethis.in"
+  s.homepage      = "http://github.com/mohitsethi/vagrant-hp"
+  s.summary       = "Enables Vagrant to manage machines on HP Cloud."
+  s.description   = "Enables Vagrant to manage machines on HP Cloud."
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "vagrant-hp"
+
+  s.add_runtime_dependency "fog", "~> 1.10.0"
+
+  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 "rubygems-bundler"
+
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, ".gitignore")
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  s.files         = unignored_files
+  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
+  s.require_path  = 'lib'
+end