flydata 0.0.1.nc2 → 0.0.1.2011101801

data/VERSION

@@ -1 +1 @@
-0.0.1.nc2
+0.0.1.2011101801

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.1.nc2"
+  s.version = "0.0.1.2011101801"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2012-10-29"
+  s.date = "2012-10-19"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]
@@ -29,18 +29,11 @@ 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/restart.rb",
     "lib/flydata/command/routine.rb",
     "lib/flydata/command/sender.rb",
-    "lib/flydata/command/setlogdel.rb",
     "lib/flydata/command/setup.rb",
-    "lib/flydata/command/start.rb",
-    "lib/flydata/command/stop.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",
@@ -52,7 +45,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.23"
+  s.rubygems_version = "1.8.15"
   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={})
-        @client.get(@url_path)
+        JSON.parse(@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,16 +1,14 @@
 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 = Flydata::Credentials.new
+    def initialize(credentials=nil)
+      @credentials = credentials || Flydata::Credentials.new
     end
 
     # row level api
@@ -18,19 +16,11 @@ 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
@@ -42,14 +32,6 @@ 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/cli.rb

@@ -31,19 +31,6 @@ 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
-
-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

@@ -2,39 +2,9 @@ module Flydata
   module Command
     class Base
       def initialize
-        @api_client = ApiClient.instance
+        @api_client = ApiClient.new
       end
       def flydata; @api_client end
-
-      def retrieve_data_entries
-        data_entries = flydata.get('/data_entries')
-        unless flydata.response.code == 200
-          raise "Failed to retrieve data_entries"
-        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
-      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/login.rb

@@ -1,38 +1,21 @@
 module Flydata
   module Command
     class Login < Base
-      LOGIN_TRIAL_TIMES=3
       def run
-        ret = login(LOGIN_TRIAL_TIMES)
-        raise "Login failed #{LOGIN_TRIAL_TIMES} times." unless ret
-        ret
-      end
-
-      private
-      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
+
+        login
+      end
+
+      private
+      def login
         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/routine.rb

@@ -2,27 +2,26 @@ module Flydata
   module Command
     class Routine < Base
       def run
-        print "#{Time.now} "
         unless flydata.credentials.authenticated?
           raise "Authentication error. Please login."
         end
         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 = retrieve_data_entries
-        data_entries.map {|e|
-          e['log_path'] if e['log_deletion']
-        }.compact
+        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"]}
       end
     end
   end

data/lib/flydata/command/sender.rb

@@ -3,92 +3,49 @@ 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
 
-        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
-
-        wait_until_client_ready
-        wait_until_logs_uploaded
-        say("Go to your Dashboard! http://#{Flydata::FLYDATA_API_HOST}")
-      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.')
-          return true
-        end
-        raise 'Something wrong..'
-      end
-      def restart
-        if process_exist?
-          say('Restarting sender process.')
-          if system("kill -HUP `cat #{FLYDATA_HOME}/flydata.pid`")
-            say('Done.')
-            return true
-          else
-            raise 'Something wrong..'
-          end
-        else
-          say("Process doesn't exist.")
-          start
-        end
-      end
-
-      private
-      def wait_until_server_ready
         retry_count = 10
         1.upto(retry_count) do |i|
-          return true if server_ready?
+          break if server_ready?
           say("Waiting server side active... (#{i}/#{retry_count})")
           sleep 30
         end
-        false
-      end
-      def wait_until_client_ready
+
+        say('Starting sender process.')
+        system("fluentd -d #{FLYDATA_HOME}/flydata.pid -l #{FLYDATA_HOME}/flydata.log -c #{FLYDATA_HOME}/flydata.conf")
+
+        sleep 5
         retry_count = 10
         1.upto(retry_count) do |i|
           if client_ready?
-            say("Done! Client is ready now.")
+            say('Done.')
             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
+        say('Something wrong..')
+      end
+      def stop
+        say('Stopping sender process.')
+        if system("kill `cat #{FLYDATA_HOME}/flydata.pid`")
+          say('Done.')
+          return true
+        else
+          say('Something wrong..')
         end
-        raise 'Cannot confirm your logs on flydata server. Something wrong..'
+      end
+      def restart
+        say('Restarting sender process.')
+        stop and start
       end
 
+      private
       def server_ready?
         data_port = flydata.data_port.get
         data_port['server_status'] == 'active'
@@ -97,13 +54,9 @@ module Flydata
         process_exist?
       end
       def process_exist?
-        process_count = `ps aux|grep -v grep|grep "\\.flydata/flydata\\.conf"|grep fluentd|wc -l`.to_i
+        process_count = `ps aux|grep -v grep|grep "\\.flydata/"|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/setup.rb

@@ -18,48 +18,23 @@ module Flydata
         # login
         Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
 
-        # choose entries
-        unless shown = show_registered_entries and not more_entry?
-          begin
-            show_registered_entries unless shown
-            shown = false
-            path = choose_log_path_from_examples
-            case path
-            when OTHER; ask_log_path
-            else; create_log_entry(path, ask_log_deletion(path))
-            end
-            newline
-          end while more_entry?
-        end
-
-        # register cron if registered log deletion
-        register_crontab
+        begin
+          path = choose_log_path_from_examples
+          case path
+          when OTHER; ask_log_path
+          else; create_log_entry(path)
+          end
+          newline
+        end while more_entry?
 
         # start client process
-        Flydata::Command::Sender.new.restart
+        sender = Flydata::Command::Sender.new
+        sender.start
       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['display_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')
@@ -78,38 +53,31 @@ module Flydata
         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
+          break if FileTest.file?(path) and FileTest.readable?(path)
+          say(" ! #{path} is not a readable file!")
           newline
         end
-        create_log_entry(path, ask_log_deletion(path))
+        create_log_entry(path)
       end
-      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.")
-        ask_yes_no("Set auto log deletion mode?")
-      end
-      def create_log_entry(path, log_deletion)
+      def create_log_entry(path)
         data_port = flydata.data_port.get
-        flydata.data_entry.create(data_port_id: data_port['id'], log_path: path, log_deletion: log_deletion)
+        flydata.data_entry.create(data_port_id: data_port['id'], log_path: path)
         say("Process successfuly!") if flydata.response.code == 200
       end
       def more_entry?
-        ask_yes_no("Do you want to add more log path?")
+        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
       end
+      def newline; puts end
     end
   end
 end

data/lib/flydata/credentials.rb

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

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) + ".d")
+                                File.basename(@log_path))
       @backup_path = File.join(@flydata_path, BACKUP_DIR)
       @trash_path = File.join(@flydata_path, TRASH_DIR)
     end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.1.nc2
-  prerelease: 6
+  version: 0.0.1.2011101801
+  prerelease: 
 platform: ruby
 authors:
 - Koichi Fujikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409278880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409278880
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409278380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409278380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409277880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409277880
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409277360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409277360
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409276860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409276860
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409276380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409276380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409275880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409275880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409275400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409275400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409274900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409274900
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409274420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409274420
 - !ruby/object:Gem::Dependency
   name: autotest-standalone
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409273940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409273940
 - !ruby/object:Gem::Dependency
   name: autotest-notification
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409273460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,15 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409273460
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70220409272980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,12 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70220409272980
 description: FlyData Command Line Interface
 email: sysadmin@flydata.co
 executables:
@@ -241,18 +176,11 @@ 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/restart.rb
 - lib/flydata/command/routine.rb
 - lib/flydata/command/sender.rb
-- lib/flydata/command/setlogdel.rb
 - lib/flydata/command/setup.rb
-- lib/flydata/command/start.rb
-- lib/flydata/command/stop.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
@@ -275,16 +203,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3903877029269313970
+      hash: 1202166163575531449
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: FlyData CLI

data/lib/flydata/command/crontab.rb

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

data/lib/flydata/command/restart.rb

@@ -1,10 +0,0 @@
-module Flydata
-  module Command
-    class Restart < Base
-      def run
-        sender = Flydata::Command::Sender.new
-        sender.restart
-      end
-    end
-  end
-end

data/lib/flydata/command/setlogdel.rb

@@ -1,82 +0,0 @@
-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
-        set_log_deletion data_entry if confirm_setting data_entry
-        register_crontab
-      end
-
-      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|
-          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"
-
-        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_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']
-        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/start.rb

@@ -1,10 +0,0 @@
-module Flydata
-  module Command
-    class Start < Base
-      def run
-        sender = Flydata::Command::Sender.new
-        sender.start
-      end
-    end
-  end
-end

data/lib/flydata/command/stop.rb

@@ -1,10 +0,0 @@
-module Flydata
-  module Command
-    class Stop < Base
-      def run
-        sender = Flydata::Command::Sender.new
-        sender.stop
-      end
-    end
-  end
-end

data/lib/flydata/cron.rb

@@ -1,88 +0,0 @@
-module Flydata
-  class Cron
-    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 : ''
-
-      # 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/flydata_crontab.sh

@@ -1,116 +0,0 @@
-#!/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_HOME/bin/flydata routine >> $LOG_PATH 2>&1"
-if [[ "$FLYDATA_API_HOST" != "" ]]; then
-  ROUTINE_COMMAND="export FLYDATA_API_HOST=$FLYDATA_API_HOST && $ROUTINE_COMMAND"
-fi
-#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
-}
-
-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 to crontab."
-    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 from crontab."
-    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