flydata 0.0.1.2011101801 → 0.0.1.2011102301

data/VERSION

@@ -1 +1 @@
-0.0.1.2011101801
+0.0.1.2011102301

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.1.2011101801"
+  s.version = "0.0.1.2011102301"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2012-10-19"
+  s.date = "2012-10-23"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]
@@ -29,11 +29,15 @@ Gem::Specification.new do |s|
     "lib/flydata/api_client.rb",
     "lib/flydata/cli.rb",
     "lib/flydata/command/base.rb",
+    "lib/flydata/command/crontab.rb",
     "lib/flydata/command/login.rb",
     "lib/flydata/command/routine.rb",
     "lib/flydata/command/sender.rb",
+    "lib/flydata/command/setlogdel.rb",
     "lib/flydata/command/setup.rb",
     "lib/flydata/credentials.rb",
+    "lib/flydata/cron.rb",
+    "lib/flydata/flydata_crontab.sh",
     "lib/flydata/helpers.rb",
     "lib/flydata/log_monitor.rb",
     "lib/flydata/proxy.rb",
@@ -45,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://flydata.co/"
   s.licenses = ["All right reserved."]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "FlyData CLI"
 
   if s.respond_to? :specification_version then

data/lib/flydata/api/base.rb

@@ -5,7 +5,7 @@ module Flydata
         @client = api_client
       end
       def list(params={})
-        JSON.parse(@client.get(@url_path))
+        @client.get(@url_path)
       end
       def create(params={})
         params.each {|k, v| @url_path.gsub!(/:#{k}/, v.to_s)}

data/lib/flydata/api_client.rb

@@ -1,14 +1,16 @@
 require 'rest_client'
+require 'singleton'
 
 module Flydata
   FLYDATA_API_HOST = ENV['FLYDATA_API_HOST'] || 'flydata.co'
 
   class ApiClient
+    include Singleton
     attr_reader :response
     attr_accessor :credentials
 
-    def initialize(credentials=nil)
-      @credentials = credentials || Flydata::Credentials.new
+    def initialize
+      @credentials = Flydata::Credentials.new
     end
 
     # row level api
@@ -16,11 +18,19 @@ module Flydata
       uri = "http://#{FLYDATA_API_HOST}#{path}"
       resource = RestClient::Resource.new(uri, resource_opts)
       @response = resource.post(params, :accept => :json)
+      handle_response response
+    end
+    def put(path, params=nil)
+      uri = "http://#{FLYDATA_API_HOST}#{path}"
+      resource = RestClient::Resource.new(uri, resource_opts)
+      @response = resource.put(params, :accept => :json)
+      handle_response response
     end
     def get(path)
       uri = "http://#{FLYDATA_API_HOST}#{path}"
       resource = RestClient::Resource.new(uri, resource_opts)
       @response = resource.get(:accept => :json)
+      handle_response response
     end
 
     # high level api
@@ -32,6 +42,14 @@ module Flydata
     def respond_to_missing?(method_name, include_private=false); true end
 
     private
+    def handle_response(response)
+      json_response = JSON.parse(response)
+      if json_response.class == Hash and json_response["success"] == false
+        err_msg = json_response['errors'] ? json_response['errors'].to_s : "Unkown error."
+        raise err_msg
+      end
+      json_response
+    end
     def resource_opts
       {:user => @credentials.user, :password => @credentials.password}
     end

data/lib/flydata/command/base.rb

@@ -2,9 +2,34 @@ module Flydata
   module Command
     class Base
       def initialize
-        @api_client = ApiClient.new
+        @api_client = ApiClient.instance
       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 && data_entries.size > 0
+          raise "Failed to retrieve data_entries"
+        end
+        data_entries
+      end
+
+      # print console
+      def newline; puts end
+      def ask_yes_no(message)
+        loop do
+          ans = ask("#{message} (yes/no):  ")
+          if ans.size > 0
+            case ans[0].downcase
+            when 'y'; return true
+            when 'n'; return false
+            end
+          end
+          say(" ! Please answer y[es] or n[o]")
+          newline
+        end
+      end
     end
   end
 end

data/lib/flydata/command/crontab.rb

@@ -0,0 +1,9 @@
+module Flydata
+  module Command
+    class Crontab < Base
+      def run(args='')
+        Flydata::Cron.new.update args
+      end
+    end
+  end
+end

data/lib/flydata/command/routine.rb

@@ -8,20 +8,20 @@ module Flydata
         log_paths = retrieve_log_paths
         log_paths and log_paths.size() > 0 and log_paths.each { |path|
           if File.exist?(path) and File.writable?(path)
+            puts "Start - #{path}. "
             Flydata::LogMonitor.new(path).setup.rotate
           else
-            puts "Skip - #{path}. System cannot access this path."
+            puts "Skip  - #{path}. System cannot access this path."
           end
         }
       end
 
       private
       def retrieve_log_paths
-        data_entries = JSON.parse(flydata.get('/data_entries'))
-        unless flydata.response.code == 200 && data_entries.size > 0
-          raise "Failed to retrieve data_ports ids"
-        end
-        data_entries.map {|e| e["log_path"]}
+        data_entries = retrieve_data_entries
+        data_entries.map {|e|
+          e['log_path'] if e['log_deletion']
+        }.compact
       end
     end
   end

data/lib/flydata/command/setlogdel.rb

@@ -0,0 +1,67 @@
+module Flydata
+  module Command
+    class Setlogdel < Base
+      def run
+        Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
+        # Choose target data_entry
+        data_entry = choose_data_entry
+        return unless data_entry
+        # Confirm and update
+        if confirm_setting data_entry
+          set_log_deletion data_entry
+        end
+      end
+
+      private
+      def choose_data_entry
+        data_entries = retrieve_data_entries
+        choices = data_entries.map {|e|
+          "#{e['log_path']}\t\t -- Log deletion:#{boolToOnOff e['log_deletion']}"
+        }
+        choices << "Cancel"
+
+        choice = nil
+        say('Please select your log path for setting log deletion.')
+        newline
+        choose do |menu|
+          menu.index = :letter
+          menu.index_suffix = ") "
+          menu.prompt = "Select item to change log deletion setting: "
+          menu.choices(*choices) {|item| choice = item.split(' ')[0]}
+        end
+        newline
+        data_entries.select{|e| e['log_path'] == choice}.first
+      end
+      def confirm_setting(data_entry)
+        cur_flag = data_entry['log_deletion']
+        loop do
+          say "Target log path: #{data_entry['log_path']}"
+          say "Now changing log deletion setting: #{boolToOnOff cur_flag} -> #{boolToOnOff !cur_flag}"
+          ans = ask "Are you sure? (yes/no): "
+          if ans.size > 0
+            case ans[0].downcase
+            when 'y'; return true
+            when 'n'; return false
+            end
+          end
+          say " ! Please answer y[es] or n[o]"
+          newline
+        end
+      end
+      def boolToOnOff(bool)
+        bool ? 'ON' : 'OFF'
+      end
+      def set_log_deletion(data_entry)
+        param = {
+          :data_entry => {
+            'log_deletion' => !data_entry['log_deletion']
+          }
+        }
+        url = "/data_entries/#{data_entry['id']}"
+        ret = flydata.put(url, param)
+        raise 'Failed to update the log deletion setting.' unless ret['success']
+        puts "Update succeeded!"
+      end
+    end
+  end
+end

data/lib/flydata/command/setup.rb

@@ -22,7 +22,7 @@ module Flydata
           path = choose_log_path_from_examples
           case path
           when OTHER; ask_log_path
-          else; create_log_entry(path)
+          else; create_log_entry(path, ask_log_deletion)
           end
           newline
         end while more_entry?
@@ -57,27 +57,22 @@ module Flydata
           say(" ! #{path} is not a readable file!")
           newline
         end
-        create_log_entry(path)
+        create_log_entry(path, ask_log_deletion)
       end
-      def create_log_entry(path)
+      def ask_log_deletion
+        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.")
+        ask_yes_no("Set auto log deletion mode?")
+      end
+      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)
+        flydata.data_entry.create(data_port_id: data_port['id'], log_path: path, log_deletion: log_deletion)
         say("Process successfuly!") if flydata.response.code == 200
       end
       def more_entry?
-        loop do
-          ans = ask("Do you want to add more log path? (yes/no):  ")
-          if ans.size > 0
-            case ans[0].downcase
-            when 'y'; return true
-            when 'n'; return false
-            end
-          end
-          say(" ! Please answer y[es] or n[o]")
-          newline
-        end
+        ask_yes_no("Do you want to add more log path?")
       end
-      def newline; puts end
     end
   end
 end

data/lib/flydata/cron.rb

@@ -0,0 +1,14 @@
+module Flydata
+  class Cron
+    CRON_SETTING_SHELL=File.join(
+      File.expand_path(File.dirname(__FILE__)),
+      "flydata_crontab.sh")
+    def initialize
+    end
+    def update(option=nil)
+      arg = option ? option : ''
+      ret = system("sh " + CRON_SETTING_SHELL + " " + arg)
+      raise "Failed to update crontab." unless ret
+    end
+  end
+end

data/lib/flydata/flydata_crontab.sh

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Usage:
+#  flydata_crontab
+
+######## Parameters
+FLYDATA_HOME=~/".flydata"
+CRON_TMP_PATH="$FLYDATA_HOME/cron_list.tmp"
+CRON_BACKUP_PATH="$FLYDATA_HOME/cron_list.back"
+LOG_PATH="$FLYDATA_HOME/flydata_cron.log"
+ROUTINE_COMMAND="flydata routine >> $LOG_PATH 2>&1"
+#ROUTINE_COMMAND="bundle exec "~/"github/hapyrus/flydata/cli/bin/""flydata routine >> $LOG_PATH 2>&1"
+CRON_LINE='15 4 * * *'" $ROUTINE_COMMAND"
+#CRON_LINE='* * * * *'" $ROUTINE_COMMAND"
+
+ARG=$1
+REMOVE_OPTION="-r"
+CRON_SETTING_DONE=0 # flag
+
+
+######## Functions
+check_flydata_setup_done()
+{
+  which flydata > /dev/null
+  if [ "$?" -ne "0" ]; then
+    echo "flydata command not found. Flydata setup has not been done, yet."
+    exit -1
+  fi
+  if [ ! -w $FLYDATA_HOME ]; then
+    echo "Flydata setup has not been done, yet. Run setup command."
+    echo "  -> flydata setup"
+    exit -1
+  fi
+}
+
+check_crontab_commnad()
+{
+  which crontab > /dev/null
+  if [ "$?" -ne "0" ]; then
+    echo "No crontab command. Please install cron."
+    exit -2
+  fi
+}
+
+check_crond_process()
+{
+  crond_exist=`ps aux | grep crond | grep -v grep | wc -l`
+  echo $crond_exist
+  if [ "$crond_exist" -ne "1" ]; then
+    echo "No crond process. Please start crond process."
+    exit -3
+  fi
+}
+
+dump_cron_setting()
+{
+  crontab -l > $CRON_BACKUP_PATH
+  if [ "$?" -ne "0" ]; then
+    echo "Cannot dump cron settings. "
+    echo "Please install "
+    exit -4
+  fi
+}
+
+check_cron_setting()
+{
+  CRON_SETTING_DONE=`cat $CRON_BACKUP_PATH | grep "flydata routine" | wc -l`
+  if [ "$?" -ne "0" ]; then
+    echo "Failed to check cron setting file."
+    exit -5
+  fi
+}
+
+add_cron_setting()
+{
+  cat $CRON_BACKUP_PATH > $CRON_TMP_PATH
+  echo "$CRON_LINE" >> $CRON_TMP_PATH
+  crontab $CRON_TMP_PATH
+  if [ "$?" -ne "0" ]; then
+    echo "Failed to register flydata routine job."
+    exit -6
+  fi
+}
+
+remove_cron_setting()
+{
+  cat "$CRON_BACKUP_PATH" | grep -v "flydata routine" > $CRON_TMP_PATH
+  crontab $CRON_TMP_PATH
+  if [ "$?" -ne "0" ]; then
+    echo "Failed to remove flydata routine job."
+    exit -7
+  fi
+}
+
+
+######## Main
+ARG="$1"
+check_flydata_setup_done
+check_crontab_commnad
+# check_crond_process
+dump_cron_setting
+check_cron_setting
+
+# Skip If add mode and registered
+if [[ "$ARG" != "$REMOVE_OPTION" && $CRON_SETTING_DONE -gt 0 ]]; then
+  echo "Skip. Already cron setup done."
+  exit 0
+fi
+
+# Remove mode -> remove setting
+if [ "$ARG" == "$REMOVE_OPTION" ]; then
+  remove_cron_setting
+  exit 0
+fi
+
+# Add mode -> add setting
+add_cron_setting
+echo "Updated crontab to manage the deletion of your log data."
+exit 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2011101801
+  version: 0.0.1.2011102301
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70220409278880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220409278880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70220409278380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220409278380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70220409277880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220409277880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70220409277360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220409277360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70220409276860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220409276860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70220409276380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220409276380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70220409275880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409275880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70220409275400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409275400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220409274900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409274900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70220409274420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409274420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest-standalone
-  requirement: &70220409273940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409273940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest-notification
-  requirement: &70220409273460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409273460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70220409272980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +213,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220409272980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: FlyData Command Line Interface
 email: sysadmin@flydata.co
 executables:
@@ -176,11 +241,15 @@ files:
 - lib/flydata/api_client.rb
 - lib/flydata/cli.rb
 - lib/flydata/command/base.rb
+- lib/flydata/command/crontab.rb
 - lib/flydata/command/login.rb
 - lib/flydata/command/routine.rb
 - lib/flydata/command/sender.rb
+- lib/flydata/command/setlogdel.rb
 - lib/flydata/command/setup.rb
 - lib/flydata/credentials.rb
+- lib/flydata/cron.rb
+- lib/flydata/flydata_crontab.sh
 - lib/flydata/helpers.rb
 - lib/flydata/log_monitor.rb
 - lib/flydata/proxy.rb
@@ -203,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1202166163575531449
+      hash: -1416744833933020924
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: FlyData CLI