vm_shepherd 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0ed54fd0dbd978b48c2b0f488ad94cb38f79cc
-  data.tar.gz: e1523230b08984434ea35ac0bec752572447cd63
+  metadata.gz: 3f5da9a938a9db9f04314bec5b636f73a0833db0
+  data.tar.gz: d4d3269fa9b79dc67d0e562390a60b8fc937f0c8
 SHA512:
-  metadata.gz: a7cb194ea3889d834f44150b5c72c0cbf2d3253f44e7970980417644f9480c6c224e9ac54693fb2d6f6938ce3a5f0f090b4522ed8cbe52bce1462832995b001d
-  data.tar.gz: ecc097b982f6468a32429dfdfabd80ee7f402fe16368962ffbc305332c27e8ef7d32608006529570816cb13050ffdba92e64231a2c03d021dce3f9d79f2ffe1c
+  metadata.gz: 4abbaa57e19260441268492b6ecffe1fbdd445e6bdf5fa37251dd2272c72b051b1ccea872868b8c7e51e6e4e1e8a774f7b44658d7371a86227c11777cc68823e
+  data.tar.gz: 60fdcbded5984ed182562556d309cbb7ae499199193dd1a8e733f5da31f0b194f5f29c61e376a321f4dca7d9820e329110c327f6a48e05db6697dc7d519f7436

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 .idea
+*.gem

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -39,7 +39,7 @@ module VmShepherd
 
       datastore_folders_to_clean.each do |folder_name|
         datastores.each do |datastore|
-          VALID_DISK_FOLDER_REGEX.match(folder_name) || fail("#{folder_name.inspect} is not a valid disk folder name")
+          validate_disk_folder_name!(folder_name)
           begin
             logger.info("BEGIN datastore_folder.destroy_task folder=#{folder_name}")
 
@@ -74,6 +74,10 @@ module VmShepherd
 
     attr_reader :host, :username, :password, :datacenter_name, :logger
 
+    def validate_disk_folder_name!(folder_name)
+      VALID_DISK_FOLDER_REGEX.match(folder_name) || fail("#{folder_name.inspect} is not a valid disk folder name")
+    end
+
     def validate_folder_name!(folder_name)
       VALID_FOLDER_REGEX.match(folder_name) || fail("#{folder_name.inspect} is not a valid folder name")
     end
@@ -114,8 +118,7 @@ module VmShepherd
     end
 
     def delete_folder_and_vms(folder_name)
-      folder = datacenter.vmFolder.traverse(folder_name) ||
-        fail("ERROR no folder found with name=#{folder_name.inspect}")
+      return unless (folder = datacenter.vmFolder.traverse(folder_name))
 
       find_vms(folder).each { |vm| power_off_vm(vm) }
 

data/vm_shepherd.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rbvmomi'
 
+  spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'recursive-open-struct', '~> 0.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.