flydata 0.0.4.1 → 0.0.4.2

data/VERSION

@@ -1 +1 @@
-0.0.4.1
+0.0.4.2

data/flydata.gemspec

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

data/lib/flydata/api_client.rb

@@ -57,9 +57,7 @@ module Flydata
       # delete the '/'
       @flydata_api_host = @flydata_api_host[0..-2] if @flydata_api_host =~ /\/$/
     end
-    def flydata_api_host_file
-      File.join(home_directory, '.flydata', 'flydata_api_host')
-    end
+
     def handle_response(response)
       json_response = JSON.parse(response)
       if json_response.class == Hash and json_response["success"] == false

data/lib/flydata/cli.rb

@@ -1,10 +1,15 @@
 module Flydata
   class Cli
+    include Helpers
     def initialize(args)
       @args = args
     end
 
     def run
+      unless check_environment
+        puts "Sorry, you have to run the installation command to use flydata. Please go to https://secure.flydata.co/ and sign up."
+        return
+      end
       begin
         if @args.size > 0
           first_arg = @args.shift
@@ -20,33 +25,16 @@ module Flydata
         puts "! #{e.to_s}"
         puts
         puts
-        puts '-' * 64
         print_usage
-        puts '-' * 64
       end
     end
 
     private
+    def check_environment
+      FileTest.file?(flydata_api_host_file)
+    end
     def parse_command(cmd)
       cmd.split(':')
     end
-    def print_usage
-      puts <<-EOM
-Usage: flydata COMMAND
-  setup                    # setup initially
-  start                    # start flydata process
-  stop                     # stop flydata process
-  restart                  # restart flydata process
-  setlogdel                # show and change log deletion settting
-
-If you encountered login or any other errors during setup,
-please setup flydata again by following commands.
-   source ~/.bashrc
-   flydata setup
-
-You can check the logs of sender(flydata) process.
-   Log path: ~/.flydata/flydata.log
-      EOM
-    end
   end
 end

data/lib/flydata/command/base.rb

@@ -47,6 +47,7 @@ module Flydata
         choose do |menu|
           menu.index = :number
           menu.index_suffix = ") "
+          menu.select_by = :index
           menu.prompt = prompt ? prompt : ">> "
           menu.choices(*menu_list) {|item| choice = value_list[menu_list.index(item)]}
         end

data/lib/flydata/command/sender.rb

@@ -5,7 +5,7 @@ module Flydata
       def start
         # Check if process exist
         if process_exist?
-          say("Process exist. Please stop process first.")
+          say("Process is still running. Please stop process first.")
           return
         end
 
@@ -24,7 +24,7 @@ module Flydata
         data_port = flydata.data_port.get
         say("Go to your Dashboard! #{flydata.flydata_api_host}/data_ports/#{data_port['id']}")
         say <<EOF
-Please Note: Records and Total Size are updated every 5 minutes. You can download logs one hour after they are generated as they are sent to s3 once per hour.
+Please Note: Records and Total Size are updated every 10 minutes. You can download logs one hour after they are generated as they are sent to s3 once per hour.
 EOF
       end
       def stop
@@ -38,7 +38,7 @@ EOF
           say('Done.')
           return true
         end
-        raise 'Something wrong..'
+        raise 'Something has gone wrong..'
       end
       def restart
         if process_exist?
@@ -47,7 +47,7 @@ EOF
             say('Done.')
             return true
           else
-            raise 'Something wrong..'
+            raise 'Something has gone wrong..'
           end
         else
           say("Process doesn't exist.")
@@ -60,7 +60,7 @@ EOF
         retry_count = 10
         1.upto(retry_count) do |i|
           return true if server_ready?
-          say("Waiting server side active... (#{i}/#{retry_count})")
+          say("Waiting for the server side to become active... (#{i}/#{retry_count})")
           sleep 30
         end
         false
@@ -72,13 +72,13 @@ EOF
             say("Done! Client is ready now.")
             return true
           end
-          say("Waiting client side active... (#{i}/#{retry_count})")
+          say("Waiting for the client side to become active... (#{i}/#{retry_count})")
           sleep 30
         end
-        raise "Somthing wrong... Please try setup command again."
+        raise "Somthing has gone wrong... Please try setup command again."
       end
       def wait_until_logs_uploaded
-        say('Starting to check uploading from your server.')
+        say('Starting to check the upload from your server.')
         data_port = flydata.data_port.get
         data_port_id = data_port['id']
 
@@ -91,7 +91,7 @@ EOF
           say("Waiting logs uploading... (#{i}/#{retry_count})")
           sleep 30
         end
-        raise 'Cannot confirm your logs on flydata server. Something wrong..'
+        raise 'Cannot confirm that your logs exist on the FlyData server. Something has gone wrong..'
       end
 
       def server_ready?

data/lib/flydata/command/setup.rb

@@ -1,6 +1,7 @@
 module Flydata
   module Command
     class Setup < Base
+      include Helpers
       LOG_PATH_EXAMPLES=
         %w(/var/log/httpd/access_log /var/log/apache2/access.log
            /var/log/httpd-access.log /var/log/apache2/access_log
@@ -14,51 +15,72 @@ module Flydata
         Dir[str+'*'].grep( /^#{Regexp.escape(str)}/ )
       end
 
-      def run
+      def initial_run
+        run do
+          puts
+          shown = show_registered_redshift_entries
+          if shown
+            true
+          else
+            _run
+          end
+        end
+        puts
+        print_usage
+        puts "Completed setup of FlyData!"
+      end
+
+      def run(&block)
         Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
-        ret = _run
+        ret = block_given? ? yield : _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
+          start_redshift_mode
+        when :s3backup
+          start_s3_backup_mode
+        when :restart_flydata
+          true
         else
-          ret = start_s3_backup_mode
+          false
         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])
+        choose_one('Choose an option', nil,
+                   ["Setup Redshift and S3 Backup", "Setup S3 Backup only", "Restart FlyData", "Cancel"],
+                   [:redshift, :s3backup, :restart_flydata, :cancel])
       end
 
-      #### redshift buckup mode
+      #### redshift backup 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
+        show_registered_redshift_entries
         newline
         ask_adding_new_redshift
       end
 
+      def show_registered_redshift_entries
+        show_registered_entries('RedshiftFileDataEntry') do |de|
+          say(" - #{de['display_name']}: #{de['log_path']} -> #{de['redshift_table_name']} (#{de['redshift_table_name']}_dev)")
+        end
+      end
+
       def ask_adding_new_redshift
-        puts "Start to register a new entry."
+        puts "Start registration of a new entry:"
         newline
         # select table on redshift
-        puts "[Select a Table Name on Redshift]"
+        puts "[Select a Table from your Redshift cluster]"
         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."
+        puts "Enter the absolute path of your local log that you want to  upload to the '#{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
@@ -69,25 +91,59 @@ module Flydata
         newline
         puts "[Confirm]"
         separator
-        puts " table(redshift) -> #{table_name}"
-        puts " local log path -> #{log_path}"
+        puts " table(redshift) -> #{table_name} (#{table_name}_dev)"
+        puts " local log path  -> #{log_path}"
         puts " log file format -> #{log_file_type}"
         separator
-        return unless ask_yes_no("Register a new entry?", true)
+        return unless ask_yes_no("Are you sure you want to register this 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,
+        choose_one("Please select the 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."
+
+        all_tables = ret['table_list'].collect {|tn| tn.gsub(/_dev$/, '')}.uniq
+        prod_tables = ret['table_list'].select {|tn| not tn.end_with?('_dev')}
+        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."
+        end
+
+        if development?
+          menu_list = all_tables.collect do |tn|
+            menu = ["#{tn}", "( #{tn}_dev )"]
+            if dev_tables.index("#{tn}_dev").nil?
+              menu << "!WARN The '#{tn}_dev' table does not exist on your Redshift cluster"
+            else
+              menu << "OK"
+            end
+            menu
+          end
+          menu_str_list = format_menu_list(menu_list)
+          message = " !DEVELOPMENT MODE!  FlyData will only upload to tables with '_dev' suffix in the name."
+        else
+          menu_list = all_tables.collect do |tn|
+            menu = ["#{tn}", "( #{tn}_dev )"]
+            if prod_tables.index("#{tn}").nil?
+              menu << "!WARN '#{tn}' table does not exist"
+            else
+              menu << "OK"
+            end
+            menu
+          end
+          menu_str_list = format_menu_list(menu_list)
+          message = " !PRODUCTION MODE!"
+        end
+        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
+          menu_str.split.first
         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)
@@ -101,7 +157,7 @@ module Flydata
         return true
       end
 
-      #### s3 buckup mode
+      #### s3 backup mode
       def start_s3_backup_mode
         # choose entries
         unless (shown = show_registered_entries)
@@ -125,7 +181,7 @@ module Flydata
         @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 on FlyData. ')
+          puts('Registered entries on FlyData: ')
           separator
           data_entries.each { |data_entry|
             if block_given?

data/lib/flydata/helpers.rb

@@ -10,11 +10,66 @@ module Flydata
       end
       [klass, method]
     end
+
+    def print_usage
+      puts '-' * 64
+      puts <<-EOM
+Usage: flydata COMMAND
+  setup                    # setup initially
+  start                    # start flydata process
+  stop                     # stop flydata process
+  restart                  # restart flydata process
+
+If you encountered login or any other errors during setup,
+please setup flydata again by following commands.
+   source ~/.bashrc
+   flydata setup
+
+You can check the logs of sender(flydata) process.
+   Log path: ~/.flydata/flydata.log
+      EOM
+      puts '-' * 64
+    end
+
     def to_command_class(class_name)
       eval("Flydata::Command::#{class_name.camelcase}")
     end
+
+    def development?
+      File.open(flydata_conf_file).first.strip.end_with?('dev')
+    end
+
+    # format text
+    def format_menu_list(menu_list)
+      max_length_list = menu_list.inject(Array.new(menu_list.first.size, 0)) do |ml, menu|
+        0.upto(menu.size - 1) do |i|
+          ml[i] = menu[i].length if ml[i] < menu[i].length
+        end
+        ml
+      end
+
+      menu_list = menu_list.collect do |menu|
+        0.upto(menu.size - 1).inject("") do |str, i|
+          str = "#{str}#{menu[i].ljust(max_length_list[i] + 1, ' ')}"
+        end
+      end
+    end
+
+    # file paths
     def home_directory
       ENV['HOME'] || Dir.pwd
     end
+
+    def flydata_home_directory
+      File.join(home_directory, '.flydata')
+    end
+
+    def flydata_api_host_file
+      File.join(flydata_home_directory, 'flydata_api_host')
+    end
+
+    def flydata_conf_file
+      File.join(flydata_home_directory, 'flydata.conf')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-06-05 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: -1830851473606011270
+      hash: 258014642818965093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: