vmreverter 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba0909318704255297e7f1b5636e73f4c47b4b7
-  data.tar.gz: f91913c8358aa0a30ecd515d2d0b69e56cf39a2a
+  metadata.gz: 1695cd3a040c7d3675650f0f5b6e7b5001f0c6e2
+  data.tar.gz: e203d1ea4465fddcccdcd87baa26ae4a5b21559d
 SHA512:
-  metadata.gz: 920562064189d1828f17234e69c20444cb07e716097946cb8dc1ddf3a068534f764e615bcb9c76735cc140ba5f401f5f6af941aa2687f91e4d41b3eedebecdd6
-  data.tar.gz: cb80f8673ea2bdf8fb7d1dbcc018c6b63b5995d995a8e8405b55b50a0585d68718904bb31e229cd75be9a0babd2c17fdf51a9279e06696e6fee19de9574cbc63
+  metadata.gz: 1d03af2f9ff51183cf0a8c3ffe0bd5f380df9d384007bd80d60653a851f71ee5b6b434d9f63e86c0de04652341c2b8fe38d27b149e4a1169f805db15f32a58d4
+  data.tar.gz: a1c520209b623a28412bcaf9c228b1f6a88ad1d4cde940f6f99c0852d50a2b30db8c8291e2e92b1fff6c5bb5ce8fc5b7008992b1c37cf9b9060a82c72d0487a9

data/lib/vmreverter/cli.rb

@@ -3,7 +3,7 @@ module Vmreverter
     def initialize
       @options = Vmreverter::Options.parse_args
       @logger = Vmreverter::Logger.new(@options)
-      @options[:logger] = @logger
+
 
       if @options[:lockfile]
         if Pathname.new(@options[:lockfile]).exist?
@@ -31,7 +31,8 @@ module Vmreverter
         end
       end
 
-      @config = Vmreverter::ConfigTester.new(@options[:config], @options)
+      Vmreverter::Configuration.build(@options, @logger)
+      @config = Vmreverter::Configuration.instance
 
     end
 
@@ -43,17 +44,7 @@ module Vmreverter
           FileUtils.rm @options[:lockfile], :force => true if @options[:lockfile]
           exit(1)
         end
-
-        begin
-          @vmmanager = Vmreverter::VMManager.new(@config)
-          @vmmanager.invoke
-          @vmmanager.close_connection
-        rescue => e
-          raise e
-        ensure
-          FileUtils.rm @options[:lockfile], :force => true if @options[:lockfile]
-        end
-
+        Vmreverter::VMManager.execute!(@config)
       end #trap
     end #execute!
 

data/lib/vmreverter/{config_tester.rb → configuration.rb}

@@ -1,13 +1,21 @@
-
+require 'singleton'
 
 module Vmreverter
   # Config was taken by Ruby.
-  class ConfigTester
+  class Configuration
+    include Singleton
+
+    attr_reader :logger, :options, :config
+
+    def self.build(options, logger)
+      @@options = options
+      @@logger = logger
+    end
 
-    attr_accessor :logger
-    def initialize(config_file, options)
-      @options = options
-      @logger = options[:logger]
+    def initialize
+      @options = @@options
+      @logger = @@logger
+      config_file = @options[:config]
       @config = load_file(config_file)
     end
 
@@ -25,16 +33,16 @@ module Vmreverter
         config['HOSTS'].each_key do |host|
           config['HOSTS'][host]['tags'] ||= []
 
-          report_and_raise(@logger, RuntimeError.new("Missing hypervisor: (#{host})"), "ConfigTester::load_file")  unless config['HOSTS'][host].include? "hypervisor" 
-          hypervisor = config['HOSTS'][host]['hypervisor'].downcase 
-          #check to see if this host has a hypervisor 
-          report_and_raise(@logger, RuntimeError.new("Invalid hypervisor: #{hypervisor} (#{host})"), "ConfigTester::load_file") unless Vmreverter::HYPERVISOR_TYPES.include? hypervisor
-          
-          #check to see if this host has a hypervisor 
-          report_and_raise(@logger, RuntimeError.new("Missing snapshot: (#{host})"), "ConfigTester::load_file")  unless config['HOSTS'][host].include? "snapshot"
+          report_and_raise(@logger, RuntimeError.new("Missing hypervisor: (#{host})"), "Configuration::load_file")  unless config['HOSTS'][host].include? "hypervisor"
+          hypervisor = config['HOSTS'][host]['hypervisor'].downcase
+          #check to see if this host has a hypervisor
+          report_and_raise(@logger, RuntimeError.new("Invalid hypervisor: #{hypervisor} (#{host})"), "Configuration::load_file") unless Vmreverter::HYPERVISOR_TYPES.include? hypervisor
+
+          #check to see if this host has a hypervisor
+          report_and_raise(@logger, RuntimeError.new("Missing snapshot: (#{host})"), "Configuration::load_file")  unless config['HOSTS'][host].include? "snapshot"
 
         end
-        
+
       end
 
       # Merge some useful date into the config hash
@@ -53,7 +61,7 @@ module Vmreverter
           @logger.notify "Tags for #{host} #{tag}"
         end
       end
-      
+
       # Access @config keys/values
       @config["CONFIG"].each_key do|cfg|
           @logger.notify "Config Key|Val: #{cfg} #{@config["CONFIG"][cfg].inspect}"

data/lib/vmreverter/hypervisor/aws.rb

@@ -6,8 +6,8 @@ module Vmreverter
     #Blimpy will import your ~/.ssh/id_rsa.pub or ~/.ssh/id_dsa.pub into a Key Pair in every region that you use in your Blimpfiles.
     def initialize(blimpy_hosts, config)
       @config = config
-      @options = config[:options]
-      @logger = config[:logger]
+      @options = config.options
+      @logger = config.logger
       @blimpy_hosts = blimpy_hosts
       require 'rubygems' unless defined?(Gem)
       require 'yaml' unless defined?(YAML)

data/lib/vmreverter/hypervisor/vsphere.rb

@@ -5,8 +5,8 @@ module Vmreverter
 
     def initialize(vsphere_hosts, config)
       @config = config
-      @options = config[:options]
-      @logger = config[:logger]
+      @options = config.options
+      @logger = config.logger
       @vsphere_hosts = vsphere_hosts
       require 'yaml' unless defined?(YAML)
       vsphere_credentials = VsphereHelper.load_config @options[:auth]

data/lib/vmreverter/hypervisor.rb

@@ -11,7 +11,7 @@ module Vmreverter
     end
 
     def self.register(type, hosts_to_provision, config)
-      @logger = config[:logger]
+      @logger = config.logger
       @logger.notify("Hypervisor found some #{type} boxes to hook")
       case type.downcase
         when /vsphere/

data/lib/vmreverter/version.rb

@@ -1,3 +1,3 @@
 module Vmreverter
-    VERSION = '0.0.9'
+    VERSION = '0.1.0'
 end

data/lib/vmreverter/vmmanager.rb

@@ -1,3 +1,4 @@
+require 'pry'
 %w(hypervisor).each do |lib|
   begin
     require "vmreverter/#{lib}"
@@ -15,9 +16,23 @@ module Vmreverter
 
     attr_accessor :hypervisor_collection
 
+
+    def self.execute!(config)
+      begin
+        @vmmanager = Vmreverter::VMManager.new(config)
+        @vmmanager.invoke
+        @vmmanager.close_connection
+      rescue => e
+        raise e
+      ensure
+        FileUtils.rm config.options[:lockfile], :force => true if config.options[:lockfile]
+      end
+    end #execute!
+
+
     def initialize(config)
-      @logger = config[:logger]
-      @options = config[:options]
+      @logger = config.logger
+      @options = config.options
       @hosts = []
       @config = config
       @hypervisor_collection = {}

data/lib/vmreverter.rb

@@ -19,7 +19,7 @@ module Vmreverter
   # hypervisor methods and helpers
   require 'vmreverter/hypervisor'
 
-  %w( options vmmanager config_tester cli ).each do |lib|
+  %w( options vmmanager configuration cli ).each do |lib|
     begin
       require "vmreverter/#{lib}"
     rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmreverter
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - shadowbq
@@ -139,7 +139,7 @@ files:
 - components.LICENSE.puppet_acceptance
 - lib/vmreverter.rb
 - lib/vmreverter/cli.rb
-- lib/vmreverter/config_tester.rb
+- lib/vmreverter/configuration.rb
 - lib/vmreverter/hypervisor.rb
 - lib/vmreverter/hypervisor/aws.rb
 - lib/vmreverter/hypervisor/vsphere.rb