flydata 0.0.4.2 → 0.0.4.3

data/VERSION

@@ -1 +1 @@
-0.0.4.2
+0.0.4.3

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.4.2"
+  s.version = "0.0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2013-06-05"
+  s.date = "2013-06-10"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]

data/lib/flydata/command/base.rb

@@ -53,6 +53,20 @@ module Flydata
         end
         choice
       end
+      def ask_input_table_name
+        input = nil
+        loop do
+          say("Input a table name.")
+          say(">> ")
+          input = gets.strip
+          if input =~ /^[a-zA-Z0-9_]+$/
+            break
+          else
+            puts "Please enter a valid table name."
+          end
+        end
+        input
+      end
     end
   end
 end

data/lib/flydata/command/setup.rb

@@ -8,6 +8,7 @@ module Flydata
            /var/log/messages /var/log/maillog /var/log/mysql/error.log
            /home/*/deploy/shared/log/*.log)
       OTHER = '-- None of above --'
+      ENTER_TABLE_NAME = '-- Create a table on Redshift from your logs --'
 
       # readline settings for asking log path
       Readline.completion_append_character = "/"
@@ -80,7 +81,7 @@ module Flydata
         newline
         # enter the log path
         puts "[Enter a Local Log Path]"
-        puts "Enter the absolute path of your local log that you want to  upload to the '#{table_name}' table on Redshift."
+        puts "Enter the absolute path of your local log that you want to  upload to the '#{table_name} (#{table_name}_dev)' table on Redshift."
         log_path = ask_log_path("Log path (tab:completion, return:cancel) >> ")
         return unless log_path and not log_path.empty?
         newline
@@ -112,7 +113,7 @@ module Flydata
         dev_tables = ret['table_list'].select {|tn| tn.end_with?('_dev')}
 
         if all_tables.size < 1
-          raise "Could not find tables on Redshift. Please create some tables on your Redshift cluster."
+          return ask_enter_table_name
         end
 
         if development?
@@ -140,9 +141,14 @@ module Flydata
           menu_str_list = format_menu_list(menu_list)
           message = " !PRODUCTION MODE!"
         end
+        menu_str_list << ENTER_TABLE_NAME
         menu_str = choose_one("Please select the table on Redshift that you want to use to store your local data. \n#{message}", nil, menu_str_list)
-        if menu_str
+        if menu_str == ENTER_TABLE_NAME
+          ask_enter_table_name
+        elsif menu_str
           menu_str.split.first
+        else
+          nil
         end
       end
 
@@ -304,6 +310,24 @@ module Flydata
         ask_yes_no("Do you want to add another log path?")
       end
 
+      def ask_enter_table_name
+        input = nil
+        loop do
+          say("Enter a table name for Redshift to store your logs. This table will be created automatically.")
+          say(">> ")
+          input = gets.strip
+          if input =~ /^[a-zA-Z0-9_]+$/
+            break
+          else
+            puts "!Please enter the valid table name."
+          end
+        end
+        if development?
+          input = input.gsub(/_dev$/, '')
+        end
+        input
+      end
+
       def ask_log_path(message = nil)
         path = nil
         message = "Enter the absolute path of your log (return to cancel):  " unless message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 258014642818965093
+      hash: 1466505871354072558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: