flydata 0.0.1.2011102602 → 0.0.1.2011102901

data/VERSION

@@ -1 +1 @@
-0.0.1.2011102602
+0.0.1.2011102901

data/flydata.gemspec

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

data/lib/flydata/cli.rb

@@ -35,6 +35,15 @@ Usage: flydata COMMAND
   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

data/lib/flydata/command/base.rb

@@ -6,7 +6,6 @@ module Flydata
       end
       def flydata; @api_client end
 
-      # retrieve models on servers
       def retrieve_data_entries
         data_entries = flydata.get('/data_entries')
         unless flydata.response.code == 200
@@ -14,6 +13,12 @@ module Flydata
         end
         data_entries
       end
+      def register_crontab
+        data_entries = retrieve_data_entries
+        if data_entries.any?{|e| e['log_deletion']}
+          Flydata::Command::Crontab.new.run
+        end
+      end
 
       # print console
       def newline; puts end

data/lib/flydata/command/routine.rb

@@ -2,6 +2,7 @@ module Flydata
   module Command
     class Routine < Base
       def run
+        print "#{Time.now} "
         unless flydata.credentials.authenticated?
           raise "Authentication error. Please login."
         end

data/lib/flydata/command/sender.rb

@@ -3,43 +3,24 @@ module Flydata
     class Sender < Base
       FLYDATA_HOME=Flydata::HOME_DIR
       def start
+        # Check if process exist
         if process_exist?
           say("Process exist. Please stop process first.")
           return
         end
 
-        retry_count = 10
-        1.upto(retry_count) do |i|
-          break if server_ready?
-          say("Waiting server side active... (#{i}/#{retry_count})")
-          sleep 30
-        end
+        wait_until_server_ready
 
+        # Start sender(fluentd) process
         say('Starting sender process.')
         Dir.chdir(FLYDATA_HOME){
           system("fluentd -d #{FLYDATA_HOME}/flydata.pid -l #{FLYDATA_HOME}/flydata.log -c #{FLYDATA_HOME}/flydata.conf")
         }
-
         sleep 5
 
-        data_port = flydata.data_port.get
-        data_port_id = data_port['id']
-
-        retry_count = 10
-        ready = false
-        1.upto(retry_count) do |i|
-          ready ||= client_ready?
-          if ready and uploaded_successfully?(data_port_id)
-            say('Done.')
-            say("Go to your Dashboard! http://#{Flydata::FLYDATA_API_HOST}")
-            return true
-          end
-          say("Waiting client side active... (#{i}/#{retry_count})")
-          sleep 30
-        end
-
-        say('Something wrong..')
-        false
+        wait_until_client_ready
+        wait_until_logs_uploaded
+        say("Go to your Dashboard! http://#{Flydata::FLYDATA_API_HOST}")
       end
       def stop
         unless process_exist?
@@ -51,10 +32,8 @@ module Flydata
         if system("kill `cat #{FLYDATA_HOME}/flydata.pid`")
           say('Done.')
           return true
-        else
-          say('Something wrong..')
         end
-        false
+        raise 'Something wrong..'
       end
       def restart
         if process_exist?
@@ -63,7 +42,7 @@ module Flydata
             say('Done.')
             return true
           else
-            say('Something wrong..')
+            raise 'Something wrong..'
           end
         else
           say("Process doesn't exist.")
@@ -72,6 +51,44 @@ module Flydata
       end
 
       private
+      def wait_until_server_ready
+        retry_count = 10
+        1.upto(retry_count) do |i|
+          return true if server_ready?
+          say("Waiting server side active... (#{i}/#{retry_count})")
+          sleep 30
+        end
+        false
+      end
+      def wait_until_client_ready
+        retry_count = 10
+        1.upto(retry_count) do |i|
+          if client_ready?
+            say("Done! Client is ready now.")
+            return true
+          end
+          say("Waiting client side active... (#{i}/#{retry_count})")
+          sleep 30
+        end
+        raise "Somthing wrong... Please try setup command again."
+      end
+      def wait_until_logs_uploaded
+        say('Starting to check uploading from your server.')
+        data_port = flydata.data_port.get
+        data_port_id = data_port['id']
+
+        retry_count = 10
+        1.upto(retry_count) do |i|
+          if uploaded_successfully?(data_port_id)
+            say("Uploading your logs correctly.")
+            return true
+          end
+          say("Waiting logs uploading... (#{i}/#{retry_count})")
+          sleep 30
+        end
+        raise 'Cannot confirm your logs on flydata server. Something wrong..'
+      end
+
       def server_ready?
         data_port = flydata.data_port.get
         data_port['server_status'] == 'active'

data/lib/flydata/command/setlogdel.rb

@@ -7,9 +7,8 @@ module Flydata
         data_entry = choose_data_entry
         return unless data_entry
         # Confirm and update
-        if confirm_setting data_entry
-          set_log_deletion data_entry
-        end
+        set_log_deletion data_entry if confirm_setting data_entry
+        register_crontab
       end
 
       private
@@ -21,7 +20,8 @@ module Flydata
           return nil
         end
         choices = data_entries.map {|e|
-          "#{e['name']}\t#{e['log_path']}\t -- Log deletion:#{boolToOnOff e['log_deletion']}"
+          file_attr = File.writable?(e['log_path']) ? "" : "(read only)"
+          "#{e['display_name']}\t#{e['log_path']}\t -- Log deletion:#{boolToOnOff e['log_deletion']} #{file_attr}"
         }
         choices << "Cancel"
 
@@ -35,7 +35,17 @@ module Flydata
           menu.choices(*choices) {|item| choice = item.split(' ')[0]}
         end
         newline
-        data_entries.select{|e| e['log_path'] == choice}.first
+
+        data_entry = data_entries.select{|e| e['display_name'] == choice}.first
+        return nil unless data_entry
+
+        if not data_entry['log_deletion'] and not File.writable?(data_entry['log_path'])
+          say("Failed to change setting...")
+          say("  This path is readonly for current user.")
+          say("  Change user or permission, if you want to set log deletion option.")
+          return nil
+        end
+        data_entry
       end
       def confirm_setting(data_entry)
         cur_flag = data_entry['log_deletion']
@@ -65,7 +75,6 @@ module Flydata
         url = "/data_entries/#{data_entry['id']}"
         ret = flydata.put(url, param)
         raise 'Failed to update the log deletion setting.' unless ret['success']
-        Flydata::Command::Crontab.new.run if !data_entry['log_deletion']
         puts "Update succeeded!"
       end
     end

data/lib/flydata/command/setup.rb

@@ -26,12 +26,15 @@ module Flydata
             path = choose_log_path_from_examples
             case path
             when OTHER; ask_log_path
-            else; create_log_entry(path, ask_log_deletion)
+            else; create_log_entry(path, ask_log_deletion(path))
             end
             newline
           end while more_entry?
         end
 
+        # register cron if registered log deletion
+        register_crontab
+
         # start client process
         Flydata::Command::Sender.new.restart
       end
@@ -43,7 +46,7 @@ module Flydata
         if data_entries and data_entries.size > 0
           puts('Registered entries. ')
           data_entries.each { |data_entry|
-            say(" - #{data_entry['name']}\t#{data_entry['log_path']}")
+            say(" - #{data_entry['display_name']}\t#{data_entry['log_path']}")
           }
           true
         else
@@ -75,13 +78,25 @@ module Flydata
         loop do
           path = Readline.readline("Enter the absolute path of your log (return to cancel):  ")
           return if path.empty?
-          break if FileTest.file?(path) and FileTest.readable?(path)
-          say(" ! #{path} is not a readable file!")
+          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
-        create_log_entry(path, ask_log_deletion)
+        create_log_entry(path, ask_log_deletion(path))
       end
-      def ask_log_deletion
+      def ask_log_deletion(path)
+        unless File.writable?(path)
+          say("Skip log deletion setting...")
+          say("  This path is readonly for current user.")
+          say("  Change user or permission, if you want to set log deletion option.")
+          newline
+          return
+        end
         say("** Log deletion setting **")
         say("Flydata has a log deletion feature that flydata will delete old log archives uploaded by flydata automatically.")
         say("Flydata will delete logs whose last modified timestamp is 7 days ago.")
@@ -90,7 +105,6 @@ module Flydata
       def create_log_entry(path, log_deletion)
         data_port = flydata.data_port.get
         flydata.data_entry.create(data_port_id: data_port['id'], log_path: path, log_deletion: log_deletion)
-        Flydata::Command::Crontab.new.run if log_deletion
         say("Process successfuly!") if flydata.response.code == 200
       end
       def more_entry?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2011102602
+  version: 0.0.1.2011102901
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-29 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: 3242420887991988647
+      hash: -2910616954756998492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: