vgh 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+=== 0.2.1
+  - Fix SQL and LVM checks
+
 === 0.2.0
   - Add Checkpoint app
   - Merged all configuration files to a single one

data/lib/vgh/ec2/snapshot.rb

@@ -54,7 +54,7 @@ class Snapshot
   # Tags a Snapshot
   def tag_snapshot
     snap = snapshot
-    message.info "Tagging snapshot \"#{snap.id}\""
+    message.info "Tagging snapshot \"#{snap.id}\"..."
     tags.map {|key, value|
       ec2.tags.create(snap, key, {:value => value})
     }

data/lib/vgh/system/lvm.rb

@@ -19,11 +19,6 @@ module System
 #
 class LVM
 
-  # Loads variables and checks if LVM Tools are installed
-  def initialize
-    installed?
-  end
-
   # @return [String] The dmsetup system command
   def dm_cmd
     @dmcmd ||= '/sbin/dmsetup'
@@ -41,46 +36,27 @@ class LVM
 
   # @return [String] A list of logical volumes present
   def lvs
+    @lvs = []
     if ( installed? and System.is_root? )
-      @lvs ||= `#{dm_cmd} ls | /bin/grep -E -v 'swap|root'`
+      lv_list = `#{dm_cmd} ls | /bin/grep -E -v 'swap|root'`
+      @lvs.push(lv_list.split[0]) unless lv_list == "No devices found\n"
     else
       message.warn "Listing logical volume needs root privileges!"
-      return nil
-    end
-  end
-
-  # Test if logical volumes are present
-  # @return [Boolean]
-  def lvs_are_present?
-    if lvs != "No devices found\n" then
-      return true
-    else
-      message.info "No logical volumes found."
-      return false
     end
-  end
-
-  # Suspend all logical volume
-  def suspend
-    suspend_lvs if lvs_are_present?
+    return @lvs
   end
 
   # The actual suspend action
-  def suspend_lvs
-    for lv_name in lvs.split[0]
+  def suspend
+    for lv_name in lvs
       message.info "Suspending Logical Volume '#{lv_name}'..."
       `#{dm_cmd} suspend #{lv_name}`
     end
   end
 
-  # Resume all logical volumes
-  def resume
-    resume_lvs if lvs_are_present?
-  end
-
   # The actual resume action
-  def resume_lvs
-    for lv_name in lvs.split[0]
+  def resume
+    for lv_name in lvs
       message.info "Resuming Logical Volume '#{lv_name}'..."
       `#{dm_cmd} resume #{lv_name}`
     end

data/lib/vgh/system/mysql.rb

@@ -16,8 +16,8 @@ class MySQL
 
   # Load defaults
   def initialize
-    @mysqladmin = '/usr/bin/mysqladmin'
-    @mysql      = '/usr/bin/mysql'
+    @mysqladmin_cmd = '/usr/bin/mysqladmin'
+    @mysql_cmd      = '/usr/bin/mysql'
   end
 
   # Get MySQL user
@@ -32,17 +32,27 @@ class MySQL
     @mysql_password ||= config[:mysql_password]
   end
 
+  # Check if server is running and we have the right credentials
+  # @return [Boolean]
+  def commands_present?
+    commands_present = false
+    if File.exists?(@mysqladmin_cmd) and File.exists?(@mysqladmin_cmd)
+      commands_present = true
+    end
+    return commands_present
+  end
 
   # Check if server is running and we have the right credentials
   # @return [Boolean]
   def mysql_exists?
     mysql_exists = false
-    if File.exists?(@mysqladmin)
-      mysql_exists = system "#{@mysqladmin} -s ping"
-      if ! mysql_user and ! mysql_password
-        message.warning 'WARNING: MySQL exists but no credentials were found!'
-        mysql_exists = false
-      end
+    server_present = system "#{@mysqladmin_cmd} -s ping" if commands_present?
+    if server_present and mysql_user.nil? and mysql_password.nil?
+      message.warn 'WARNING: MySQL exists but no credentials were found!'
+    elsif ! server_present and ! mysql_user.nil? and ! mysql_password.nil?
+      message.warn 'WARNING: MySQL credentials exist but no local server was found!'
+    elsif server_present and ! mysql_user.nil? and ! mysql_password.nil?
+      mysql_exists = true
     end
     return mysql_exists
   end
@@ -69,3 +79,4 @@ end # module VGH
 
 require 'vgh/output'
 require 'vgh/configuration'
+

data/lib/vgh/version.rb

@@ -1,6 +1,6 @@
 module VGH
   # Version number
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
   # Returns the version number
   def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vgh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -87386979
+      hash: 1008001245
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -87386979
+      hash: 1008001245
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23