dumptruck 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f9e06243949b735c0cbee908cf0608ef41d191
-  data.tar.gz: 67dcfa5cc690aeea22c4eb8a9056376fb94e50b9
+  metadata.gz: eb4fec54c12368bee28a53a524a7b2025b7c0638
+  data.tar.gz: 3e7f8675276a5b7b76afdee9a91386d7135dea1c
 SHA512:
-  metadata.gz: e4beac2750e5638b4044c161dd4adab1a6d64e1e636410767cdc8a67d786607b0b102ef33712ba6dfb0b4449090d6cd3ed370692dbf4f89c23c7fa953a412fc8
-  data.tar.gz: ade146bdf3cd952276cc831e2c7b8dde59cd01beda7748e790cdaeaae62276fbd3db59310f23b9eb6c04ca31c83ebad1ff131aff20df17602ca561a19e916e99
+  metadata.gz: 14f9af784da8e192a9f675e3f16f1db4e0ec10a9c97b10139336040f40620702de98d0be6dceef9da05d1ed802b88fb98943e9244c7839d7c59f6fee6819adcd
+  data.tar.gz: 6fa25af7048e332ce70bf660aece7a9e94d9398a749a3097a78bd1b7c4112ce65c379232d79c2a190e62bf0635ecd35c80a31efaabecc2f4f2b9bdd1a63c601a

data/README.md

@@ -1,7 +1,8 @@
-Dumptruck
+DumpTruck
 =========
-[![Build Status](https://travis-ci.org/delianides/Dumptruck.svg?branch=master)](https://travis-ci.org/delianides/Dumptruck)
-[![Coverage Status](https://coveralls.io/repos/delianides/Dumptruck/badge.png?branch=master)](https://coveralls.io/r/delianides/Dumptruck?branch=master)
+[![Gem Version](http://img.shields.io/gem/v/dumptruck.svg)](https://rubygems.org/gems/dumptruck)
+[![Build Status](https://travis-ci.org/delianides/dumptruck.svg?branch=master)](https://travis-ci.org/delianides/dumptruck)
+[![Coverage Status](https://coveralls.io/repos/delianides/dumptruck/badge.png?branch=master)](https://coveralls.io/r/delianides/dumptruck?branch=master)
 
 Ruby wrapper for the mysqldump executable
 
@@ -20,8 +21,6 @@ or install the gem manually
 
     gem install dumptruck
 
-**Note:** The gem hasn't been submitted to Rubygems yet.
-
 Usage
 -----
 

data/dumptruck.gemspec

@@ -21,11 +21,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "cocaine", "~> 0.5.4"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "rspec", "~> 0"
-  spec.add_development_dependency "rspec-nc", "~> 0"
-	spec.add_development_dependency "guard", "~> 0"
-  spec.add_development_dependency "guard-rspec", "~> 0"
-  spec.add_development_dependency "pry", "~> 0"
+  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "guard", "~> 2.6"
+  spec.add_development_dependency "guard-rspec", "~> 4.2"
+  spec.add_development_dependency "pry", "~> 0.9.12"
   spec.add_development_dependency "coveralls", "~> 0"
+  spec.add_development_dependency "mocha"
 end

data/lib/dumptruck.rb

@@ -1,3 +1,4 @@
 require "dumptruck/version"
 require "dumptruck/truck"
 require "dumptruck/load"
+require "dumptruck/exceptions"

data/lib/dumptruck/exceptions.rb

@@ -0,0 +1,5 @@
+module Dumptruck
+  class DumpError < StandardError; end
+  class MysqlDumpNotFound < DumpError; end
+  class NothingLoaded < DumpError; end
+end

data/lib/dumptruck/truck.rb

@@ -1,9 +1,11 @@
 require "benchmark"
+require "cocaine"
 
 module Dumptruck
   class Truck
+
     #mysqldump needs to be installed locally, you can pass in the location if Ruby doesn't find it
-    attr_accessor :mysqldump_cmd
+    attr_accessor :mysqldump_bin
 
     #host, hostname where you are connecting too, defaults too localhost
     attr_accessor :host
@@ -37,7 +39,8 @@ module Dumptruck
       @port          = defaults[:port]
       @filename      = defaults[:filename]
       @output_dir    = defaults[:output_dir]
-      @mysqldump_cmd = find_mysqldump_cmd(params[:mysqldump_cmd])
+
+      Cocaine::CommandLine.path = params[:mysqldump_bin]
     end
 
     def credentials
@@ -68,48 +71,39 @@ module Dumptruck
       @loads.map
     end
 
-    def dump
-      time = Benchmark.realtime do
-        filename = self.output
-        @loads.each_with_index do |l,i|
-          #[REFACTOR]
-          if i == 0
-            gzip = "gzip -c >"
-          else
-            gzip = "gzip -c >>"
-          end
+    def gzip
+      "| gzip -c >>"
+    end
 
-          cmd = "#{self.mysqldump_cmd} "
-          cmd += "#{self.credentials} "
-          cmd += "#{l.options} "
-          cmd += "#{l.ignore_tables} " unless @ignore_tables.nil?
-          cmd += "#{l.database} "
-          cmd += "| #{gzip} #{filename}"
-          begin
-            system(cmd)
-          rescue SystemCallError
-            raise "Error Running Dump!"
-          end
-        end
+    def command
+      self.loads.each_with_index do |l,i|
+        mysqldump = Cocaine::CommandLine.new('mysqldump',
+          "#{self.credentials} #{l.options} #{l.ignored_tables}#{l.database}"
+        )
+        mysqldump.command
       end
-
-      {time: time, file: "#{File.expand_path(filename)}"}
     end
 
-    private
+    def dump(run = true)
+      raise Dumptruck::NothingLoaded, "You haven't loaded anything!" unless @loads
+      filename = self.output
 
-    def find_mysqldump_cmd(cmd = nil)
-      begin
-        if(cmd)
-          if(`#{cmd} -V`)
-            cmd
+      time = Benchmark.realtime do
+        self.loads.each_with_index do |l,i|
+          cmd = Cocaine::CommandLine.new("mysqldump",
+            "#{self.credentials} #{l.options} #{l.ignored_tables}#{l.database} #{self.gzip} #{filename}"
+          )
+
+          begin
+              cmd.run
+          rescue Cocaine::ExitStatusError => e
+            e
+          rescue Cocaine::CommandNotFoundError => e
+            raise Dumptruck::MysqlDumpNotFound, "Could not find the `mysqldump` command."
           end
-        else
-          `which mysqldump`.strip
         end
-      rescue SystemCallError
-        raise "Mysqldump is not found!"
       end
+        {time: time, file: "#{File.expand_path(filename)}"}
     end
   end
 end

data/lib/dumptruck/version.rb

@@ -1,3 +1,3 @@
 module Dumptruck
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/spec/spec_helper.rb

@@ -2,3 +2,8 @@ require 'coveralls'
 Coveralls.wear!
 require 'pry'
 require 'dumptruck'
+require 'mocha/api'
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end

data/spec/truck_spec.rb

@@ -2,19 +2,17 @@ require 'spec_helper'
 
 describe Dumptruck::Truck do
   describe '.new' do
-    cmd = `which mysqldump`.strip
-
     let(:dump) { Dumptruck::Truck.new({
-      :username => "drew",
-      :password => "pw",
+      :username => "root",
+      :password => "d33ps0uth@local",
     })}
 
     it 'has a username' do
-      expect(dump.username).to eq("drew")
+      expect(dump.username).to eq("root")
     end
 
     it 'has a password' do
-      expect(dump.password).to eq("pw")
+      expect(dump.password).not_to eq(nil)
     end
 
     it 'has an output directory' do
@@ -25,21 +23,32 @@ describe Dumptruck::Truck do
       expect(dump.filename).not_to eq(nil)
     end
 
-    it 'has a mysqldump executable' do
-      expect(dump.mysqldump_cmd).to eq(cmd)
-      dump.mysqldump_cmd = "/usr/local/bin/mysqldump"
-      expect(dump.mysqldump_cmd).not_to be(nil)
+    it 'raises error if no loads are added to dump' do
+      Cocaine::CommandLine.path = nil
+      begin
+        dump.dump
+      rescue Dumptruck::NothingLoaded => e
+        expect(e.message).to eq "You haven't loaded anything!"
+      end
     end
 
-    it "no mysqldump raises error" do
-      expect{
-        Dumptruck::Truck.new(
-          {:mysqldump_cmd => "/fake/loc/mysqldump"})
-      }.to raise_error("Mysqldump is not found!")
+    it 'no mysqldump raises error' do
+      Cocaine::CommandLine.path = nil
+      dump.load({ database: 'test' })
+      begin
+        dump.dump
+      rescue Dumptruck::MysqlDumpNotFound => e
+        expect(e.message).to eq "Could not find the `mysqldump` command."
+      end
     end
 
     it "creates a Load object" do
       dump.load({database: "test"})
     end
+
+    it 'generates the mysqldump command' do
+    dump.load({database: "test"})
+      expect(dump.command).to eq(["mysqldump -u #{dump.username} --password=#{dump.password} -h localhost -P 3306 --single-transaction --quick test"])
+     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dumptruck
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - delianides
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-nc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wraps the mysqldump command into a ruby library
 email:
 - drew@delianides.com
@@ -139,6 +153,7 @@ files:
 - Rakefile
 - dumptruck.gemspec
 - lib/dumptruck.rb
+- lib/dumptruck/exceptions.rb
 - lib/dumptruck/load.rb
 - lib/dumptruck/truck.rb
 - lib/dumptruck/version.rb