vagrant-registration 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a43ed062ae2be73c30c0576588fa927c25bbd8a
-  data.tar.gz: 853f6b4752c08f344608171a4db452db0d412b2c
+  metadata.gz: 97fa20b1599696327a619635fe9b1b9a512a2d1f
+  data.tar.gz: 46bfe62a920cff799b56e4fcd9584d17d5fc3454
 SHA512:
-  metadata.gz: b9cbcbcc9f0fc0e903aee52a497217b639cd08a203cdc5baaafc9668b1dd013b090b54d836dadc5ba0e4272fec93119107a2e0f703f7bc1f83da7dcff6f42fe0
-  data.tar.gz: 8fd6c95cef405362930ffee87e109a529e506d1fc01183a2325dd25fd117ad108dcfe8f5782ffb3da72245bdae86d09dd43ced15a8878fbf0ecdb67ec5ed5ac2
+  metadata.gz: 4bb56047885aae33c1036337689583b4c845980bcc458f843d76a0a1d8025766ac81861aa4db0f8004249acaba882275066faf7d054138738f2bff320b38a216
+  data.tar.gz: b77a8c2831a1e9598d7d2af170f6020394d06c195546a30da2d0ededa3c78cb3d55ba4f4c4c14f4d579d33edd65b6b3e696d729788af4e3623222b95f501b3de

data/lib/vagrant-registration/action/register.rb

@@ -1,3 +1,5 @@
+require "log4r"
+
 module VagrantPlugins
   module Registration
     module Action
@@ -6,21 +8,56 @@ module VagrantPlugins
 
         def initialize(app, env)
           @app    = app
-          @env    = env
-          @logger = Log4r::Logger.new("vagrant_register::action::register")
+          @logger = Log4r::Logger.new("vagrant_registration::action::register")
         end
 
         def call(env)
           @app.call(env)
-          guest = @env[:machine].guest
+          config = env[:machine].config.registration
+          guest = env[:machine].guest
           @logger.info("Testing for registration_register capability on ")
 
           if guest.capability?(:register)
-            @logger.info("registration_register capability exists on ")
-            result = guest.capability(:register)
-            @logger.info("called registration_register capability on ")
+            unless config.skip
+              env[:ui].info("Registering box with vagrant-registration...")
+
+              # Check if credentials are provided, ask user if not
+              unless credentials_provided? config
+                @logger.debug("credentials for registration not provided")
+
+                # Offer to register ATM or skip
+                register_now = env[:ui].ask("Would you like to register the system now (default: yes)? [y|n] ")
+
+                if register_now == 'n'
+                  config.skip = true
+                # Accept anything else as default
+                else
+                  config.subscriber_username, config.subscriber_password = register_on_screen(env[:ui])
+                end
+              end
+
+              result = guest.capability(:register) unless config.skip
+            else
+              @logger.debug("registration skipped due to configuration")
+            end
+          else
+            @logger.debug("registration skipped due to missing guest capability")
           end
         end
+
+        private
+
+        # Ask user on username/password and return them
+        def register_on_screen(ui)
+          username = ui.ask("Subscriber username: ")
+          password = ui.ask("Subscriber password: ", echo: false)
+          [username, password]
+        end
+
+        # Check if username and password has been provided in Vagrantfile
+        def credentials_provided?(config)
+          config.subscriber_username && config.subscriber_password
+        end
       end
     end
   end

data/lib/vagrant-registration/action/unregister.rb

@@ -1,3 +1,5 @@
+require "log4r"
+
 module VagrantPlugins
   module Registration
     module Action
@@ -6,23 +8,32 @@ module VagrantPlugins
 
         def initialize(app, env)
           @app    = app
-          @env    = env
-          @logger = Log4r::Logger.new("vagrant_register::action::unregister")
+          @logger = Log4r::Logger.new("vagrant_registration::action::unregister")
         end
 
         def call(env)
-          guest = @env[:machine].guest
-          #   @logger.info("Testing for registration_unregister capability on ")
+          guest = env[:machine].guest
+
           if guest.capability?(:unregister)
-            @logger.info("registration_unregister capability exists on ")
-            result = guest.capability(:unregister)
-            @logger.info("called registration_unregister capability on ")
+            if !env[:machine].config.registration.skip
+              env[:ui].info("Unregistering box with vagrant-registration...")
+              @logger.info("registration_unregister capability exists on ")
+              result = guest.capability(:unregister)
+              @logger.info("called registration_unregister capability on ")
+            else
+              @logger.debug("unregistration is skipped due to configuration")
+            end
+          else
+            @logger.debug("unregistration is skipped due to missing guest capability")
           end
-          
+
           @app.call(env)
 
-        rescue Vagrant::Errors::MachineGuestNotReady => e
-          @logger.info("Machine is offline (caught error: #{e.inspect} ), no need to unreg: #{e.inspect}")
+        # Guest might not be available after halting, so log the exception and continue
+        rescue => e
+          @logger.info(e)
+          @logger.debug("guest is not available, ignore unregistration")
+          @app.call(env)
         end
       end
     end

data/lib/vagrant-registration/config.rb

@@ -13,14 +13,21 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :subscriber_password
 
+      # Skip the registration (skip if true)
+      #
+      # @return [Bool]
+      attr_accessor :skip
+
       def initialize(region_specific=false)
         @subscriber_username = UNSET_VALUE
         @subscriber_password = UNSET_VALUE
+        @skip = UNSET_VALUE
       end
 
       def finalize!
         @subscriber_username = nil if @subscriber_username == UNSET_VALUE
         @subscriber_password = nil if @subscriber_password == UNSET_VALUE
+        @skip = false if @skip == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-registration/plugin.rb

@@ -1,3 +1,9 @@
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The vagrant-registration 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.2.0"
@@ -7,33 +13,17 @@ end
 module VagrantPlugins
   module Registration
     class Plugin < Vagrant.plugin("2")
-      def initialize(app, env)
-        @app    = app
-      end
-
       class << self
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_register::plugin")
-        end
-
         def register(hook)
-          @logger.info("in register hook")
+          setup_logging
           hook.after(::Vagrant::Action::Builtin::SyncedFolders,
                      VagrantPlugins::Registration::Action.action_register)
         end
 
         def unregister(hook)
-          @logger.info("in unregister hook")
+          setup_logging
           hook.prepend(VagrantPlugins::Registration::Action.action_unregister)
         end
-
-        def unregister_on_destroy(hook)
-          @logger.info("in unregister_on_destroy hook")
-          hook.after(::Vagrant::Action::Builtin::ConfigValidate, 
-                     VagrantPlugins::Registration::Action.action_unregister)
-        end
-
       end
 
       name "Registration"
@@ -42,24 +32,42 @@ module VagrantPlugins
       support the capability
       DESC
 
-      @logger = Log4r::Logger.new("vagrant_register::plugin::setup")
-      @logger.info("attempting to register hooks on up")
       action_hook(:registration_register, :machine_action_up, &method(:register))
       action_hook(:registration_register, :machine_action_provision, &method(:register))
-
-      @logger.info("attempting to register hooks on halt")
       action_hook(:registration_unregister, :machine_action_halt, &method(:unregister))
       action_hook(:registration_unregister, :machine_action_destroy, &method(:unregister))
 
-      @logger.info("attempting to register hooks on destroy")
-      action_hook(:registration_unregister, :machine_action_destroy, &method(:unregister_on_destroy))
-
       config(:registration) do
         require_relative 'config'
         Config
       end
 
+      # This sets up our log level to be whatever VAGRANT_LOG is
+      # for loggers prepended with 'vagrant_libvirt'
+      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_registration')
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
     end
   end
 end
-

data/lib/vagrant-registration/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Registration
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/locales/en.yml

@@ -1,136 +1,2 @@
 en:
-  vagrant_aws:
-    already_status: |-
-      The machine is already %{status}.
-    elb:
-      adjusting: |-
-        Adjusting availability zones of ELB %{elb_name}...
-      registering: |-
-        Registering %{instance_id} at ELB %{elb_name}...
-      deregistering: |-
-        Deregistering %{instance_id} from ELB %{elb_name}...
-      ok: |-
-        ok
-      skipped: |-
-        skipped
-
-    launching_instance: |-
-      Launching an instance 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_not_found_warning: |-
-      Warning! Folder sync disabled because the rsync binary is missing in the %{side}.
-      Make sure rsync is installed and the binary can be found in the PATH.
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
-    starting: |-
-      Starting the instance...
-    stopping: |-
-      Stopping the instance...
-    terminating: |-
-      Terminating the instance...
-    waiting_for_ready: |-
-      Waiting for instance to become "ready"...
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
-    warn_networks: |-
-      Warning! The AWS provider doesn't support any of the Vagrant
-      high-level network configurations (`config.vm.network`). They
-      will be silently ignored.
-    warn_ssh_access: |-
-      Warning! Vagrant might not be able to SSH into the instance.
-      Please check your security groups settings.
-    will_not_destroy: |-
-      The instance '%{name}' will not be destroyed, since the confirmation
-      was declined.
-
-    config:
-      access_key_id_required: |-
-        An access key ID must be specified via "access_key_id"
-      ami_required: |-
-        An AMI must be configured via "ami" (region: #{region})
-      private_key_missing: |-
-        The specified private key for AWS could not be found
-      region_required: |-
-        A region must be specified via "region"
-      secret_access_key_required: |-
-        A secret access key is required via "secret_access_key"
-      subnet_id_required_with_public_ip: |-
-        If you assign a public IP address to an instance in a VPC, a subnet must be specifed via "subnet_id"
-
-    errors:
-      fog_error: |-
-        There was an error talking to AWS. The error message is shown
-        below:
-
-        %{message}
-      internal_fog_error: |-
-        There was an error talking to AWS. The error message is shown
-        below:
-
-        Error: %{error}
-        Response: %{response}
-      instance_ready_timeout: |-
-        The instance never became "ready" in AWS. The timeout currently
-        set waiting for the instance to become ready is %{timeout} seconds.
-        Please verify that the machine properly boots. If you need more time
-        set the `instance_ready_timeout` configuration on the AWS provider.
-      rsync_error: |-
-        There was an error when attempting to rsync a shared folder.
-        Please inspect the error message below for more info.
-
-        Host path: %{hostpath}
-        Guest path: %{guestpath}
-        Error: %{stderr}
-      mkdir_error: |-
-        There was an error when attempting to create a shared host folder.
-        Please inspect the error message below for more info.
-
-        Host path: %{hostpath}
-        Error: %{err}
-      elb_does_not_exist: |-
-        ELB configured for the instance does not exist
-
-    states:
-      short_not_created: |-
-        not created
-      long_not_created: |-
-        The EC2 instance is not created. Run `vagrant up` to create it.
-
-      short_stopped: |-
-        stopped
-      long_stopped: |-
-        The EC2 instance is stopped. Run `vagrant up` to start it.
-
-      short_stopping: |-
-        stopping
-      long_stopping: |-
-        The EC2 instance is stopping. Wait until is completely stopped to
-        run `vagrant up` and start it.
-
-      short_pending: |-
-        pending
-      long_pending: |-
-        The EC2 instance is pending a start (i.e. this is a transition state).
-
-      short_running: |-
-        running
-      long_running: |-
-        The EC2 instance is running. To stop this machine, you can run
-        `vagrant halt`. To destroy the machine, you can run `vagrant destroy`.
-
-      short_pending: |-
-        pending
-      long_pending: |-
-        The EC2 instance is still being initialized. To destroy this machine,
-        you can run `vagrant destroy`.
+#currently unsupported, a placeholder

data/plugins/guests/redhat/cap/unregister.rb

@@ -3,22 +3,9 @@ module VagrantPlugins
     module Cap
       class Unregister
         def self.unregister(machine)
-          begin
-            if machine.communicate.ready?
-              machine.communicate.execute("subscription-manager unregister || :", sudo: true)             
-            end
-          end
+          machine.communicate.execute("subscription-manager unregister || :", sudo: true)
         end
       end
     end
   end
 end
-
-
-            # if !machine.communicate.ready?
-            #   raise Vagrant::Errors::VMNotCreatedError
-            # end
-            
-#          rescue IOError
-          # Ignore, this probably means connection closed because it
-          # shut down.

data/tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.centos

@@ -0,0 +1,14 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+  # Example configuration of new VM..
+  config.vm.define :vagrant_ident_centos do |vagrant_host|
+    # Box name
+    vagrant_host.vm.box = 'gildub/fedora20'
+    vagrant_host.vm.hostname = "vagrant_centos_ident_test"
+
+    config.vm.synced_folder ".", "/vagrant", type: "rsync",
+    rsync__exclude: [ ".git/", ".#*", "*~" ]
+  end
+end

data/tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.fedora

@@ -0,0 +1,14 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+  # Example configuration of new VM..
+  config.vm.define :vagrant_ident_fedora do |vagrant_host|
+    # Box name
+    vagrant_host.vm.box = 'gildub/fedora20'
+    vagrant_host.vm.hostname = "vagrant_fedora_ident_test"
+
+    config.vm.synced_folder ".", "/vagrant", type: "rsync",
+    rsync__exclude: [ ".git/", ".#*", "*~" ]
+  end
+end

data/tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.rhel

@@ -0,0 +1,14 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+  # Example configuration of new VM..
+  config.vm.define :vagrant_ident_rhel do |vagrant_host|
+    # Box name
+    vagrant_host.vm.box = 'rhel-7.0'
+    vagrant_host.vm.hostname = "vagrant_rhel_ident_test"
+
+    config.vm.synced_folder ".", "/vagrant", type: "rsync",
+    rsync__exclude: [ ".git/", ".#*", "*~" ]
+  end
+end

data/tests/shell-scripts/test-rhel-eco-ident/test-identification.sh

@@ -0,0 +1,114 @@
+#!/bin/bash
+
+export PATH="/bin:/usr/bin"
+STATUS=0
+
+echo "get the plugin installed"
+vagrant plugin install vagrant-registration
+
+echo "do we have any plugins now?"
+exec 5>&1 && OUTPUT=$(vagrant plugin list | tee >(cat - >&5))
+if [ $? -ne 0 ]; then
+    STATUS=$?
+    echo "No plugins at all:  Vagrant plugin test FAILED"
+    exit $STATUS
+fi
+
+echo "do we have the vagrant-registration plugin?"
+TEST=$(echo "$OUTPUT" | grep vagrant-registration)
+STATUS=$?
+if [ -z "$TEST" ]; then
+    echo "Plugin vagrant-registration did not get installed:  Vagrant plugin test FAILED"
+    echo "Output of vagrant plugin list:\n$OUTPUT\n"
+    echo "Result of \"echo \$OUTPUT | grep vagrant-registration\":\n$TEST\n"
+    exit $STATUS
+fi
+
+echo "let's start with the fedora vagrantfile"
+rm ./Vagrantfile
+ln -s ./Vagrantfile.fedora ./Vagrantfile
+
+echo "let's try and bring the machine up"
+exec 5>&1 && OUTPUT=$(vagrant up | tee >(cat - >&5))
+STATUS=$?
+if [ $? -ne 0 ]; then
+    echo "Failed to bring up the machine: Launch FAILED"
+    exit $STATUS
+fi
+
+echo "let's test that we can connect"
+OUTPUT=$(vagrant ssh -c 'echo \"connected!\"' | tee >(cat - >&5))
+STATUS=$?
+TEST=$(echo "$OUTPUT" | grep connected)
+if [ -z "$TEST" ]; then
+    echo "Failed to connect to the machine: connect FAILED"
+    exit $STATUS
+fi
+
+echo "time to clean up fedora box"
+vagrant destroy -f
+rm -rf .vagrant.d Vagrantfile
+
+echo "let's try the rhel box"
+rm ./Vagrantfile
+ln -s ./Vagrantfile.rhel ./Vagrantfile
+
+echo "let's try and bring the machine up"
+exec 5>&1 && OUTPUT=$(vagrant up | tee >(cat - >&5))
+STATUS=$?
+if [ $? -ne 0 ]; then
+    echo "Failed to bring up the machine: Launch FAILED"
+    exit $STATUS
+fi
+
+echo "let's test that we can connect"
+OUTPUT=$(vagrant ssh -c 'echo \"connected!\"' | tee >(cat - >&5))
+STATUS=$?
+TEST=$(echo "$OUTPUT" | grep connected)
+if [ -z "$TEST" ]; then
+    echo "Failed to connect to the machine: connect FAILED"
+    exit $STATUS
+fi
+
+echo "let's test that we are subscribed"
+OUTPUT=$(vagrant ssh -c 'sudo subscription-manager status' | tee >(cat - >&5))
+STATUS=$?
+TEST=$(echo "$OUTPUT" | grep Current)
+if [ -z "$TEST" ]; then
+    echo "We are not subscribed: subscribe FAILED"
+    exit $STATUS
+fi
+
+echo "time to clean up rhel box"
+vagrant destroy -f
+rm -rf .vagrant.d Vagrantfile
+
+echo "test implementation incomplete"
+exit;
+
+echo "let's try the centos box"
+rm ./Vagrantfile
+ln -s ./Vagrantfile.centos ./Vagrantfile
+
+echo "let's try and bring the machine up"
+exec 5>&1 && OUTPUT=$(vagrant up | tee >(cat - >&5))
+STATUS=$?
+if [ $? -ne 0 ]; then
+    echo "Failed to bring up the machine: Launch FAILED"
+    exit $STATUS
+fi
+
+echo "let's test that we can connect"
+OUTPUT=$(vagrant ssh -c 'echo \"connected!\"' | tee >(cat - >&5))
+STATUS=$?
+TEST=$(echo "$OUTPUT" | grep connected)
+if [ -z "$TEST" ]; then
+    echo "Failed to connect to the machine: connect FAILED"
+    exit $STATUS
+fi
+
+echo "time to clean up rhel box"
+vagrant destroy -f
+rm -rf .vagrant.d Vagrantfile
+
+echo "tests complete!"

data/vagrant-registration.gemspec

@@ -5,11 +5,11 @@ Gem::Specification.new do |s|
   s.name          = "vagrant-registration"
   s.version       = VagrantPlugins::Registration::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.license       = "Apache-2.0"
-  s.authors       = "Langdon White"
+  s.license       = "GPL-2.0"
+  s.authors       = ["Langdon White", "et al"]
   s.email         = "langdon@fedoraproject.org"
   s.summary       = "Enables guests to have a registration capability"
-  s.description   = "Enables guests to have a registration capability"
+  s.description   = "Enables guests to have a registration capability, this is expecially useful on RHEL or SLES"
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-registration"

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-registration
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Langdon White
+- et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies: []
-description: Enables guests to have a registration capability
+description: Enables guests to have a registration capability, this is expecially
+  useful on RHEL or SLES
 email: langdon@fedoraproject.org
 executables: []
 extensions: []
@@ -37,10 +39,14 @@ files:
 - plugins/guests/redhat/cap/register.rb
 - plugins/guests/redhat/cap/unregister.rb
 - plugins/guests/redhat/plugin.rb
+- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.centos
+- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.fedora
+- tests/shell-scripts/test-rhel-eco-ident/Vagrantfile.rhel
+- tests/shell-scripts/test-rhel-eco-ident/test-identification.sh
 - vagrant-registration.gemspec
 homepage: 
 licenses:
-- Apache-2.0
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []