flydata 0.0.3.8 → 0.0.4.0

data/VERSION

@@ -1 +1 @@
-0.0.3.8
+0.0.4.0

data/flydata.gemspec

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

data/lib/flydata/api/data_port.rb

@@ -10,6 +10,10 @@ module Flydata
         # currently one user has one data port
         self.list.first
       end
+      def redshift_table_list
+        url_path = "#{@url_path}/redshift_table_list"
+        @client.get(url_path)
+      end
     end
   end
 end

data/lib/flydata/cli.rb

@@ -19,7 +19,10 @@ module Flydata
         #raise e
         puts "! #{e.to_s}"
         puts
+        puts
+        puts '-' * 64
         print_usage
+        puts '-' * 64
       end
     end
 
@@ -43,7 +46,6 @@ please setup flydata again by following commands.
 
 You can check the logs of sender(flydata) process.
    Log path: ~/.flydata/flydata.log
-
       EOM
     end
   end

data/lib/flydata/command/base.rb

@@ -22,9 +22,14 @@ module Flydata
 
       # print console
       def newline; puts end
-      def ask_yes_no(message)
+      def separator(str="=")
+        puts str * 64
+      end
+      def ask_yes_no(message, default_yes=true)
+        suffix = default_yes ? "(Y/n)" : "(y/n)"
         loop do
-          ans = ask("#{message} (yes/no):  ")
+          ans = ask("#{message} #{suffix}:  ")
+          return true if default_yes and ans == ''
           if ans.size > 0
             case ans[0].downcase
             when 'y'; return true
@@ -35,6 +40,18 @@ module Flydata
           newline
         end
       end
+      def choose_one(message, prompt, menu_list, value_list=[])
+        choice = nil
+        value_list = menu_list unless menu_list.size == value_list.size
+        say(message) if message
+        choose do |menu|
+          menu.index = :number
+          menu.index_suffix = ") "
+          menu.prompt = prompt ? prompt : ">> "
+          menu.choices(*menu_list) {|item| choice = value_list[menu_list.index(item)]}
+        end
+        choice
+      end
     end
   end
 end

data/lib/flydata/command/setup.rb

@@ -15,9 +15,94 @@ module Flydata
       end
 
       def run
-        #login
         Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
+        ret = _run
+        Flydata::Command::Sender.new.restart if ret
+      end
+
+      private
+      def _run
+        ret = nil
+        #ask redshift
+        case ask_data_entry_type
+        when :redshift
+          ret = start_redshift_mode
+        else
+          ret = start_s3_backup_mode
+        end
+        ret
+      end
+      def ask_data_entry_type
+        choose_one('Please select a setup type', nil,
+                   ["Redshift and S3 Backup", "S3 Buckup only"],
+                   [:redshift, :s3backup])
+      end
+
+      #### redshift buckup mode
+      def start_redshift_mode
+        newline
+        shown = show_registered_entries('RedshiftFileDataEntry') do |de|
+          say(" - #{de['display_name']}: \t#{de['log_path']} -> #{de['redshift_table_name']}")
+        end
+        newline
+        ask_adding_new_redshift
+      end
+
+      def ask_adding_new_redshift
+        puts "Start to register a new entry."
+        newline
+        # select table on redshift
+        puts "[Select a Table Name on Redshift]"
+        table_name = ask_redshift_table_name
+        return unless table_name
+        newline
+        # enter the log path
+        puts "[Enter a Local Log Path]"
+        puts "Enter the absolute path of your local log for uploading to '#{table_name}' table on Redshift."
+        log_path = ask_log_path("Log path (tab:completion, return:cancel) >> ")
+        return unless log_path and not log_path.empty?
+        newline
+        # select the log type
+        puts "[Select a Log Format]"
+        log_file_type = choose_log_file_type(log_path)
+        # confirm and save
+        newline
+        puts "[Confirm]"
+        separator
+        puts " table(redshift) -> #{table_name}"
+        puts " local log path -> #{log_path}"
+        puts " log file format -> #{log_file_type}"
+        separator
+        return unless ask_yes_no("Register a new entry?", true)
+        create_redshift_log_entry(log_path, log_file_type, table_name)
+      end
+
+      def choose_log_file_type(target_path)
+        choose_one("Please select your log file format of (#{target_path})", nil,
+                   %w(csv tsv json))
+      end
+
+      def ask_redshift_table_name
+        ret = flydata.data_port.redshift_table_list
+        if ret['table_list'].size < 1
+          raise "Could not find tables on Redshift. Please create tables on your Redshift cluster."
+        end
+        choose_one("Please select the table name on Redshift to store your local data.", nil, ret['table_list'])
+      end
+
+      def create_redshift_log_entry(log_path, log_file_type, redshift_table_name)
+        data_port = flydata.data_port.get
+        flydata.data_entry.create(
+          data_port_id: data_port['id'],
+          log_path: log_path,
+          log_file_type: log_file_type,
+          redshift_table_name: redshift_table_name)
+        say("Process added successfuly!")
+        return true
+      end
 
+      #### s3 buckup mode
+      def start_s3_backup_mode
         # choose entries
         unless (shown = show_registered_entries)
           list = build_recommended_entries
@@ -32,25 +117,30 @@ module Flydata
             newline
           end while more_entry?
         end
-
-        # start client process
-        Flydata::Command::Sender.new.restart
+        return true
       end
 
-      private
-      def show_registered_entries
+      def show_registered_entries(type='FileDataEntry', &block)
         data_entries = retrieve_data_entries
         @last_fetched_entries = data_entries
+        data_entries = data_entries.select {|de| de['type'] == type}
         if data_entries and data_entries.size > 0
-          puts('Registered entries. ')
+          puts('Registered entries on FlyData. ')
+          separator
           data_entries.each { |data_entry|
-            say(" - #{data_entry['display_name']}\t#{data_entry['log_path']}")
+            if block_given?
+              yield data_entry
+            else
+              say(" - #{data_entry['display_name']}\t#{data_entry['log_path']}")
+            end
           }
+          separator
           true
         else
           false
         end
       end
+
       def choose_log_path_from_examples
         candidates = (`ls #{LOG_PATH_EXAMPLES.join(' ')} 2>/dev/null`).split(/\s+/)
         candidates = candidates.find_all{|path| File.readable?(path)}
@@ -71,22 +161,12 @@ module Flydata
         newline
         choice
       end
-      def ask_log_path
-        path = nil
-        loop do
-          path = Readline.readline("Enter the absolute path of your log (return to cancel):  ")
-          return if path.empty?
-          if not (FileTest.file?(path) and FileTest.readable?(path))
-            say(" ! #{path} is not a readable file!")
-          elsif @last_fetched_entries and @last_fetched_entries.any?{|e| e['log_path'] == path}
-            say(" ! #{path} has been registered already.")
-          else
-            break
-          end
-          newline
-        end
+
+      def ask_and_create_data_entry
+        path = ask_log_path
         create_log_entry(path)
       end
+
       def build_recommended_entries
         path_options=[]
         Dir['/var/log*/**/*log'].each{|f| if (FileTest.file?(f) and
@@ -96,6 +176,7 @@ module Flydata
                                         then path_options << f end}
         path_options
       end
+
       def print_recommended(list, options=false)
         newline
         puts " Recommended list:"
@@ -107,12 +188,14 @@ module Flydata
         end
         newline
       end
+
       def register_all(list)
         list.each{ |item|
           create_log_entry(item)
         }
         list.reject!{|x| x}
       end
+
       def choose_log_selection(list)
         path = nil
         list = build_recommended_entries unless list
@@ -120,14 +203,14 @@ module Flydata
 
         loop do
           if path_options.empty?
-            ask_log_path
+            ask_and_create_data_entry
             return
           end
           print_recommended(path_options, true)
           choice = Readline.readline("Here are some common logs, enter the number next to the logs to add the log. Input nothing to cancel.")
           return if choice.empty?
           if choice.to_i==path_options.length+1
-            ask_log_path
+            ask_and_create_data_entry
             return
           elsif (path_options[choice.to_i-1] != nil )
             path = path_options[choice.to_i-1]
@@ -139,6 +222,7 @@ module Flydata
         end
         create_log_entry(path)
       end
+
       def ask_log_deletion(path)
         unless File.writable?(path)
           say("Skip log deletion setting...")
@@ -153,14 +237,34 @@ module Flydata
         say("For more details - http://docs.hapyrus.com/faq/how-log-deletion-works/")
         ask_yes_no("Set auto log deletion mode?")
       end
+
       def create_log_entry(path, log_deletion=false)
         data_port = flydata.data_port.get
         flydata.data_entry.create(data_port_id: data_port['id'], log_path: path, log_deletion: log_deletion)
         say("Process added successfuly!") if flydata.response.code == 200
       end
+
       def more_entry?
         ask_yes_no("Do you want to add another log path?")
       end
+
+      def ask_log_path(message = nil)
+        path = nil
+        message = "Enter the absolute path of your log (return to cancel):  " unless message
+        loop do
+          path = Readline.readline(message)
+          return if path.empty?
+          if not (FileTest.file?(path) and FileTest.readable?(path))
+            say(" ! #{path} is not a readable file!")
+          elsif @last_fetched_entries and @last_fetched_entries.any?{|e| e['log_path'] == path}
+            say(" ! #{path} has been registered already.")
+          else
+            break
+          end
+          newline
+        end
+        path
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.3.8
+  version: 0.0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-02-13 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: 4102998954962470010
+      hash: -2366646516811496353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: