icebox 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/icebox

@@ -5,10 +5,33 @@ require 'optparse'
 require 'icebox'
 
 opts = OptionParser.new do |opts|
-  opts.banner = "Icebox: Multitool for Infobright Community Edition"
+  opts.banner = "
+    Icebox: Multitool for Infobright Community Edition
+    --------------------------------------------------
+    Usage:
+      #{File.basename(__FILE__)} create_table_as <database> <table> <select_query>
+      #{File.basename(__FILE__)} insert_into <database> <table> <select_query>
+      #{File.basename(__FILE__)} load_data_infile <database> <table> <csv_file>
+      #{File.basename(__FILE__)} [-h|-?|--help]
+  "
   opts.on_tail("-h", "-?", "--help", "Show this message") do
     puts opts
     exit
   end
 end
 opts.parse!
+
+subcommand = ARGV.shift
+case subcommand
+when 'create_table_as'
+  db = ARGV.shift
+  Icebox.new(database: db).create_table_as *ARGV
+when 'insert_into'
+  db = ARGV.shift
+  Icebox.new(database: db).insert_into *ARGV
+when 'load_data_infile'
+  db = ARGV.shift
+  Icebox.new(database: db).insert_into *ARGV
+else
+  puts opts
+end

data/icebox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{icebox}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Riley Goodside"]
-  s.date = %q{2011-10-25}
+  s.date = %q{2011-10-26}
   s.default_executable = %q{icebox}
   s.description = %q{Ruby library and command-line utility for working with Infobright Community Edition}
   s.email = %q{riley.goodside@gmail.com}

data/lib/icebox.rb

@@ -9,20 +9,22 @@ module Icebox
   class Icebox
     attr_accessor :db
 
-    def initialize(db = nil)
+    def initialize(db_or_options = {})
       # Icebox is configurable using a YAML file in /etc/icebox.conf
       # The root-level key :connections should be an array of option sets to be
       # passed to the Sequel#mysql method. Right now, only the first is used.
 
-      @db = db
-      if @db.nil?
+      if db_or_options.class == Hash
         begin
-          opts = YAML.load(File.open("/etc/icebox.conf"))[:connections][0]
+          defaults = YAML.load(File.open("/etc/icebox.conf"))[:connections][0]
         rescue 
-          opts = {database: 'test', socket: '/tmp/mysql-ib.sock'}
+          defaults = {database: 'test', socket: '/tmp/mysql-ib.sock'}
         end
-        @db = Sequel.mysql(opts)
+        @db = Sequel.mysql(defaults.merge(db_or_options))
+      else
+        @db = db_or_options
       end
+      raise "Initialization of Icebox object failed" unless @db
     end
 
     def load_data_infile(table, path=nil, opts={})
@@ -54,7 +56,7 @@ module Icebox
 
     def insert_into(table, sql)
       pipe = "/tmp/icebox_pipe_for_#{table}"
-      sql.sub! /\s*;\s*/, ''  # Chop off semicolon if present
+      sql = sql.sub /\s*;\s*/, ''  # Chop off semicolon if present
 
       # Simultaneously export and re-import CSV through FIFO pipe:
       @db.disconnect  # Needed for fork; Reconnects automatically
@@ -81,7 +83,6 @@ module Icebox
         "#{col[0]} #{col[1][:db_type]}"
       end.join(',')
       @db << "CREATE TABLE #{table} (#{fields_definition})"
-
       insert_into table, "SELECT * FROM #{view}"
       @db.drop_view view
     end

data/test/test_icebox.rb

@@ -48,36 +48,16 @@ class TestIcebox < Test::Unit::TestCase
       assert_equal BigDecimal.new("8675309.8675309"), t.order(:dc.desc).get(:dc)
     end
 
-    should "append loaded CSV data to an existing table" do
+    should "append data either from CSV or from SELECT query" do
       @box.load_data_infile 'test_table', '/tmp/test_table.csv'
       count_1 = @db[:test_table].count
-      @box.load_data_infile 'test_table', '/tmp/test_table.csv'
-      count_2 = @db[:test_table].count
-
-      assert_equal 3, count_1
-      assert_equal 6, count_2
-    end
 
-    should "append a query result onto existing data via #insert_into" do
-      @box.load_data_infile 'test_table', '/tmp/test_table.csv'
-      count_1 = @db[:test_table].count
+      @box.insert_into 'test_table', 'SELECT * FROM test_table'
       @box.insert_into 'test_table', 'SELECT * FROM test_table'
       count_2 = @db[:test_table].count
 
       assert_equal 3, count_1
-      assert_equal 6, count_2
-    end
-
-    should "not have race conditions when #insert_into is called rapidly" do
-      @box.load_data_infile 'test_table', '/tmp/test_table.csv'
-      count_1 = @db[:test_table].count
-      5.times do
-        @box.insert_into 'test_table', 'SELECT * FROM test_table'
-      end
-      count_2 = @db[:test_table].count
-
-      assert_equal 3, count_1
-      assert_equal 3 * (2**5), count_2
+      assert_equal 12, count_2
     end
 
     teardown do

metadata

@@ -2,7 +2,7 @@
 name: icebox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Riley Goodside
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 -04:00
+date: 2011-10-26 00:00:00 -04:00
 default_executable: icebox
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -170128870566158022
+      hash: 1669429252515157681
       segments: 
       - 0
       version: "0"