vmreverter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1987a20c1b8d7ee9e9a6f5d7d0b3a7d3683810
-  data.tar.gz: 9c49b36255b155c752bfa5ab940ed5fdc6ae0f00
+  metadata.gz: 0a1ca2d821ebac6e2f1f46d1a843c59a444d7b6d
+  data.tar.gz: 821ef2696d14f8a0b29dbaf37e9f2d7f846a1a1a
 SHA512:
-  metadata.gz: '02843c053ea84f503aee0695e349bd1ced44a259dbce84edb54efc9a0849afc5b2eeff011a827f696d82d50dd023a50311cc0791298e546a942da7e5fd135183'
-  data.tar.gz: 47441567e87c4e0256b80810df5f1079ed76f1a0b63164d48c59f95a1c0c0e36eda132896186c8fa90d91b9d7ad255f1b00edc603e57424e2d8846a52c37db12
+  metadata.gz: 7c50e66164b080aaeb9d37a494c0c0d7e38e91141ed6d06f20c28f34b37ebd0250989863e8502817ae0f751e6a7784a7a7ec00a230a7fec1ce99708c6382ff72
+  data.tar.gz: ff173f4bcb2f523bd02257d35adf3acd5b6571cca29b88c4fbff06483094b1752c778bfb215ed8e064816f8ed3afb47860f6278c7724358275a8686fec85ad17

data/lib/vmreverter/cli.rb

@@ -5,13 +5,19 @@ module Vmreverter
       @logger = Vmreverter::Logger.new(@options)
       @options[:logger] = @logger
 
-      if not @options[:config] 
-        report_and_raise(@logger, ArgumentError.new("Missing config, specify one (-c or --config)!"), "CLI: initialize") 
+      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")
+        end
+      end
+
+      if not @options[:config]
+        report_and_raise(@logger, ArgumentError.new("Missing config, specify one (-c or --config)!"), "CLI: initialize")
       end
 
       @logger.debug("Options")
       @options.each do |opt, val|
-        if val and val != [] 
+        if val and val != []
           @logger.debug("\t#{opt.to_s}:")
           if val.kind_of?(Array)
             val.each do |v|
@@ -28,20 +34,20 @@ module Vmreverter
     end
 
     def execute!
-            
+
       begin
         trap(:INT) do
           @logger.warn "Interrupt received; exiting..."
           exit(1)
         end
-       
+
         begin
           @vmmanager = Vmreverter::VMManager.new(@config, @options, @logger)
           @vmmanager.invoke
           @vmmanager.close_connection
         rescue => e
           raise e
-        end 
+        end
 
       end #trap
     end #execute!

data/lib/vmreverter/options.rb

@@ -17,7 +17,7 @@ module Vmreverter
 
       optparse = OptionParser.new do|opts|
         # Set a banner
-        opts.banner = "Usage: #{File.basename($0)} [options...]"
+        opts.banner = "Usage: #{File.basename($0)} #{::Vmreverter::VERSION} [options...]"
 
         @defaults[:auth] = File.join(ENV['HOME'], '.fog')
         opts.on '-a', '--auth FILE',
@@ -28,7 +28,7 @@ module Vmreverter
 
         @defaults[:config] = nil
         opts.on '-c', '--config FILE',
-                'Use configuration FILE', 
+                'Use configuration FILE',
                 "Default: #{@defaults[:config]}" do |file|
           @options[:config] = file
         end
@@ -41,6 +41,13 @@ module Vmreverter
           @options_from_file = parse_options_file file
         end
 
+        @defaults[:lockfile] = nil
+        opts.on '-l', '--lockfile FILE',
+                'Use a lockfile to prevent concurrency',
+                '(default no lockfile).' do |file|
+          @options[:lockfile] = file
+        end
+
         @defaults[:quiet] = false
         opts.on '-q', '--[no-]quiet',
                 'Do not log output to STDOUT',
@@ -81,6 +88,13 @@ module Vmreverter
       # merge in defaults
       @options = @defaults.merge(@options)
 
+      if @options[:lockfile]
+        pn = Pathname.new(@options[:lockfile])
+        unless pn.dirname.writable?
+          raise ArgumentError, "Specified lockfile path '#{pn.dirname}' is not writable. Check permissions."
+        end
+      end
+
       @options
     end
 

data/lib/vmreverter/shared/error_handler.rb

@@ -1,7 +1,7 @@
 # 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
   module Shared
     module ErrorHandler
 
@@ -11,8 +11,9 @@ module Vmreverter
         bt = e.backtrace
         logger.pretty_backtrace(bt).each_line do |line|
           logger.error(line)
-        end 
-        raise e
+        end
+        #raise e
+        abort
       end
 
     end

data/lib/vmreverter/version.rb

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

data/lib/vmreverter.rb

@@ -1,11 +1,13 @@
 require 'optparse'
 require 'open-uri'
 require 'yaml'
+require 'pathname'
 
 require 'rubygems' unless defined?(Gem)
 
 module Vmreverter
   $:.unshift(File.dirname(__FILE__))
+  require 'vmreverter/version'
 
   # logger
   require 'vmreverter/logger'

data/vmreverter.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bump'
+  s.add_development_dependency 'pry'
 
 
   # Run time dependencies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmreverter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - shadowbq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement