lynx 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,6 @@
 # Lynx
 
-TODO
+Ruby command line wrapper for MySQL.
 
 ## Installation
 
@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO
+Coming soon...
 
 ## Contributing
 

data/lib/lynx.rb

@@ -4,12 +4,28 @@ require 'lynx/command'
 require 'lynx/pipe'
 require 'lynx/d_s_l'
 
+require 'erb'
+require 'yaml'
+
 module Lynx
   class << self
     def config(options)
       Lynx::DSL.new(options)
     end
 
+    def rails(env = nil)
+      if defined?(Rails)
+        env ||= Rails.env
+        hash = Rails.configuration.database_configuration
+      elsif File.exists?('config/database.yml')
+        hash = YAML::load(ERB.new(IO.read('config/database.yml')).result)
+      else
+        raise RuntimeError, 'unable to find configuration file'
+      end
+
+      config(hash[env.to_s])
+    end
+
     def append(*args)
       Pipe::Append.new(*args)
     end

data/lib/lynx/command/basic.rb

@@ -43,7 +43,7 @@ module Lynx
       instruct(:no_data){ '--no-data' }
       instruct(:skip_triggers){ '--skip-triggers' }
       instruct(:compact){ '--compact' }
-      instruct(:ignore){ |c,table| "--ignore-table=#{table}" }
+      instruct(:ignore){ |c,table| "--ignore-table=#{c.config.database}.#{table}" }
       instruct(:no_create_info){ '--no-create-info' }
 
       def to_s

data/lib/lynx/config.rb

@@ -10,19 +10,23 @@ module Lynx
     end
 
     [:username, :password, :host, :database].each do |method|
-      define_method(method){ @config[method] }
+      define_method(method){ self[method] }
     end
 
     def mysql
-      @mysql ||= @config[:mysql] || detect(MYSQL)
+      @mysql ||= self[:mysql] || detect(MYSQL)
     end
 
     def dump
-      @dump ||= @config[:dump] || detect(DUMP)
+      @dump ||= self[:dump] || detect(DUMP)
     end
 
     private
 
+    def [](key)
+      @config[key.to_sym] || @config[key.to_s]
+    end
+
     def detect(commands)
       commands.detect{ |c| system("which #{c}") }
     end

data/lib/lynx/pipe.rb

@@ -4,3 +4,4 @@ require 'lynx/pipe/write'
 require 'lynx/pipe/get'
 require 'lynx/pipe/debug'
 require 'lynx/pipe/import'
+require 'lynx/pipe/run'

data/lib/lynx/pipe/debug.rb

@@ -3,12 +3,13 @@ require 'lynx/pipe/basic'
 module Lynx
   module Pipe
     class Debug < Basic
-      def initialize(pipe = nil)
+      def initialize(pipe = nil, io = STDOUT)
         @pipe = pipe
+        @io = io
       end
 
       def perform(command)
-        puts "[Lynx] #{command}"
+        @io.puts "[Lynx] #{filter(command)}"
 
         @pipe.perform(command) if has_pipe?
       end
@@ -21,6 +22,10 @@ module Lynx
 
       private
 
+      def filter(command)
+        command.to_s.gsub(/--password=.*?\s/, '--password=[FILTERED]')
+      end
+
       def has_pipe?
         !!@pipe
       end

data/lib/lynx/pipe/run.rb

@@ -4,7 +4,7 @@ module Lynx
   module Pipe
     class Run < Basic
       def perform(command)
-        system(command)
+        system(command.to_s)
       end
     end
   end

data/lib/lynx/version.rb

@@ -1,3 +1,3 @@
 module Lynx
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lynx.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.version       = Lynx::VERSION
   gem.authors       = ["Pan Thomakos"]
   gem.email         = ["pan.thomakos@gmail.com"]
-  gem.description   = %q{MySQL command line wrapper for Ruby.}
-  gem.summary       = %q{MySQL command line wrapper for Ruby.}
-  gem.homepage      = ""
+  gem.description   = %q{Ruby command line wrapper for MySQL.}
+  gem.summary       = %q{Ruby command line wrapper for MySQL.}
+  gem.homepage      = "https://www.github.com/panthomakos/lynx"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/lib/lynx/config_test.rb

@@ -16,6 +16,10 @@ describe Lynx::Config do
     end
   end
 
+  it 'recognizes string parameters' do
+    assert_equal 'lqsym', Lynx::Config.new('mysql' => 'lqsym').mysql
+  end
+
   it 'knows the dump command' do
     Kernel.stub(:system, true) do
       assert_equal 'mysqldump', config.dump

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lynx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,7 +27,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: MySQL command line wrapper for Ruby.
+description: Ruby command line wrapper for MySQL.
 email:
 - pan.thomakos@gmail.com
 executables: []
@@ -62,7 +62,7 @@ files:
 - test/lib/lynx/pipe/append_test.rb
 - test/lib/lynx/pipe/get_test.rb
 - test/lib/lynx/pipe/write_test.rb
-homepage: ''
+homepage: https://www.github.com/panthomakos/lynx
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -85,7 +85,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: MySQL command line wrapper for Ruby.
+summary: Ruby command line wrapper for MySQL.
 test_files:
 - test/lib/lynx/command/basic_test.rb
 - test/lib/lynx/command/dump_test.rb