lynx 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f5f66d6e860d5b4507ca96b0389150261aa7a8
-  data.tar.gz: 084f1d6ca4667f218a3f1b8c6ff44536beb19f34
+  metadata.gz: bb25acb5e2f9862705f64406d8331573cf85265f
+  data.tar.gz: 96659f856db07bfede52db5a010d7d8ab1e4229b
 SHA512:
-  metadata.gz: b6c9c0c0188d2974d8687e6d0fea4c1ed6d23ad55f1c677fd847cc62f4f87e37a1b5efd290a8dd5f7c606d5a32b90f794c94fa62389283b055df74c46082a28e
-  data.tar.gz: cae0c92870352a87ccb5b1a5f553fe8aacd5264f075563b8ea07cdba96c93fe6972b47309628cb91e18d25fee5bd02ec9af3c640ac9d1f1cb96338e56f4ebd0d
+  metadata.gz: 3f355457fd19658583ae6aa91d514ea7a0b8141dbbdd5561091fbcb164fd7820e699fbf2ec60a4f2b3bba174f8dc9fd844fd783b5d957f2ad05488aeae0a99b0
+  data.tar.gz: be365cd897648d469625ea40c0af6f478f30da1732142c7603acc635c19cf5ef6863e1148d5fede7c417484b671d411de3627da9a1041220757685ac538e41eb

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 script: "bundle exec rake"
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.8
-  - 2.2.5
-  - 2.3.1
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5

data/CHANGES.md

@@ -1,5 +1,11 @@
 # master (unreleased)
 
+# 1.0.0
+
+* Removed `--password` support. (sshistrava)
+* Added config file support. (sshistrava)
+* Added `Lynx::Error` for failed commands. (sshistrava)
+
 # 0.4.0
 
 * Added `#option` method to commands for custom options. (panthomakos)

data/lib/lynx/command/basic.rb

@@ -10,7 +10,6 @@ module Lynx
         def instruct(method, &block)
           define_method(method) do |*args|
             @command << block.call(self,*args)
-
             self
           end
         end
@@ -28,8 +27,8 @@ module Lynx
       end
 
       def authorize
+        @command << "--defaults-extra-file=#{config.credentials}" if config.credentials
         @command << "--user=#{config.username}" if config.username
-        @command << "--password=#{config.password}" if config.password
         @command << "--host=#{config.host}" if config.host
         @command << "--socket=#{config.socket}" if config.socket
 

data/lib/lynx/command/dump.rb

@@ -14,6 +14,7 @@ module Lynx
 
       instruct(:where){ |c,condition| "--where='#{condition}'" }
       instruct(:complete_insert){ '--complete-insert' }
+      instruct(:skip_triggers){ '--skip-triggers' }
 
       def with_database
         @database = @config.database

data/lib/lynx/config.rb

@@ -9,16 +9,16 @@ module Lynx
       @config = config
     end
 
-    [:username, :password, :host, :database, :socket].each do |method|
+    [:credentials, :username, :host, :database, :socket].each do |method|
       define_method(method){ self[method] }
     end
 
     def mysql
-      @mysql ||= self[:mysql] || detect(MYSQL)
+      @mysql ||= self[:mysql] || detect(MYSQL) || raise(Lynx::Error, 'Failed to detect a valid version of mysql')
     end
 
     def dump
-      @dump ||= self[:dump] || detect(DUMP)
+      @dump ||= self[:dump] || detect(DUMP) || raise(Lynx::Error, 'Failed to detect a valid version of mysqldump')
     end
 
     private
@@ -26,9 +26,8 @@ module Lynx
     def [](key)
       @config[key.to_sym] || @config[key.to_s]
     end
-
     def detect(commands)
-      commands.detect{ |c| system("which #{c}") }
+      commands.detect{ |c| system("which #{c} >/dev/null") }
     end
   end
 end

data/lib/lynx/error.rb

@@ -0,0 +1,3 @@
+module Lynx
+  class Error < StandardError; end
+end

data/lib/lynx/pipe/append.rb

@@ -1,4 +1,5 @@
 require 'lynx/pipe/basic'
+require 'lynx/system_out'
 
 module Lynx
   module Pipe
@@ -8,12 +9,11 @@ module Lynx
       end
 
       def perform(command)
-        system("#{command} >> #{@file}")
+        SystemOut.run("#{command} >> #{@file}")
       end
 
       def clear
-        system("rm -rf #{@file}")
-
+        SystemOut.run("rm -rf #{@file}")
         self
       end
     end

data/lib/lynx/pipe/import.rb

@@ -1,4 +1,5 @@
 require 'lynx/pipe/basic'
+require 'lynx/system_out'
 
 module Lynx
   module Pipe
@@ -8,7 +9,7 @@ module Lynx
       end
 
       def perform(command)
-        system("cat #{@file} | #{command}")
+        SystemOut.run("cat #{@file} | #{command}")
       end
     end
   end

data/lib/lynx/pipe/run.rb

@@ -1,10 +1,11 @@
 require 'lynx/pipe/basic'
+require 'lynx/system_out'
 
 module Lynx
   module Pipe
     class Run < Basic
       def perform(command)
-        system(command.to_s)
+        SystemOut.run(command.to_s)
       end
     end
   end

data/lib/lynx/pipe/write.rb

@@ -1,4 +1,5 @@
 require 'lynx/pipe/basic'
+require 'lynx/system_out'
 
 module Lynx
   module Pipe
@@ -8,12 +9,11 @@ module Lynx
       end
 
       def perform(command)
-        system("#{command} > #{@file}")
+        SystemOut.run("#{command} > #{@file}")
       end
 
       def clear
-        system("rm -rf #{@file}")
-
+        SystemOut.run("rm -rf #{@file}")
         self
       end
     end

data/lib/lynx/system_out.rb

@@ -0,0 +1,14 @@
+require 'open3'
+require 'lynx/error'
+
+module Lynx
+  module SystemOut
+    def self.run(command)
+      stdout, stderr, status = Open3.capture3(command)
+      unless status.success?
+        raise(Lynx::Error, "Failed to perform: #{command} \n STDERR: #{stderr}")
+      end
+      stdout
+    end
+  end
+end

data/lib/lynx/version.rb

@@ -1,3 +1,3 @@
 module Lynx
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

data/test/lib/lynx/command/basic_test.rb

@@ -38,12 +38,6 @@ describe Lynx::Command::Basic do
     end
   end
 
-  def test_authorize_with_password
-    @command.config.stub(:password, 'bar') do
-      assert_equal 'mysql --password=bar', @command.mysql.authorize.to_s
-    end
-  end
-
   def test_authorize_with_host
     @command.config.stub(:host, 'local') do
       assert_equal 'mysql --host=local', @command.mysql.authorize.to_s

data/test/lib/lynx/config_test.rb

@@ -5,8 +5,8 @@ describe Lynx::Config do
   def config
     @config ||= Lynx::Config.new(
       database: 'lynx',
+      credentials: '/foobar.cnf',
       username: 'name',
-      password: 'pass',
       host: 'localhost',
       socket: '/foo/bar')
   end
@@ -31,6 +31,10 @@ describe Lynx::Config do
     assert_equal 'lynx', config.database
   end
 
+  it 'knows the credentials' do
+    assert_equal '/foobar.cnf', config.credentials
+  end
+
   it 'knows the username' do
     assert_equal 'name', config.username
   end
@@ -39,10 +43,6 @@ describe Lynx::Config do
     assert_equal '/foo/bar', config.socket
   end
 
-  it 'knows the password' do
-    assert_equal 'pass', config.password
-  end
-
   it 'knows the host' do
     assert_equal 'localhost', config.host
   end

data/test/lib/lynx/system_out_test.rb

@@ -0,0 +1,38 @@
+require 'minitest/autorun'
+require 'lynx/system_out'
+require 'lynx/error'
+require 'open3'
+
+describe Lynx::SystemOut do
+
+  def setup
+    @command = 'command'
+    @stdout = 'stdout'
+    @stderr = 'stderr'
+  end
+
+  it 'should return standard out if command is a success' do
+    mock_process = Minitest::Mock.new
+    def mock_process.success?
+      true
+    end
+
+    Open3.stub(:capture3, [@stdout, @stderr, mock_process]) do
+      assert_equal(@stdout, Lynx::SystemOut.run(@command))
+    end
+  end
+
+  it 'should raise a Lynx::Error if command is not a success' do
+    mock_process = Minitest::Mock.new
+    def mock_process.success?
+      false
+    end
+
+    Open3.stub(:capture3, [@stdout, @stderr, mock_process]) do
+      err = assert_raises Lynx::Error do
+        Lynx::SystemOut.run(@command)
+      end
+      assert_match"Failed to perform: #{@command} \n STDERR: #{@stderr}", err.message
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lynx
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -58,6 +58,7 @@ files:
 - lib/lynx/command/dump.rb
 - lib/lynx/config.rb
 - lib/lynx/d_s_l.rb
+- lib/lynx/error.rb
 - lib/lynx/pipe.rb
 - lib/lynx/pipe/append.rb
 - lib/lynx/pipe/basic.rb
@@ -67,6 +68,7 @@ files:
 - lib/lynx/pipe/p_open.rb
 - lib/lynx/pipe/run.rb
 - lib/lynx/pipe/write.rb
+- lib/lynx/system_out.rb
 - lib/lynx/version.rb
 - lynx.gemspec
 - test/lib/lynx/command/basic_test.rb
@@ -77,6 +79,7 @@ files:
 - test/lib/lynx/pipe/get_test.rb
 - test/lib/lynx/pipe/p_open_test.rb
 - test/lib/lynx/pipe/write_test.rb
+- test/lib/lynx/system_out_test.rb
 homepage: https://www.github.com/panthomakos/lynx
 licenses: []
 metadata: {}
@@ -96,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby command line wrapper for MySQL.
@@ -109,4 +112,5 @@ test_files:
 - test/lib/lynx/pipe/get_test.rb
 - test/lib/lynx/pipe/p_open_test.rb
 - test/lib/lynx/pipe/write_test.rb
+- test/lib/lynx/system_out_test.rb
 has_rdoc: