dumpr 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3cfde68c281a599acafcb492f09bc434ca3a80d066f3617e6d6c504aa2c3f2
-  data.tar.gz: 1208625e0f1dbfef63210656a3313905ce1d1ec5f74c51718652781495998636
+  metadata.gz: 205fecfb4696237b6e460954704b0f9553604c993f257acd7dc7dc4ebf96fd92
+  data.tar.gz: b2be3a8c4b43607e1e0c606f5b3c1d53d5c5db7973b77a630f4ed6511dd1fb9c
 SHA512:
-  metadata.gz: '0148d00c1f332b28dc6f1e640792c4c58bed2242abc64e1094e10e4fc534c589e71bc9e929b23988e9a9053a00b1ceb9a3989704f9856abb8d77b7a9521794ad'
-  data.tar.gz: 75414e3b37615572f70df9dba1a8cbca2b07609bee818cf1ca44d11d32bb060e4d5b4c6cb6238f4edea33e2fa5009805bf149d22e4f2c17946b41640174dcad4
+  metadata.gz: 0eaf3d62ba27241aaa50f17d31a8b5bd249ce12a2fb210179236bd8330ac2053f6580558f579ce0ed378411f6e94ab019362759f90f2a37aa1c4e2ef921aa29f
+  data.tar.gz: c1268f23b9dee20df7b8179665b62c755aadc3fbfaebffee16bba8a11dbe111f2e8589137b6cb8dd9db7e016c44c52195386740fe4d71f2a4522721c64a38a90

data/lib/dumpr.rb

@@ -3,6 +3,9 @@ require 'dumpr/driver'
 
 module Dumpr
 
+  # error raised when there is a bad configuration
+  class MissingDriver < RuntimeError; end
+
   # error raised when there is a bad configuration
   class BadConfig < RuntimeError; end
 

data/lib/dumpr/cli.rb

@@ -134,6 +134,9 @@ ENDSTR
         else
           Dumpr.export(options[:driver], options)
         end
+      rescue Dumpr::MissingDriver => e
+        puts "#{e.message}."
+        exit 1
       rescue Dumpr::BadConfig => e
         puts "bad arguments: #{e.message}.\n See --help"
         exit 1

data/lib/dumpr/driver.rb

@@ -100,8 +100,16 @@ module Dumpr
         @logger
       end
 
+      def dump_installed?
+        raise BadConfig.new "#{self.class} has not defined dump_installed?"
+      end
+
+      def import_installed?
+        raise BadConfig.new "#{self.class} has not defined import_installed?"
+      end
+
       def dump_cmd
-        raise BadConfig.new "#{self.class} has not defined dump_cmd!"
+        raise BadConfig.new "#{self.class} has not defined dump_cmd"
       end
 
       # DUMPING + EXPORTING
@@ -115,6 +123,9 @@ module Dumpr
       # if @destination is defined, it then moves the dump to the @destination, which can be a remote host:path
       def dump
         logger.debug("begin dump")
+        if dump_installed? != true
+          raise MissingDriver.new "#{self.class} does not appear to be installed.\nCould not find command `#{dump_cmd.to_s.split.first}`"
+        end
         dumpfn = @dumpfile + (@gzip ? ".gz" : "")
         Util.with_lockfile("localhost", dumpfn, @opts[:force]) do
 
@@ -184,6 +195,9 @@ module Dumpr
       end
 
       def import
+        if import_installed? != true
+          raise MissingDriver.new "#{self.class} does not appear to be installed.\nCould not find command `#{import_cmd.to_s.split.first}`"
+        end
         Util.with_lockfile("localhost", @dumpfile, @opts[:force]) do
           decompress if @gzip
 

data/lib/dumpr/driver/mysql.rb

@@ -11,6 +11,14 @@ module Dumpr
         @dump_options || "--single-transaction --quick"
       end
 
+      def dump_installed?
+        system("which mysqldump") == true
+      end
+
+      def import_installed?
+        system("which mysql") == true
+      end
+
       def dump_cmd
         if @all_databases
           "mysqldump -u #{user} --password=#{password} -h #{host} -P #{port} --all-databases #{dump_options}"

data/lib/dumpr/version.rb

@@ -1,3 +1,3 @@
 module Dumpr
-  Version = "1.0".freeze
+  Version = "1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumpr
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - James Dickson