snatchdb 1.0.1 → 1.0.2

data/bin/snatch

@@ -39,6 +39,22 @@ optparse = OptionParser.new do |opts|
     File.open(file, 'w') { |f| f.write(SAMPLE_SCHEMA) }
     puts "File #{file} has been created. Edit and snatch!" ; exit
   end
+  
+  opts.on('-l', '--list', 'List all available config files') do
+    files = Dir[File.join(Snatch.root, '*.yml')]
+    
+    unless files.empty?
+      puts "Configuration files:"
+      files.each do |path|
+        puts " - #{File.basename(path, '.yml')}" if Snatch.valid_config?(path)
+      end
+      puts "TIP: Just type 'snatch NAME' and i will download that database."
+    else
+      puts "No available configs are available."
+    end
+    
+    exit
+  end
 end
 
 begin
@@ -68,6 +84,6 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument
   exit
 rescue Interrupt
   puts "Interrupted."
-rescue StandardError, Snatch::CredentialsError, Snatch::NoDatabaseError => ex
+rescue StandardError, Snatch::CredentialsError, Snatch::NoServiceError, Snatch::NoDatabaseError => ex
   puts "ERROR: #{ex.message}"
 end

data/lib/snatch.rb

@@ -15,4 +15,14 @@ module Snatch
     s = Snatch::Session.new(config)
     s.run!
   end
+  
+  # Returns true if snatch config is valid
+  def self.valid_config?(path)
+    data = YAML.load_file(path)
+    if data.kind_of?(Hash)
+      (data.keys & ['host']).size == 1
+    else
+      false
+    end
+  end
 end

data/lib/snatch/session.rb

@@ -1,6 +1,7 @@
 module Snatch
   class CredentialsError < Exception ; end
-  class NoDatabaseError < Exception ; end
+  class NoDatabaseError  < Exception ; end
+  class NoServiceError   < Exception ; end
   
   class Session
     attr_reader :config, :filename
@@ -42,6 +43,9 @@ module Snatch
     
     # Check configuration options
     def test
+      raise NoServiceError, "No mysql found." unless @ssh.exec!("which mysql") =~ /mysql/i
+      raise NoServiceError, "No mysqldump found." unless @ssh.exec!("which mysqldump") =~ /mysqldump/i
+      
       resp = @ssh.exec!("mysql --execute='SHOW DATABASES;' --user=#{@config[:db_user]} --password=#{@config[:db_password]}")
       if resp =~ /ERROR 1045/
         raise CredentialsError, 'Invalid MySQL user or password'

data/lib/snatch/version.rb

@@ -1,3 +1,3 @@
 module Snatch
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -2,7 +2,7 @@
 name: snatchdb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Dan Sosedoff
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -05:00
+date: 2011-06-23 00:00:00 -05:00
 default_executable: snatch
 dependencies: 
 - !ruby/object:Gem::Dependency