dbplot 0.0.1 → 0.0.2

data/README.textile

@@ -6,12 +6,43 @@ h2. Installation
 
 <pre><code>sudo gem install dbplot</code></pre>
 
-h2. Example
+h2. Usage
 
-<pre><code>dbplot -d dbplot -u joe -p password -q "plot yvar vs xvar from tablename"</code></pre>
+<pre>
+Usage: dbplot [options]
+      --help                       This message
+  -v, --verbose                    Run verbosely
+  -h, --host HOST                  MySQL Host
+  -u, --user USER                  MySQL User
+  -p, --password PASSWORD          MySQL Password
+  -d, --database DATABASE          MySQL Database
+  -q, --query QUERY                dbplot query
+      --version                    Print version info and exit
+      --dry-run                    Print but do not execute. Implies -v.
+</pre>
+
+h3. Non-interactive
+
+<pre><code>dbplot -d database -u username -p password -q "plot yvar vs xvar from tablename"</code></pre>
 
 This would generate and execute a MySQL query (@select yvar, xvar from tablename@), pass it to R, and use ggplot2 to generate the appropriate plot (@qplot(xvar, yvar, data=data.from.mysql)@) and save it to a pdf (by default, out.pdf).
 
+h3. Interactive
+
+If you skip the @-q@ flag, you'll land on a dbplot prompt, which lets you execute multiple dbplot commands.
+dbplot commands can be multiple lines and will not evaluate until a line ends with a semicolon (much like the mysql command).
+Type "exit" or "quit" to get out.
+
+h2. Syntax
+
+<pre><code>
+PLOT y_variable [AS y_variable_alias] VS x_variable [AS x_variable_alias] FROM table_name
+  [COLOR BY color_variable [AS color_variable_alias]]
+  [FACET BY facet_variable [AS facet_variable_alias]]
+  [INTO output_filename.pdf]
+</code></pre>
+
+
 h2. Project Goals:
 
 Support as much of common interactions between a database and ggplot2, including joins, faceting, grouping, coloring, summarization, different geoms, etc.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/dbplot

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
- 
+
+$:.unshift(File.instance_eval { expand_path(join(dirname(__FILE__), '..', "lib")) })
+
 require 'dbplot'
 require 'dbplot/runner'
  

data/dbplot.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbplot}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacob Rothstein"]

data/lib/dbplot.rb

@@ -38,7 +38,7 @@ class DbPlot
       
       con <- dbConnect(MySQL(), user="#{settings[:username]}",
           password="#{settings[:password]}", dbname="#{settings[:database]}",
-          host="localhost");
+          host="#{settings[:host]}");
         
         data <- dbGetQuery(con, "#{@query}")
         
@@ -57,11 +57,11 @@ class DbPlot
   def parse
     name_regex = /[a-z_]+/
     
-    if string =~ /plot (#{name_regex})(?: as (#{name_regex}))? vs (#{name_regex})(?: as (#{name_regex}))? from (#{name_regex})(?: into ([a-z._]+))?/i
-      @ordinate, @ordinate_alias, @abscissa, @abscissa_alias, @table, @file = $1, $2, $3, $4, $5, $6
-
-      @file ||= "out.pdf"
+    if string =~ /plot (#{name_regex})(?: as (#{name_regex}))? vs (#{name_regex})(?: as (#{name_regex}))? from (#{name_regex})/i
+      @ordinate, @ordinate_alias, @abscissa, @abscissa_alias, @table = $1, $2, $3, $4, $5
 
+      @file = "out.pdf"
+      
       @needed_columns = {@ordinate => @ordinate_alias, @abscissa => @abscissa_alias}
       
       @qplot = [
@@ -69,10 +69,25 @@ class DbPlot
         @ordinate_alias || @ordinate
       ]
       
+      if string =~ /into ([a-z._]+.pdf)/
+        @file = $1
+      end
+      
       if string =~ /color by (#{name_regex})(?: as (#{name_regex}))?/i
         @needed_columns[$1] = $2
         @qplot << "colour = #{$2 || $1}"
       end
+      
+      if string =~ /facet by (#{name_regex})(?: as (#{name_regex}))?(?: vs (#{name_regex})(?: as (#{name_regex}))?)?/i
+        @needed_columns[$1] = $2
+        if $3
+          @needed_columns[$3] = $4
+          @qplot << "facets = #{$2 || $1}~#{$4 || $3}"
+        else
+          @qplot << "facets = ~#{$2 || $1}"
+        end
+      end
+      
     else
       puts "\ncould not parse: \"#{string}\"\n\n"
       @string = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbplot
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jacob Rothstein