hivonic 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 112f99bf5bad93212b9df62d83aa3cb391e3b829
-  data.tar.gz: c51924364c0aec4fb6017adf178401186eea2313
+  metadata.gz: 15830f42fedc4df4e21533db43f475daf06fd565
+  data.tar.gz: 6d058be4e343b6b917f8d015087d00a052064de9
 SHA512:
-  metadata.gz: f58108d633fb37ac0854ce8af25a30aab6e1057318a66d62f3e56efc7841481f86febc1587d0edc386e8451d162eea918d257ba1c1ae8d8fb635aaa36000003c
-  data.tar.gz: 634b563745de787f9244e43425c46a35d58b7d355026e3a3516c33b88b5d4f33f287462f09421ec441cac0dead56284c8899f0e633ea9ca7880c895a1253b46e
+  metadata.gz: 89c55470ee78cbacafb6746e67c1d55afe21539c68150b263e1ce097ec7b8bedeeeb2073c127337665d4ddf4599cc7e3986f63ce34c86b347ac5e4128d7bde5e
+  data.tar.gz: 77424c5772365a789a3aee119fb11c0642b78f65ff71569df593e11027f9704563528b00cc5441e484aae7640b7dd00d7480c8bf3590c4d29107f27002dbc0d2

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Hivonic Changelog
 ===
 
+0.3.0
+---
+* Now cleans up views in addition to tables
+* Tweaked HIVONIC_REGEXP default so it is a little less opinionated
+* Fixed cleanup, so it no longer calls build_query repeatedly (also a performance improvement)
+
+0.2.2
+---
+* Fixed issue with mock() instance that represents output from the subcommand in tests
+
 0.2.1
 ---
 * Tweaked HIVONIC_REGEXP env var's default value

data/bin/hivonic

@@ -15,7 +15,7 @@ program_desc 'A simple hive utility application for cleaning up temporary tables
 # arg_name 'database'
 
 hive_opts         = ENV['HIVONIC_HIVE_OPTS']        || '-S' # -hiveconf hive.root.logger=DEBUG -S
-regexp            = ENV['HIVONIC_REGEXP']           || '\A(tmp|view)[a-z|_|0-9]+_(\d{14})\z'
+regexp            = ENV['HIVONIC_REGEXP']           || '\A(tmp)[a-z|_|0-9]+_(\d{14})\z'
 time_format       = ENV['HIVONIC_TIME_FORMAT']      || '%Y%m%d%H%M%S'
 time_group_index  = ENV['HIVONIC_TIME_GROUP_INDEX'] || 2
 ttl               = ENV['HIVONIC_TTL']              || 86400
@@ -54,9 +54,17 @@ command :rm do |c|
 end
 
 command :cleanup do |c|
+  c.flag [:type], :default_value => 'tables'
   c.action do |global_options, options, args|
     database_check!(args)
-    Hivonic::Commands.run 'cleanup_tables', global_options, args
+    case options[:type]
+    when 'tables'
+      Hivonic::Commands.run 'cleanup_tables', global_options, args
+    when 'views'
+      Hivonic::Commands.run 'cleanup_views', global_options, args
+    else
+      exit_now!('Unknown type for cleanup command')
+    end
   end
 end
 

data/lib/hivonic/commands.rb

@@ -73,6 +73,7 @@ module Hivonic::Commands
         stdout      = "DRY RUN: Subcommand => #{subcommand}"
         @exitstatus = 0
       else
+        puts "Running: Subcommand => #{subcommand}"
         stdout      = `#{subcommand}`
         @exitstatus = $?.exitstatus
       end
@@ -155,13 +156,26 @@ module Hivonic::Commands
     end
 
     def query
-      @query = "DROP TABLE #{self.db}.#{self.table};"
+      @query = "DROP TABLE IF EXISTS #{self.db}.#{self.table};"
+    end
+  end
+
+  class DropView < HiveQueryCommand
+    attr_reader :view
+
+    def initialize(opts, args)
+      super
+      @view = args[1]
+    end
+
+    def query
+      @query = "DROP VIEW IF EXISTS #{self.db}.#{self.view};"
     end
   end
 
   register_handler_for :drop_table
 
-  class CleanupTables < HiveQueryCommand
+  class CleanupQueryCommand < HiveQueryCommand
     def list_tables
       opts                     = {}
       opts['regexp']           = self.regexp
@@ -172,6 +186,7 @@ module Hivonic::Commands
 
       output, status = ListTables.run opts, [self.db]
       raise 'Uh oh!' unless is_successful? status
+      puts "Expired Tables: \n#{output}\n"
       output.split(/\n/)
     end
 
@@ -181,6 +196,10 @@ module Hivonic::Commands
       end
     end
 
+    def drop_query_for(table, opts)
+      raise NotImplementedError.new 'You must implement drop_query_for method on subclass'
+    end
+
     def build_query
       tables = list_tables
 
@@ -188,12 +207,12 @@ module Hivonic::Commands
         opts           = {}
         opts['regexp'] = self.regexp
 
-        DropTable.new(opts, [self.db, table]).query
+        drop_query_for table, opts
       end.join(' ')
     end
 
     def query
-      @query = build_query
+      @query ||= build_query
     end
 
     def subcommand
@@ -206,5 +225,19 @@ module Hivonic::Commands
     end
   end
 
+  class CleanupTables < CleanupQueryCommand
+    def drop_query_for(table, opts)
+      DropTable.new(opts, [self.db, table]).query
+    end
+  end
+
   register_handler_for :cleanup_tables
+
+  class CleanupViews < CleanupQueryCommand
+    def drop_query_for(table, opts)
+      DropView.new(opts, [self.db, table]).query
+    end
+  end
+
+  register_handler_for :cleanup_views
 end

data/lib/hivonic/version.rb

@@ -1,3 +1,3 @@
 module Hivonic
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/test/unit/commands_test.rb

@@ -6,6 +6,7 @@ class Hivonic::CommandsTest < Test::Unit::TestCase
       should 'pass opts and args to #run method of the handler' do
         Hivonic::Commands.expects(:handler_for).with(cmd = mock()).returns(handler = mock())
         handler.expects(:run).with(opts = mock(), args = mock()).returns([output = mock(), exitstatus = mock()])
+        output.expects(:empty?).returns(false)
         assert_equal exitstatus, Hivonic::Commands.run(cmd, opts, args)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hivonic
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Will Drew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli