snatchdb 1.0.0 → 1.0.1

data/bin/snatch

@@ -11,6 +11,7 @@ require 'snatch'
 SAMPLE_SCHEMA = <<END
 ---
 host: YOUR_HOSTNAME
+port: 22
 user: YOUR_SSH_USER
 password: YOUR_SSH_PASSWORD
 db_user: MYSQL_USER
@@ -44,9 +45,15 @@ begin
   optparse.parse!
   
   unless ARGV.empty?
-    file = File.expand_path(ARGV.shift)
+    filename = ARGV.shift.strip
+    if File.extname(filename).empty?
+      file = File.join(Snatch.root, "#{filename}.yml")
+    else
+      file = File.expand_path(filename)
+    end
+    
     unless File.exists?(file)
-      puts "File #{file} was not found!"
+      puts "File \"#{file}\" was not found!"
       exit
     end
     

data/lib/snatch/session.rb

@@ -7,6 +7,7 @@ module Snatch
     
     def initialize(config)
       @config = config
+      @config[:port] = config[:port] || 22
       @ssh = nil
       @filename = "#{@config[:host]}_#{Time.now.strftime("%Y%m%d%H%M%S")}.sql.gz"
     end
@@ -26,7 +27,7 @@ module Snatch
     def connect
       puts "ssh: connecting..."
       begin
-        @ssh = Net::SSH.start(@config[:host], @config[:user],:password => @config[:password])
+        @ssh = Net::SSH.start(@config[:host], @config[:user], :port => @config[:port], :password => @config[:password])
       rescue Net::SSH::AuthenticationFailed
         raise CredentialsError, 'Invalid SSH user or password'
       end
@@ -58,11 +59,11 @@ module Snatch
     def dump
       cmd = []
       cmd << "--user=#{@config[:db_user]}"
-      cmd << "--password=#{@config[:db_password]}" unless @config[:db_password].strip.empty?
-      cmd << "--databases #{@config[:db_list].join(' ')}"
+      cmd << "--password=#{@config[:db_password]}" unless @config[:db_password].to_s.strip.empty?
       cmd << "--add-drop-database"
       cmd << "--add-drop-table"
       cmd << "--compact"
+      cmd << "--databases #{@config[:db_list].join(' ')}"
       cmd = "mysqldump #{cmd.join(' ')} | gzip --best > /tmp/#{filename}"
       
       puts "mysql: creating a dump..."
@@ -77,7 +78,7 @@ module Snatch
     
     # Fetch remote dump to local filesystem
     def download
-      Net::SFTP.start(@config[:host], @config[:user], :password => @config[:password]) do |sftp|
+      Net::SFTP.start(@config[:host], @config[:user], :port => @config[:port], :password => @config[:password]) do |sftp|
         t = sftp.download!(
           "/tmp/#{filename}",                  # Remote file
           "#{Dir.pwd}/#{filename}",            # Local file
@@ -87,4 +88,4 @@ module Snatch
       end
     end
   end
-end
+end

data/lib/snatch/version.rb

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

data/lib/snatch.rb

@@ -7,6 +7,10 @@ require 'snatch/handler'
 require 'snatch/session'
 
 module Snatch
+  def self.root
+    File.join(ENV['HOME'], '.snatch')
+  end
+  
   def self.run(config)
     s = Snatch::Session.new(config)
     s.run!

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: snatchdb
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dan Sosedoff
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -06:00
+date: 2011-06-14 00:00:00 -05:00
 default_executable: snatch
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 0
-        - 24
         version: 2.0.24
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 0
-        - 5
         version: 2.0.5
   type: :runtime
   version_requirements: *id002
@@ -79,23 +64,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Snatch is a remote database downloader via SSH protocol