vagrant-registration 0.0.19 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ece539b9eaead9588826fc467d5a1d27e2b9eb
-  data.tar.gz: 87dea7bc988b086df4e856c9152f2ad4b22749a9
+  metadata.gz: 36a083fba5976bcd3746308acac0b76e47eb753f
+  data.tar.gz: 159ddc274e1fe121bb7615ff69db99157b4970b5
 SHA512:
-  metadata.gz: 11f0c253144c84aa33f6ea3f21d3779d1749ffb8224ec4d01af8f5de37833a3d4eb7c3289917465ebdd3d42f7cd66a9a05cc435d11dd32a708996ff55c1162c5
-  data.tar.gz: f7c0ed985dd4e0f764fe0a379247d790a011b84153579f3e815d8c389fb1329f945e6f257f173989ffcb6566ab4fd7b7343b971392a16cdc626ec50f3e155630
+  metadata.gz: 68583118bac63262c52bf17b7c56c5c8821d722b10ad5bd8a604984d29fe33b6203d43e1299d9d18f1ce4695a157e1da4275ad73edb9e45a61dcf4ec658a4fe5
+  data.tar.gz: 8bb6d909ee3d08d2972b1e648cb8280f8c8b56a4eb3c0701b5d9c5fe8f682f05afbabacd5d94bafd6551596b482443c45daa81d1a16e5822f1a6e05e01089df6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.0
+
+- Support providing a CA certificate via `config.registration.ca_cert` option
+- Issue warnings on unsupported configuration options
+- Do not ship tests
+
 ## 0.0.19
 
 - Remove extra files from installation

data/Gemfile

@@ -1,7 +1,11 @@
 source "https://rubygems.org"
 
+gemspec
+
 group :development do
   gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  gem "gem-compare"
+  gem "rake"
 end
 
 group :plugins do

data/README.md

@@ -111,6 +111,10 @@ Note that the `auto_attach` option is set to false when using org/activationkey
   # Asset Manager, defaults to Customer Portal Subscription Management)
   config.registration.serverurl
 
+  # A path to a CA certificate, this file would be copied to /etc/rhsm/ca and
+  # if the file does not have .pem extension, it will be automatically added
+  config.registration.ca_cert
+
   # Give the hostname of the content delivery server to use to receive updates
   # (required for Satellite 6)
   config.registration.baseurl
@@ -150,6 +154,21 @@ Note that the `auto_attach` option is set to false when using org/activationkey
   config.registration.skip
 ```
 
+## Tests
+
+Tests currently test the plugin with `subscription-manager` on RHEL 7.1 guest
+and Fedora host. You need an imported RHEL 7.1 Vagrant box named `rhel-7.1`.
+
+To run them:
+
+```
+export VAGRANT_REGISTRATION_USERNAME=
+export VAGRANT_REGISTRATION_PASSWORD=
+export VAGRANT_REGISTRATION_ORG=
+export VAGRANT_REGISTRATION_ACTIVATIONKEY=
+./tests/run.sh
+```
+
 ## Acknowledgements
 
 The project would like to make sure we thank [purpleidea](https://github.com/purpleidea/), [humaton](https://github.com/humaton/), [strzibny](https://github.com/strzibny), [scollier](https://github.com/scollier/), [puzzle](https://github.com/puzzle), [voxik](https://github.com/voxik), [lukaszachy](https://github.com/lukaszachy) and [goern](https://github.com/goern) (in no particular order) for their contributions of ideas, code and testing for this project.

data/lib/vagrant-registration.rb

@@ -1,18 +1,14 @@
-require "pathname"
-
-require "vagrant-registration/plugin"
+require 'pathname'
+require 'vagrant-registration/plugin'
 
 module VagrantPlugins
   module Registration
-    lib_path = Pathname.new(File.expand_path("../vagrant-registration", __FILE__))
-    autoload :Action, lib_path.join("action")
-    #autoload :Errors, lib_path.join("errors")
+    lib_path = Pathname.new(File.expand_path('../vagrant-registration', __FILE__))
+    autoload :Action, lib_path.join('action')
 
     # This returns the path to the source of this plugin.
-    #
-    # @return [Pathname]
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
 
     # Temporally load the extra capability files for Red Hat

data/lib/vagrant-registration/action.rb

@@ -20,10 +20,10 @@ module VagrantPlugins
         end
       end
 
-      action_root = Pathname.new(File.expand_path("../action", __FILE__))
-      autoload :Register, action_root.join("register")
-      autoload :UnregisterOnHalt, action_root.join("unregister_on_halt")
-      autoload :UnregisterOnDestroy, action_root.join("unregister_on_destroy")
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :Register, action_root.join('register')
+      autoload :UnregisterOnHalt, action_root.join('unregister_on_halt')
+      autoload :UnregisterOnDestroy, action_root.join('unregister_on_destroy')
     end
   end
 end

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

@@ -5,9 +5,9 @@ module VagrantPlugins
     module Action
       # This registers the guest if the guest plugin supports it
       class Register
-        def initialize(app, env)
+        def initialize(app, _)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_registration::action::register")
+          @logger = Log4r::Logger.new('vagrant_registration::action::register')
         end
 
         def call(env)
@@ -19,13 +19,14 @@ module VagrantPlugins
           guest = env[:machine].guest
 
           if should_register?(machine)
-            env[:ui].info("Registering box with vagrant-registration...")
+            env[:ui].info('Registering box with vagrant-registration...')
+            check_configuration_options(machine, env[:ui])
 
             unless credentials_provided? machine
-              @logger.debug("Credentials for registration not provided")
+              @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] ")
+              register_now = env[:ui].ask('Would you like to register the system now (default: yes)? [y|n]')
 
               if register_now == 'n'
                 config.skip = true
@@ -33,10 +34,10 @@ module VagrantPlugins
                 config = register_on_screen(machine, env[:ui])
               end
             end
-            guest.capability(:registration_register) unless config.skip
+            guest.capability(:registration_register, env[:ui]) unless config.skip
           end
 
-          @logger.debug("Registration is skipped due to the configuration") if config.skip
+          @logger.debug('Registration is skipped due to the configuration') if config.skip
         end
 
         private
@@ -49,6 +50,31 @@ module VagrantPlugins
           !machine.guest.capability(:registration_registered?)
         end
 
+        # Issues warning if an unsupported option is used and displays
+        # a list of supported options
+        def check_configuration_options(machine, ui)
+          manager = machine.guest.capability(:registration_manager).to_s
+          available_options = machine.guest.capability(:registration_options)
+          options = machine.config.registration.conf.each_pair.map { |pair| pair[0] }
+
+          if unsupported_options_provided?(manager, available_options, options, ui)
+            ui.warn("WARNING: #{manager} supports only the following options:" +
+                    "\nWARNING: " + available_options.join(', '))
+          end
+        end
+
+        # Return true if there are any unsupported options
+        def unsupported_options_provided?(manager, available_options, options, ui)
+          warned = false
+          options.each do |option|
+            unless available_options.include? option
+              ui.warn("WARNING: #{option} option is not supported for " + manager)
+              warned = true
+            end
+          end
+          warned
+        end
+
         # Check if registration capabilities are available
         def capabilities_provided?(guest)
           if guest.capability?(:registration_register) &&
@@ -56,7 +82,7 @@ module VagrantPlugins
              guest.capability?(:registration_registered?)
             true
           else
-            @logger.debug("Registration is skipped due to the missing guest capability")
+            @logger.debug('Registration is skipped due to the missing guest capability')
             false
           end
         end
@@ -66,7 +92,7 @@ module VagrantPlugins
           if guest.capability(:registration_manager_installed)
             true
           else
-            @logger.debug("Registration manager not found on guest")
+            @logger.debug('Registration manager not found on guest')
             false
           end
         end
@@ -112,7 +138,7 @@ module VagrantPlugins
             unless machine.config.registration.send(option)
               echo = !(secrets(machine).include? option)
               response = ui.ask("#{option}: ", echo: echo)
-              machine.config.registration.send("#{option.to_s}=".to_sym, response)
+              machine.config.registration.send("#{option}=".to_sym, response)
             end
           end
           machine.config.registration

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

@@ -1,4 +1,4 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module Registration
@@ -7,7 +7,7 @@ module VagrantPlugins
       class UnregisterOnDestroy
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_registration::action::unregister_on_destroy")
+          @logger = Log4r::Logger.new('vagrant_registration::action::unregister_on_destroy')
         end
 
         def call(env)
@@ -15,17 +15,17 @@ module VagrantPlugins
           guest = env[:machine].guest
 
           if capabilities_provided?(guest) && manager_installed?(guest) && !config.skip
-            env[:ui].info("Unregistering box with vagrant-registration...")
+            env[:ui].info('Unregistering box with vagrant-registration...')
             guest.capability(:registration_unregister)
           end
 
-          @logger.debug("Unregistration is skipped due to the configuration") if config.skip
+          @logger.debug('Unregistration is skipped due to the configuration') if config.skip
           @app.call(env)
 
         # 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")
+          @logger.debug('Guest is not available, ignore unregistration')
           @app.call(env)
         end
 
@@ -36,7 +36,7 @@ module VagrantPlugins
           if guest.capability?(:registration_unregister) && guest.capability?(:registration_manager_installed)
             true
           else
-            @logger.debug("Unregistration is skipped due to the missing guest capability")
+            @logger.debug('Unregistration is skipped due to the missing guest capability')
             false
           end
         end
@@ -46,7 +46,7 @@ module VagrantPlugins
           if guest.capability(:registration_manager_installed)
             true
           else
-            @logger.debug("Registration manager not found on guest")
+            @logger.debug('Registration manager not found on guest')
             false
           end
         end

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

@@ -7,7 +7,7 @@ module VagrantPlugins
       class UnregisterOnHalt
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_registration::action::unregister_on_halt")
+          @logger = Log4r::Logger.new('vagrant_registration::action::unregister_on_halt')
         end
 
         def call(env)
@@ -15,18 +15,18 @@ module VagrantPlugins
           guest = env[:machine].guest
 
           if capabilities_provided?(guest) && manager_installed?(guest) && !config.skip && config.unregister_on_halt
-            env[:ui].info("Unregistering box with vagrant-registration...")
+            env[:ui].info('Unregistering box with vagrant-registration...')
             guest.capability(:registration_unregister)
           end
 
-          @logger.debug("Unregistration is skipped due to the configuration") if config.skip
-          @logger.debug("Unregistration is skipped on halt due to the configuration") if !config.unregister_on_halt
+          @logger.debug('Unregistration is skipped due to the configuration') if config.skip
+          @logger.debug('Unregistration is skipped on halt due to the configuration') if !config.unregister_on_halt
           @app.call(env)
 
         # 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")
+          @logger.debug('Guest is not available, ignore unregistration')
           @app.call(env)
         end
 
@@ -37,7 +37,7 @@ module VagrantPlugins
           if guest.capability?(:registration_unregister) && guest.capability?(:registration_manager_installed)
             true
           else
-            @logger.debug("Unregistration is skipped due to the missing guest capability")
+            @logger.debug('Unregistration is skipped due to the missing guest capability')
             false
           end
         end
@@ -47,7 +47,7 @@ module VagrantPlugins
           if guest.capability(:registration_manager_installed)
             true
           else
-            @logger.debug("Registration manager not found on guest")
+            @logger.debug('Registration manager not found on guest')
             false
           end
         end

data/lib/vagrant-registration/config.rb

@@ -3,10 +3,12 @@ require "ostruct"
 
 module VagrantPlugins
   module Registration
-    class Config < Vagrant.plugin("2", :config)
+    class Config < Vagrant.plugin('2', :config)
+      attr_reader :conf
+
       def initialize(region_specific=false)
         @conf = UNSET_VALUE
-        @logger = Log4r::Logger.new("vagrant_registration::config")
+        @logger = Log4r::Logger.new('vagrant_registration::config')
       end
 
       def finalize!
@@ -26,16 +28,16 @@ module VagrantPlugins
 
       private
 
-        # Don't set @conf to OpenStruct in initialize
-        # to preserve config hierarchy
-        def get_config
-          @conf = OpenStruct.new if @conf == UNSET_VALUE
-        end
+      # Don't set @conf to OpenStruct in initialize
+      # to preserve config hierarchy
+      def get_config
+        @conf = OpenStruct.new if @conf == UNSET_VALUE
+      end
 
-        def adjust_arguments(args)
-          return '' if args.size < 1
-          args.map{|a| a.is_a?(String) ? "'#{a}'" : a}.join(',')
-        end
+      def adjust_arguments(args)
+        return '' if args.size < 1
+        args.map { |a| a.is_a?(String) ? "'#{a}'" : a }.join(',')
+      end
     end
   end
 end

data/lib/vagrant-registration/plugin.rb

@@ -6,13 +6,13 @@ 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"
-  raise "The Vagrant RHEL plugin is only compatible with Vagrant 1.2+"
+if Vagrant::VERSION < '1.2.0'
+  fail 'The Vagrant RHEL plugin is only compatible with Vagrant 1.2+.'
 end
 
 module VagrantPlugins
   module Registration
-    class Plugin < Vagrant.plugin("2")
+    class Plugin < Vagrant.plugin('2')
       class << self
         def register(hook)
           setup_logging
@@ -31,7 +31,7 @@ module VagrantPlugins
         end
       end
 
-      name "Registration"
+      name 'Registration'
       description <<-DESC
       This plugin adds register and unregister functionality to Vagrant Guests that
       support the capability
@@ -64,7 +64,7 @@ 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

data/lib/vagrant-registration/version.rb

@@ -1,5 +1,6 @@
 module VagrantPlugins
+  # Registration plugin to auto-register guests on `vagrant up`
   module Registration
-    VERSION = "0.0.19"
+    VERSION = '1.0.0'
   end
 end

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

@@ -1,6 +1,9 @@
 module VagrantPlugins
   module GuestRedHat
     module Cap
+      # Common configuration options for all managers
+      DEFAULT_CONFIGURATION_OPTIONS = [:skip, :unregister_on_halt]
+
       # This provides registration capabilities for vagrant-registration
       #
       # As we might support more registration options (managers), this
@@ -18,10 +21,10 @@ module VagrantPlugins
         end
 
         # Register the given machine
-        def self.registration_register(machine)
+        def self.registration_register(machine, ui)
           cap = "#{self.registration_manager(machine).to_s}_register".to_sym
           if machine.guest.capability?(cap)
-            machine.guest.capability(cap, machine.config.registration)
+            machine.guest.capability(cap, ui)
           else
             false
           end
@@ -62,6 +65,17 @@ module VagrantPlugins
           end
         end
 
+        # Return all available options for a given registration manager together
+        # with general options available to any.
+        def self.registration_options(machine)
+          cap = "#{self.registration_manager(machine).to_s}_options".to_sym
+          if machine.guest.capability?(cap)
+            DEFAULT_CONFIGURATION_OPTIONS + machine.guest.capability(cap)
+          else
+            DEFAULT_CONFIGURATION_OPTIONS
+          end
+        end
+
         # Return secret options for the registration manager
         def self.registration_secrets(machine)
           cap = "#{self.registration_manager(machine).to_s}_secrets".to_sym

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

@@ -15,11 +15,28 @@ module VagrantPlugins
         end
 
         # Register the machine using 'register' option, config is (Open)Struct
-        def self.subscription_manager_register(machine, config)
-          command = "subscription-manager register #{configuration_to_options(config)}"
+        def self.subscription_manager_register(machine, ui)
+          subscription_manager_upload_certificate(machine, ui) if machine.config.registration.ca_cert
+          command = "subscription-manager register #{configuration_to_options(machine.config.registration)}"
           machine.communicate.execute("cmd=$(#{command}); if [ \"$?\" != \"0\" ]; then echo $cmd | grep 'This system is already registered' || (echo $cmd 1>&2 && exit 1) ; fi", sudo: true)
         end
 
+        # Upload provided CA cert to the standard /etc/rhsm/ca path on the guest
+        #
+        # Since subscription-manager recognizes only .pem files, we rename those
+        # files not ending with '.pem' extension.
+        def self.subscription_manager_upload_certificate(machine, ui)
+          ui.info("Uploading CA certificate from #{machine.config.registration.ca_cert}...")
+          if File.exist?(machine.config.registration.ca_cert)
+            cert_file_content = File.read(machine.config.registration.ca_cert)
+            cert_file_name = File.basename(machine.config.registration.ca_cert)
+            cert_file_name = "#{cert_file_name}.pem" unless cert_file_name.end_with? '.pem'
+            machine.communicate.execute("echo '#{cert_file_content}' > /etc/rhsm/ca/#{cert_file_name}", sudo: true)
+          else
+            ui.warn("WARNING: Provided CA certificate file #{machine.config.registration.ca_cert} does not exist, skipping")
+          end
+       end
+
         # Unregister the machine using 'unregister' option
         def self.subscription_manager_unregister(machine)
           machine.communicate.execute("subscription-manager unregister || :", sudo: true)
@@ -30,6 +47,16 @@ module VagrantPlugins
           [[:username, :password], [:org, :activationkey]]
         end
 
+        # Return all available options for subscription-manager
+        #
+        # ca_cert is not part of 'register' command API, but it's needed
+        # in conjuntion with serverurl option.
+        def self.subscription_manager_options(machine)
+          [:username, :password, :serverurl, :baseurl, :org, :environment,
+           :name, :auto_attach, :activationkey, :servicelevel, :release,
+           :force, :type, :ca_cert]
+        end
+
         # Return secret options for subscription-manager
         def self.subscription_manager_secrets(machine)
           [:password]

data/plugins/guests/redhat/plugin.rb

@@ -1,70 +1,85 @@
-require "vagrant"
+require 'vagrant'
 
 module VagrantPlugins
   module GuestRedHat
-    class Plugin < Vagrant.plugin("2")
-      guest_capability("redhat", "registration_registered?") do
-        require_relative "cap/registration"
+    class Plugin < Vagrant.plugin('2')
+      guest_capability('redhat', 'registration_registered?') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "registration_register") do
-        require_relative "cap/registration"
+      guest_capability('redhat', 'registration_register') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "registration_unregister") do
-        require_relative "cap/registration"
+      guest_capability('redhat', 'registration_unregister') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "registration_manager_installed") do
-        require_relative "cap/registration"
+      guest_capability('redhat', 'registration_manager_installed') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "registration_credentials") do
-        require_relative "cap/registration"
+      guest_capability('redhat', 'registration_credentials') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "registration_secrets") do
-        require_relative "cap/registration"
+      guest_capability('redhat', 'registration_options') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "registration_manager") do
-        require_relative "cap/registration"
+      guest_capability('redhat', 'registration_secrets') do
+        require_relative 'cap/registration'
         Cap::Registration
       end
 
-      guest_capability("redhat", "subscription_manager") do
-        require_relative "cap/subscription_manager"
+      guest_capability('redhat', 'registration_manager') do
+        require_relative 'cap/registration'
+        Cap::Registration
+      end
+
+      guest_capability('redhat', 'subscription_manager') do
+        require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
 
-      guest_capability("redhat", "subscription_manager_registered?") do
-        require_relative "cap/subscription_manager"
+      guest_capability('redhat', 'subscription_manager_registered?') do
+        require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
 
-      guest_capability("redhat", "subscription_manager_register") do
-        require_relative "cap/subscription_manager"
+      guest_capability('redhat', 'subscription_manager_register') do
+        require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
 
-      guest_capability("redhat", "subscription_manager_unregister") do
+      guest_capability('redhat', 'subscription_manager_upload_certificate') do
         require_relative "cap/subscription_manager"
         Cap::SubscriptionManager
       end
 
-      guest_capability("redhat", "subscription_manager_credentials") do
-        require_relative "cap/subscription_manager"
+      guest_capability('redhat', 'subscription_manager_unregister') do
+        require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
 
-      guest_capability("redhat", "subscription_manager_secrets") do
-        require_relative "cap/subscription_manager"
+      guest_capability('redhat', 'subscription_manager_credentials') do
+        require_relative 'cap/subscription_manager'
+        Cap::SubscriptionManager
+      end
+
+      guest_capability('redhat', 'subscription_manager_options') do
+        require_relative 'cap/subscription_manager'
+        Cap::SubscriptionManager
+      end
+
+      guest_capability('redhat', 'subscription_manager_secrets') do
+        require_relative 'cap/subscription_manager'
         Cap::SubscriptionManager
       end
     end

data/vagrant-registration.gemspec

@@ -1,29 +1,28 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-require "vagrant-registration/version"
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'vagrant-registration/version'
 
 Gem::Specification.new do |s|
-  s.name          = "vagrant-registration"
+  s.name          = 'vagrant-registration'
   s.version       = VagrantPlugins::Registration::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.license       = "GPL-2.0"
-  s.authors       = ["Langdon White", "Josef Strzibny", "et al"]
-  s.email         = ["langdon@fedoraproject.org", "strzibny@strzibny.name"]
-  s.summary       = "Automatic guest registration for Vagrant"
-  s.description   = "Enables guests to be registered automatically which is especially useful for RHEL or SLES guests."
-  s.homepage      = "https://github.com/projectatomic/adb-vagrant-registration"
-  s.required_rubygems_version = ">= 1.3.6"
+  s.license       = 'GPL-2.0'
+  s.authors       = ['Langdon White', 'Josef Strzibny', 'et al']
+  s.email         = ['langdon@fedoraproject.org', 'strzibny@strzibny.name']
+  s.summary       = 'Automatic guest registration for Vagrant'
+  s.description   = 'Enables guests to be registered automatically which is especially useful for RHEL or SLES guests.'
+  s.homepage      = 'https://github.com/projectatomic/adb-vagrant-registration'
+  s.required_rubygems_version = '>= 1.3.6'
 
   # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
+  # the '!' syntax, but it should mostly work correctly.
   root_path      = File.dirname(__FILE__)
   all_files      = Dir.chdir(root_path) {
-    Dir.glob("lib/**/{*,.*}") +
-    Dir.glob("plugins/**/{*,.*}") +
-    Dir.glob("tests/**/{*,.*}") +
+    Dir.glob('lib/**/{*,.*}') +
+    Dir.glob('plugins/**/{*,.*}') +
     ['Rakefile', 'Gemfile', 'README.md', 'CHANGELOG.md', 'LICENSE.md', 'vagrant-registration.gemspec']
   }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
+  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 =~ /^(#|!)/ }
@@ -42,7 +41,7 @@ Gem::Specification.new do |s|
     #
     gitignore.any? do |ignore|
       File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+      File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-registration
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 1.0.0
 platform: ruby
 authors:
 - Langdon White
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -51,10 +51,6 @@ files:
 - plugins/guests/redhat/cap/registration.rb
 - plugins/guests/redhat/cap/subscription_manager.rb
 - plugins/guests/redhat/plugin.rb
-- tests/helpers.sh
-- tests/run.sh
-- tests/vagrantfiles/Vagrantfile.rhel_multi_machine
-- tests/vagrantfiles/Vagrantfile.rhel_wrong_credentials
 - vagrant-registration.gemspec
 homepage: https://github.com/projectatomic/adb-vagrant-registration
 licenses:

data/tests/helpers.sh

@@ -1,128 +0,0 @@
-# Set up test environment
-function setup_tests() {
-  check_credentials
-  install_dependencies
-
-  # Test results that should be printed at the end
-  TEST_RESULTS=''
-  FAILED=0
-  SUCCEDED=0
-  EXIT_CODE=0
-}
-
-# Print test results
-function print_results() {
-  if [ "$TEST_RESULTS" != "" ]; then
-    printf "\n$TEST_RESULTS\n"
-  fi
-  printf "\n$SUCCEDED succeded, $FAILED failed.\n"
-  exit $EXIT_CODE
-}
-
-# Clean up before each test
-function clean_up() {
-  # Clean up Vagrant metadata
-  rm -rf $DIR/.vagrant
-}
-
-# Check that we have credentials to run the test suite
-function check_credentials() {
-  if [ "$VAGRANT_REGISTRATION_USERNAME" = "" ] || [ "$VAGRANT_REGISTRATION_PASSWORD" = "" ]; then
-    echo "VAGRANT_REGISTRATION_USERNAME and VAGRANT_REGISTRATION_PASSWORD needs to be provided."
-    exit 1
-  fi
-  if [ "$VAGRANT_REGISTRATION_ORG" = "" ] || [ "$VAGRANT_REGISTRATION_ACTIVATIONKEY" = "" ]; then
-    echo "VAGRANT_REGISTRATION_ORG and VAGRANT_REGISTRATION_ACTIVATIONKEY needs to be provided."
-    exit 1
-  fi
-}
-
-# Install vagrant and vagrant-registration
-function install_dependencies() {
-  # Install Vagrant if it's not present
-  PLUGIN_INSTALLED=$(vagrant --help)
-  if [ $? -ne 0 ]; then
-    sudo yum install vagrant-libvirt -y
-  fi
-
-  # Uninstall vagrant-registration if installed
-  # TODO: Uninstall RPM package if needed
-  PLUGIN_INSTALLED=$(vagrant plugin list | grep vagrant-registration)
-  if [ -z "$PLUGIN_INSTALLED" ]; then
-    vagrant plugin uninstall vagrant-registration
-  fi
-
-  # Install vagrant-registration from current sources
-  rm -rf pkg
-  rake build
-  vagrant plugin install pkg/vagrant-registration*.gem
-}
-
-# Test that command succeded
-#
-# Usage:
-#
-#   test_success TEST_NAME COMMAND_TO_RUN
-#
-# Example:
-#
-#   test_success "ls won't fail" "ls -all"
-function test_success() {
-  eval $2 >&1 >/dev/null
-  if [ $? -ne 0 ]; then
-    printf "F"
-    FAILED=$((FAILED + 1))
-    EXIT_CODE=1
-    TEST_RESULTS="$TEST_RESULTS\nTest '$1' failed with command:"
-    TEST_RESULTS="$TEST_RESULTS\n    $2"
-  else
-    SUCCEDED=$((SUCCEDED + 1))
-    printf '.'
-  fi
-}
-
-# Test that command failed
-#
-# Usage:
-#
-#   test_failure TEST_NAME COMMAND_TO_RUN
-#
-# Example:
-#
-#   test_failure "this should fail" "echoo"
-function test_failure() {
-  eval $2 >&1 >/dev/null
-  if [ $? -ne 0 ]; then
-    SUCCEDED=$((SUCCEDED + 1))
-    printf '.'
-  else
-    printf "F"
-    FAILED=$((FAILED + 1))
-    EXIT_CODE=1
-    TEST_RESULTS="$TEST_RESULTS\nTest '$1' dit not fail with command:"
-    TEST_RESULTS="$TEST_RESULTS\n    $2"
-  fi
-}
-
-# Test that command produced an expected output
-#
-# Usage:
-#
-#   test_output TEST_NAME COMMAND_TO_RUN EXPECTED_OUTPUT
-#
-# Example:
-#
-#   test_output "echo abc outputs abc" "echo 'abc'" "abc"
-function test_output() {
-  eval $2 >&1| grep "$3" >/dev/null
-  if [ $? -ne 0 ]; then
-    printf "F"
-    FAILED=$((FAILED + 1))
-    EXIT_CODE=1
-    TEST_RESULTS="$TEST_RESULTS\nTest '$1' failed with command:"
-    TEST_RESULTS="$TEST_RESULTS\n    $2 | grep '$3'"
-  else
-    SUCCEDED=$((SUCCEDED + 1))
-    printf '.'
-  fi
-}

data/tests/run.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-# This tests test vagrant-registration plugin running on Fedora
-# with libvirt. If you do not have Vagrant installed or if you
-# have vagrant-libvirt package on your system, Vagrant will be
-# installed or vagrant-libvirt removed respectively. In that case
-# you need sudo to run the tests. If you do not run Fedora, make
-# sure you have Vagrant installed (any provider should do if you
-# add RHEL box called 'rhel-7').
-#
-# IMPORTANT: Tests need valid credentials to actually test
-# registration. This can be provided in form of environment
-# variables.
-#
-# NOTE: This will install a development version of
-# vagrant-registration on your system.
-#
-# == subscription-manager
-#
-# For testing subscription-manager on RHEL export
-# VAGRANT_REGISTRATION_USERNAME with VAGRANT_REGISTRATION_PASSWORD
-# for username/password registration and VAGRANT_REGISTRATION_ORG
-# with VAGRANT_REGISTRATION_ACTIVATIONKEY for org/activationkey one.
-#
-
-DIR=$(dirname $(readlink -f "$0"))
-
-# Import test helpers
-. $DIR/helpers.sh
-
-setup_tests
-
-# Test correct username/password and org/activationkey credentials in a multi-machine setup
-clean_up
-export VAGRANT_VAGRANTFILE=$DIR/vagrantfiles/Vagrantfile.rhel_multi_machine
-
-test_success 'vagrant up on RHEL multi_machine setup' 'vagrant up rhel1-valid-credentials'
-
-test_output 'first machine is registered with given username/password' \
-            'vagrant ssh rhel1-valid-credentials -c '\''sudo subscription-manager register'\''' \
-            'This system is already registered.'
-
-test_success 'vagrant halt on RHEL multi_machine setup' 'vagrant halt rhel1-valid-credentials'
-test_success 'vagrant halt on RHEL multi_machine setup' 'vagrant destroy'
-test_success 'vagrant up on RHEL multi_machine setup' 'vagrant up rhel2-valid-credentials'
-
-test_output 'second machine is registered with given org/activationkey' \
-            'vagrant ssh rhel2-valid-credentials -c '\''sudo subscription-manager register'\''' \
-            'This system is already registered.'
-
-test_success 'vagrant halt on RHEL multi_machine setup' 'vagrant destroy'
-
-# Test wrong credentials
-clean_up
-export VAGRANT_VAGRANTFILE=$DIR/vagrantfiles/Vagrantfile.rhel_wrong_credentials
-test_failure 'vagrant up on RHEL with wrong credentials should fail' 'vagrant up'
-test_success 'vagrant destroy on RHEL with wrong credentials' 'vagrant destroy'
-
-print_results

data/tests/vagrantfiles/Vagrantfile.rhel_multi_machine

@@ -1,19 +0,0 @@
-# Spin 3 RHEL machines that will be registered
-
-ENV['VAGRANT_DEFAULT_PROVIDER'] ||= 'libvirt'
-ENV['VAGRANT_REGISTRATION_RHEL_BOX'] ||= 'rhel-7.0'
-
-Vagrant.configure('2') do |config|
-  config.vm.box = ENV['VAGRANT_REGISTRATION_RHEL_BOX']
-
-  config.vm.define "rhel1-valid-credentials" do |c|
-    c.registration.username = ENV['VAGRANT_REGISTRATION_USERNAME']
-    c.registration.password = ENV['VAGRANT_REGISTRATION_PASSWORD']
-  end
-
-  config.vm.define "rhel2-valid-credentials" do |c|
-    c.registration.org = ENV['VAGRANT_REGISTRATION_ORG']
-    c.registration.activationkey = ENV['VAGRANT_REGISTRATION_ACTIVATIONKEY']
-  end
-
-end

data/tests/vagrantfiles/Vagrantfile.rhel_wrong_credentials

@@ -1,14 +0,0 @@
-# Spin 1 RHEL machine with wrong credentials
-
-ENV['VAGRANT_DEFAULT_PROVIDER'] ||= 'libvirt'
-ENV['VAGRANT_REGISTRATION_RHEL_BOX'] ||= 'rhel-7.0'
-
-Vagrant.configure('2') do |config|
-  config.vm.box = ENV['VAGRANT_REGISTRATION_RHEL_BOX']
-
-  config.vm.define "rhel1-wrong-credentials" do |c|
-    c.registration.username = 'wrong_username'
-    c.registration.password = 'wrong_password'
-  end
-
-end