lynx 0.1.0 → 0.2.0

data/lib/lynx/command/basic.rb

@@ -31,7 +31,7 @@ module Lynx
 
       instruct(:mysql){ |c| c.config.mysql }
       instruct(:dump){ |c| c.config.dump }
-      instruct(:with_database){ |c| c.config.database }
+      instruct(:with_database){ |c| "--database=#{c.config.database}" }
       instruct(:sql){ |c, sql| "--execute='#{sql}'" }
       instruct(:batch){ '--batch' }
       instruct(:no_names){ '--skip-column-names' }

data/lib/lynx/command/dump.rb

@@ -6,25 +6,29 @@ module Lynx
       def initialize(*args)
         super(*args)
 
+        @database = '--all-databases'
+        @tables = []
+
         dump
       end
 
       instruct(:where){ |c,condition| "--where='#{condition}'" }
-      instruct(:with_database){ |c| c.database(c.config.database) }
 
-      def database(*args)
-        @command << '--databases' unless args.empty?
-        @command += args
+      def with_database
+        @database = @config.database
 
         self
       end
 
       def table(*args)
-        @command << '--tables' unless args.empty?
-        @command += args
+        @tables += args
 
         self
       end
+
+      def to_s
+        "#{super} #{@database} #{@tables.join(' ')}"
+      end
     end
   end
 end

data/lib/lynx/version.rb

@@ -1,3 +1,3 @@
 module Lynx
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

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

@@ -19,7 +19,7 @@ describe Lynx::Command::Basic do
   end
 
   def test_with_database
-    assert_equal 'mysql foo', @command.mysql.with_database.to_s
+    assert_equal 'mysql --database=foo', @command.mysql.with_database.to_s
   end
 
   def test_batch

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

@@ -8,13 +8,10 @@ describe Lynx::Command::Dump do
   end
 
   def test_command
+    @command.with_database
     @command.table('bar')
     @command.where('1=1')
 
-    assert_equal "dump --tables bar --where='1=1'", @command.to_s
-  end
-
-  def test_with_database
-    assert_equal "dump --databases foo", @command.with_database.to_s
+    assert_equal "dump --where='1=1' foo bar", @command.to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lynx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest