flydata 0.0.1.2011102401 → 0.0.1.2011102601

data/VERSION

@@ -1 +1 @@
-0.0.1.2011102401
+0.0.1.2011102601

data/flydata.gemspec

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

data/lib/flydata/cli.rb

@@ -31,6 +31,10 @@ module Flydata
       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
       EOM
     end
   end

data/lib/flydata/command/base.rb

@@ -9,7 +9,7 @@ module Flydata
       # retrieve models on servers
       def retrieve_data_entries
         data_entries = flydata.get('/data_entries')
-        unless flydata.response.code == 200 && data_entries.size > 0
+        unless flydata.response.code == 200
           raise "Failed to retrieve data_entries"
         end
         data_entries

data/lib/flydata/command/login.rb

@@ -1,21 +1,38 @@
 module Flydata
   module Command
     class Login < Base
+      LOGIN_TRIAL_TIMES=3
       def run
-        email = ask("FlyData Email:  ")
-        password = ask("FlyData password:  ") {|q| q.echo = false}
-        flydata.credentials = Flydata::Credentials.new(email, password)
-
-        login
+        ret = login(LOGIN_TRIAL_TIMES)
+        raise "Login failed #{LOGIN_TRIAL_TIMES} times." unless ret
+        ret
       end
 
       private
-      def login
+      def login(times=3)
+        1.upto(times) do |i|
+          begin
+            return true if login_once
+          rescue Exception => e
+            puts e
+          end
+        end
+        false
+      end
+      def login_once
+        # Ask login info
+        email = ask("FlyData Email:  ")
+        password = ask("FlyData password:  ") {|q| q.echo = false}
+        flydata.credentials = Flydata::Credentials.new(email, password)
+        # Auth request
         flydata.post('/users/sign_in')
         if flydata.response.code == 201 # 201: Created
           say("Login succeeded!")
           flydata.credentials.authenticate!
+          return true
         end
+        say("Login failed!")
+        false
       end
     end
   end

data/lib/flydata/command/sender.rb

@@ -16,13 +16,21 @@ module Flydata
         end
 
         say('Starting sender process.')
-        system("fluentd -d #{FLYDATA_HOME}/flydata.pid -l #{FLYDATA_HOME}/flydata.log -c #{FLYDATA_HOME}/flydata.conf")
+        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|
-          if client_ready?
+          if (ready or ready = client_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})")
@@ -30,8 +38,14 @@ module Flydata
         end
 
         say('Something wrong..')
+        false
       end
       def stop
+        unless process_exist?
+          say("Process doesn't exist.")
+          return true
+        end
+
         say('Stopping sender process.')
         if system("kill `cat #{FLYDATA_HOME}/flydata.pid`")
           say('Done.')
@@ -39,10 +53,21 @@ module Flydata
         else
           say('Something wrong..')
         end
+        false
       end
       def restart
-        say('Restarting sender process.')
-        stop and start
+        if process_exist?
+          say('Restarting sender process.')
+          if system("kill -HUP `cat #{FLYDATA_HOME}/flydata.pid`")
+            say('Done.')
+            return true
+          else
+            say('Something wrong..')
+          end
+        else
+          say("Process doesn't exist.")
+          start
+        end
       end
 
       private
@@ -57,6 +82,10 @@ module Flydata
         process_count = `ps aux|grep -v grep|grep "\\.flydata/flydata\\.conf"|grep fluentd|wc -l`.to_i
         process_count > 0
       end
+      def uploaded_successfully?(data_port_id)
+        res = flydata.get("/data_ports/#{data_port_id}/tail.json")
+        res and res['logs'] and res['logs'].size > 0
+      end
     end
   end
 end

data/lib/flydata/command/setlogdel.rb

@@ -15,8 +15,13 @@ module Flydata
       private
       def choose_data_entry
         data_entries = retrieve_data_entries
+        if data_entries.size < 1
+          puts("There are no registered entries.")
+          puts("You need to create a data entry by flydata setup command.")
+          return nil
+        end
         choices = data_entries.map {|e|
-          "#{e['log_path']}\t\t -- Log deletion:#{boolToOnOff e['log_deletion']}"
+          "#{e['name']}\t#{e['log_path']}\t -- Log deletion:#{boolToOnOff e['log_deletion']}"
         }
         choices << "Cancel"
 

data/lib/flydata/command/setup.rb

@@ -18,23 +18,47 @@ module Flydata
         # login
         Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
 
-        begin
-          path = choose_log_path_from_examples
-          case path
-          when OTHER; ask_log_path
-          else; create_log_entry(path, ask_log_deletion)
-          end
-          newline
-        end while more_entry?
+        # choose entries
+        unless shown = show_registered_entries and !(more_entry?)
+          begin
+            unless shown
+              show_registered_entries
+              shown = false
+            end
+            path = choose_log_path_from_examples
+            case path
+            when OTHER; ask_log_path
+            else; create_log_entry(path, ask_log_deletion)
+            end
+            newline
+          end while more_entry?
+        end
 
         # start client process
-        sender = Flydata::Command::Sender.new
-        sender.start
+        Flydata::Command::Sender.new.restart
       end
 
       private
+      def show_registered_entries
+        data_entries = retrieve_data_entries
+        @last_fetched_entries = data_entries
+        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']}")
+          }
+          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)}
+        if @last_fetched_entries
+           candidates = candidates - @last_fetched_entries.map{|v| v['log_path']}
+        end
+        return OTHER unless candidates.size > 0
         candidates << OTHER
         choice = nil
         say('Please select your log path for sending FlyData')

data/lib/flydata/credentials.rb

@@ -4,9 +4,12 @@ module Flydata
     attr_reader :user, :password
     def initialize(user=nil, password=nil)
       read_credentials
-      unless @authenticated
-        @user = user || ENV['FLYDATA_LOGIN']
-        @password = password || ENV['FLYDATA_PASSWORD']
+      if user && password
+        @user = user
+        @password = password
+      elsif !(@authenticated)
+        @user =  ENV['FLYDATA_LOGIN']
+        @password = ENV['FLYDATA_PASSWORD']
       end
     end
     def authenticate!

data/lib/flydata/cron.rb

@@ -1,14 +1,88 @@
 module Flydata
   class Cron
-    CRON_SETTING_SHELL=File.join(
-      File.expand_path(File.dirname(__FILE__)),
-      "flydata_crontab.sh")
+    FLYDATA_HOME=Flydata::HOME_DIR
+    CRON_TMP_PATH="#{FLYDATA_HOME}/cron_list.tmp"
+    CRON_BACKUP_PATH="#{FLYDATA_HOME}/cron_list.back"
+    LOG_PATH="#{FLYDATA_HOME}/flydata_cron.log"
+    ROUTINE_BASE_COMMAND="#{FLYDATA_HOME}/bin/flydata routine >> #{LOG_PATH} 2>&1"
+    if ENV['FLYDATA_API_HOST'] and ENV['FLYDATA_API_HOST'] != ""
+      ROUTINE_COMMAND="export FLYDATA_API_HOST=#{ENV['FLYDATA_API_HOST']} && #{ROUTINE_BASE_COMMAND}"
+    else
+      ROUTINE_COMMAND=ROUTINE_BASE_COMMAND
+    end
+
+    #CRON_LINE="15 4 * * * #{ROUTINE_COMMAND}"
+    CRON_LINE="* * * * * #{ROUTINE_COMMAND}"
+    REMOVE_OPTION="-r"
+
     def initialize
     end
     def update(option=nil)
       arg = option ? option : ''
-      ret = system("sh " + CRON_SETTING_SHELL + " " + arg)
-      raise "Failed to update crontab." unless ret
+
+      # Check condition
+      check_crontab_command
+      dump_cron_setting
+      reagistered = check_cron_setting
+
+      # Remove mode
+      if arg == REMOVE_OPTION
+        unless reagistered
+          puts "Skip removing. There are no flydata jobs in crontab."
+        else
+          remove_cron_setting
+          puts "Updated crontab to remove the deletion of your log data."
+        end
+      # Add mode
+      else
+        if reagistered
+          puts "Skip register. Already cron setup done."
+        else
+          add_cron_setting
+          puts "Updated crontab to manage the deletion of your log data."
+        end
+      end
+      true
+    end
+
+    private
+    def check_crontab_command
+      raise "Failed to update. Crontab is not installed." unless system("which crontab > /dev/null")
+    end
+    def dump_cron_setting
+      system("crontab -l > #{CRON_BACKUP_PATH}")
+    end
+    def check_cron_setting
+      already_exist = false
+      File.open(CRON_BACKUP_PATH, 'r') { |file|
+        while l = file.gets
+          if l =~ /#{ROUTINE_COMMAND}/
+            already_exist = true
+            break
+          end
+        end
+      }
+      already_exist
+    end
+    def add_cron_setting
+      FileUtils.copy(CRON_BACKUP_PATH, CRON_TMP_PATH)
+      File.open(CRON_TMP_PATH, "a") { |file|
+        file.puts(CRON_LINE)
+      }
+      ret = system("crontab #{CRON_TMP_PATH}")
+      raise "Failed to register flydata routine job to crontab." unless ret
+    end
+    def remove_cron_setting
+      File.open(CRON_TMP_PATH, "w") { |dst|
+        File.open(CRON_BACKUP_PATH, 'r') { |src|
+          while l = src.gets
+            dst.puts(l) unless l =~ /#{ROUTINE_COMMAND}/
+          end
+        }
+      }
+      ret = system("crontab #{CRON_TMP_PATH}")
+      raise "Failed to remove flydata routine job from crontab." unless ret
     end
+
   end
 end

data/lib/flydata/log_monitor.rb

@@ -28,7 +28,7 @@ module Flydata
       # initialize paths
       @flydata_path = File.join(File.dirname(@log_path),
                                 FLYDATA_DIR,
-                                File.basename(@log_path))
+                                File.basename(@log_path) + ".d")
       @backup_path = File.join(@flydata_path, BACKUP_DIR)
       @trash_path = File.join(@flydata_path, TRASH_DIR)
     end

metadata

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