vmreverter 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1ca2d821ebac6e2f1f46d1a843c59a444d7b6d
-  data.tar.gz: 821ef2696d14f8a0b29dbaf37e9f2d7f846a1a1a
+  metadata.gz: 9c6d1d4079c2ffa8e7bdf72f3edb392078e0bba1
+  data.tar.gz: 682239301aea1a42fe8112525d807809eb0d9b4b
 SHA512:
-  metadata.gz: 7c50e66164b080aaeb9d37a494c0c0d7e38e91141ed6d06f20c28f34b37ebd0250989863e8502817ae0f751e6a7784a7a7ec00a230a7fec1ce99708c6382ff72
-  data.tar.gz: ff173f4bcb2f523bd02257d35adf3acd5b6571cca29b88c4fbff06483094b1752c778bfb215ed8e064816f8ed3afb47860f6278c7724358275a8686fec85ad17
+  metadata.gz: 20b1ca86303d2c9a46312b3ffbddff6f851e263492cafbf93092c84d3516b41ac23c82141d1f7dbd28aba2582d538d77bcbe695b95f54367feec9dda57cefcf0
+  data.tar.gz: 34f34b1d62929155823095f14a5ccdd108e5b9ea4de46096f9d4e4af7c7e1efc5445b1722442839c2cfbcfd6cc27c3b8804e8bd32e74032bdbfd8b83c28fee46

data/lib/vmreverter/cli.rb

@@ -1,3 +1,4 @@
+require 'pry'
 module Vmreverter
   class CLI
     def initialize
@@ -7,7 +8,9 @@ module Vmreverter
 
       if @options[:lockfile]
         if Pathname.new(@options[:lockfile]).exist?
-          report_and_raise(@logger, ArgumentError.new("Specified lockfile path '#{@options[:lockfile].dirname}' is locked."), "Lockfile is locked")
+          report_and_raise(@logger, ArgumentError.new("Specified lockfile path '#{@options[:lockfile]}' is locked."), "Lockfile is locked")
+        else
+          FileUtils.touch(@options[:lockfile])
         end
       end
 
@@ -38,15 +41,19 @@ module Vmreverter
       begin
         trap(:INT) do
           @logger.warn "Interrupt received; exiting..."
+          FileUtils.rm @options[:lockfile], :force => true if @options[:lockfile]
           exit(1)
         end
 
         begin
-          @vmmanager = Vmreverter::VMManager.new(@config, @options, @logger)
+          binding.pry
+          @vmmanager = Vmreverter::VMManager.new(@config, @options)
           @vmmanager.invoke
           @vmmanager.close_connection
         rescue => e
           raise e
+        ensure
+          FileUtils.rm @options[:lockfile], :force => true if @options[:lockfile]  
         end
 
       end #trap

data/lib/vmreverter/hypervisor/aws.rb

@@ -1,13 +1,13 @@
-module Vmreverter 
-  class AWS 
+module Vmreverter
+  class AWS
 
-    #AWS support will dynamically create a Security Group for you if you specify ports in the Blimpfile, this means you can easily stand up a machine with specific ports open. 
+    #AWS support will dynamically create a Security Group for you if you specify ports in the Blimpfile, this means you can easily stand up a machine with specific ports open.
     #Blimpy uses a unique hash of the ports to avoid re-creating the Security Groups unless necessary.
     #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, options, config)
-      @options = options
+    def initialize(blimpy_hosts, config)
       @config = config
-      @logger = options[:logger]
+      @options = config[:options]
+      @logger = config[:logger]
       @blimpy_hosts = blimpy_hosts
       require 'rubygems' unless defined?(Gem)
       require 'yaml' unless defined?(YAML)
@@ -16,38 +16,38 @@ module Vmreverter
       rescue LoadError
         raise "Unable to load Blimpy, please ensure its installed"
       end
-      
+
       @fleet = Blimpy.fleet do |fleet|
         @blimpy_hosts.each do |host|
-          #use snapshot provided for this host - This is an AMI! 
+          #use snapshot provided for this host - This is an AMI!
           # host
           #   ami-size: m1.small
           #   ami-region: 'us-west-2'
           #   security-group: 'Clients'
- 
+
           if not host['snapshot']
             raise "No snapshot/ami provided for AWS provisioning"
           end
-          
+
           @logger.debug "Configuring hypervision AWS for host #{host.name}(#{host['snapshot']}:#{host['amisize']}) "
 
           fleet.add(:aws) do |ship|
             ship.name = host.name
             ship.group = host['security-group']
-            ship.image_id = host['snapshot'] 
+            ship.image_id = host['snapshot']
             ship.flavor = host['amisize'] || 'm1.small'
             ship.region = host['ami-region'] || 'us-west-2'
-            ship.tags = host['tags'] 
+            ship.tags = host['tags']
             ship.username = 'root'
           end #fleet
           @logger.debug "Configuration completed."
         end #blimpy_hosts
       end#fleet
 
-      return self 
+      return self
     end #init
 
-    def invoke 
+    def invoke
       if (@config['HOSTS'][name]['launch'] == :on)
         revert
       end
@@ -56,12 +56,12 @@ module Vmreverter
     def close_connection
       @fleet = nil
     end
-    
+
     private
 
     def revert
       @logger.notify "Begin Launching AWS Hosts"
-      
+
       # Attempt to start the fleet, we wrap it with some error handling that deals
       # with generic Fog errors and retrying in case these errors are transient.
       fleet_retries = 0
@@ -88,13 +88,18 @@ module Vmreverter
     end
 
     # https://github.com/rtyler/blimpy/blob/2d2c711bfcb129f5eb0346f08da62e0cfcde7917/lib/blimpy/fleet.rb#L135
-    def power toggle=:on
+    def power(toggle=:on)
       @logger.notify "Power #{toggle} AWS boxes"
       if (toggle == :off)
         start = Time.now
         @fleet.stop
         @logger.notify "Spent %.2f seconds halting" % (Time.now - start)
-      else (toggle == :on) 
+      elsif (toggle == :on)
+        start = Time.now
+        @fleet.start
+        @logger.notify "Spent %.2f seconds booting" % (Time.now - start)
+      else
+        @logger.notify "assume power on from toggle #{toggle}"
         start = Time.now
         @fleet.start
         @logger.notify "Spent %.2f seconds booting" % (Time.now - start)

data/lib/vmreverter/hypervisor/vsphere.rb

@@ -1,15 +1,15 @@
 # Apache Licensed - (github/puppetlabs) ripped from puppet_acceptance. ** See Legal notes
 # Changes include namespace swaps, method removal, method additions, and complete code refactoring
-module Vmreverter 
+module Vmreverter
   class Vsphere
 
-    def initialize(vsphere_hosts, options, config)
-      @options = options
+    def initialize(vsphere_hosts, config)
       @config = config
-      @logger = options[:logger]
+      @options = config[:options]
+      @logger = config[:logger]
       @vsphere_hosts = vsphere_hosts
       require 'yaml' unless defined?(YAML)
-      vsphere_credentials = VsphereHelper.load_config options[:auth]
+      vsphere_credentials = VsphereHelper.load_config @options[:auth]
 
       @logger.notify "Connecting to vSphere at #{vsphere_credentials[:server]}" + " with credentials for #{vsphere_credentials[:user]}"
 
@@ -23,19 +23,19 @@ module Vmreverter
 
       #Index Hosts Available via rbvmomi
       vms = @vsphere_helper.find_vms(@vsphere_vms.keys)
-      
+
       # Test if host exists and host's snapshot requested exists
       @vsphere_vms.each_pair do |name, snap|
         #Find Host in Index
         report_and_raise(@logger, RuntimeError.new("Couldn't find VM #{name} in vSphere!"), "VSphere::initialize") unless vm = vms[name]
         #snap ~> config['HOSTS'][vm]['snapshot']
-        report_and_raise(@logger, RuntimeError.new("Could not find snapshot '#{snap}' for VM #{vm.name}!"), "VSphere::initialize")  unless @vsphere_helper.find_snapshot(vm, snap) 
+        report_and_raise(@logger, RuntimeError.new("Could not find snapshot '#{snap}' for VM #{vm.name}!"), "VSphere::initialize")  unless @vsphere_helper.find_snapshot(vm, snap)
       end
 
-      return self    
+      return self
     end
 
-    def invoke 
+    def invoke
       revert
     end
 
@@ -43,16 +43,16 @@ module Vmreverter
       @vsphere_helper.close_connection
     end
 
-    private 
-    
+    private
+
     def revert
       @logger.notify "Begin Reverting"
-      @vsphere_vms.each_pair do |name, snap|        
+      @vsphere_vms.each_pair do |name, snap|
 
         vm = @vsphere_helper.find_vms(@vsphere_vms.keys)[name]
         @logger.notify "Reverting #{vm.name} to snapshot '#{snap}'"
         start = Time.now
-        
+
         # This will block for each snapshot...
         # The code to issue them all and then wait until they are all done sucks
         snapshot = @vsphere_helper.find_snapshot(vm, snap)
@@ -60,7 +60,7 @@ module Vmreverter
 
         time = Time.now - start
         @logger.notify "Spent %.2f seconds reverting" % time
-        
+
         if (@config['HOSTS'][name]['power'] == 'up')
           host_power_on(vm)
         elsif (@config['HOSTS'][name]['power'] == 'down')
@@ -90,7 +90,7 @@ module Vmreverter
         end
     end
 
-    
+
 
   end
 end

data/lib/vmreverter/hypervisor.rb

@@ -10,17 +10,17 @@ module Vmreverter
       @logger.debug "No post-provisioning configuration necessary for #{self.class.name} boxes"
     end
 
-    def self.register type, hosts_to_provision, options, config
-      @logger = options[:logger]
-      @logger.notify("Hypervisor found some #{type} boxes to hook") 
+    def self.register(type, hosts_to_provision, config)
+      @logger = config[:logger]
+      @logger.notify("Hypervisor found some #{type} boxes to hook")
       case type.downcase
         when /vsphere/
-          return Vmreverter::Vsphere.new hosts_to_provision, options, config
+          return Vmreverter::Vsphere.new(hosts_to_provision, config)
         when /aws/
-          return Vmreverter::AWS.new hosts_to_provision, options, config
+          return Vmreverter::AWS.new(hosts_to_provision, config)
         else
           report_and_raise(@logger, RuntimeError.new("Missing Class for hypervisor invocation: (#{type})"), "Hypervisor::register")
-      end    
+      end
     end
   end
 end

data/lib/vmreverter/version.rb

@@ -1,3 +1,3 @@
 module Vmreverter
-    VERSION = '0.0.6'
+    VERSION = '0.0.8'
 end

data/lib/vmreverter/vmmanager.rb

@@ -7,51 +7,51 @@
 end
 
 module Vmreverter
-  
+
   HYPERVISOR_TYPES = ['vsphere', 'aws']
-  
+
   #Collection using Proxy Pattern - Proxy normalized access to specific Hypervisors such as VSphere through creation by the Hypervisor Factory
   class VMManager
 
     attr_accessor :hypervisor_collection
 
-    def initialize(config, options, logger)
-      @logger = logger
-      @options = options
+    def initialize(config)
+      @logger = config[:logger]
+      @options = config[:options]
       @hosts = []
       @config = config
       @hypervisor_collection = {}
       @virtual_machines = {}
 
       @config['HOSTS'].each_key do |name|
-        hypervisor = @config['HOSTS'][name]['hypervisor'] 
+        hypervisor = @config['HOSTS'][name]['hypervisor']
         @logger.debug "Hypervisor for #{name} is #{hypervisor}"
         @virtual_machines[hypervisor] = [] unless @virtual_machines[hypervisor]
         @virtual_machines[hypervisor] << name
       end
 
-      ## Data Model Looks like 
+      ## Data Model Looks like
       # @virtual_machines.inspect
       # {"vsphere" => ["test_server01","test_server02"], "blimpy" => ["aws_test_server01","aws_test_server01"]}
 
       @virtual_machines.each do |type, names|
-        @hypervisor_collection[type] = Vmreverter::Hypervisor.register(type, names, @options, @config)
+        @hypervisor_collection[type] = Vmreverter::Hypervisor.register(type, names, @config)
       end
 
       #return instance created
       return self
     end
 
-    def invoke 
+    def invoke
       @hypervisor_collection.each do |hypervisor_type, hypervisor_instance|
-        @logger.notify("Invoking #{hypervisor_type} hosts") 
+        @logger.notify("Invoking #{hypervisor_type} hosts")
         hypervisor_instance.invoke
       end
     end
 
     def close_connection
       @hypervisor_collection.each do |hypervisor_type, hypervisor_instance|
-        @logger.notify("Disconnecting from #{hypervisor_type}") 
+        @logger.notify("Disconnecting from #{hypervisor_type}")
         hypervisor_instance.close_connection
       end
     end

data/lib/vmreverter.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'open-uri'
 require 'yaml'
 require 'pathname'
+require 'fileutils'
 
 require 'rubygems' unless defined?(Gem)
 

data/vmreverter.gemspec

@@ -2,9 +2,6 @@
 $:.push File.expand_path("../lib", __FILE__)
 require File.expand_path('../lib/vmreverter/version', __FILE__)
 
-require 'rbconfig'
-ruby_conf = defined?(RbConfig) ? RbConfig::CONFIG : Config::CONFIG
-
 Gem::Specification.new do |s|
   s.name        = "vmreverter"
   s.authors     = ["shadowbq"]
@@ -19,6 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.version       = Vmreverter::VERSION
   s.licenses      = ["BSD3", "APACHE2"]
+  s.required_ruby_version = '>= 2.2.7'
 
   s.add_development_dependency 'bundler', '~> 1.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmreverter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - shadowbq
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="