flydata 0.0.2.3 → 0.0.3.rc1

data/VERSION

@@ -1 +1 @@
-0.0.2.3
+0.0.3.rc1

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.2.3"
+  s.version = "0.0.3.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2012-10-31"
+  s.date = "2012-11-14"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]
@@ -52,7 +52,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.24"
   s.summary = "FlyData CLI"
 
   if s.respond_to? :specification_version then

data/lib/flydata/api/base.rb

@@ -9,7 +9,7 @@ module Flydata
       end
       def create(params={})
         params.each {|k, v| @url_path.gsub!(/:#{k}/, v.to_s)}
-        @client.post(@url_path, @model_name => params)
+        @client.post(@url_path, nil, @model_name => params)
       end
     end
   end

data/lib/flydata/api_client.rb

@@ -14,20 +14,20 @@ module Flydata
     end
 
     # row level api
-    def post(path, params=nil)
-      uri = "#{FLYDATA_API_HOST}#{path}"
-      resource = RestClient::Resource.new(uri, resource_opts)
+    def post(path, headers = nil, params=nil)
+      uri = generate_auth_url(path)
+      resource = RestClient::Resource.new(uri, resource_opts(headers))
       @response = resource.post(params, :accept => :json)
       handle_response response
     end
     def put(path, params=nil)
-      uri = "#{FLYDATA_API_HOST}#{path}"
+      uri = generate_auth_url(path)
       resource = RestClient::Resource.new(uri, resource_opts)
       @response = resource.put(params, :accept => :json)
       handle_response response
     end
     def get(path)
-      uri = "#{FLYDATA_API_HOST}#{path}"
+      uri = generate_auth_url(path)
       resource = RestClient::Resource.new(uri, resource_opts)
       @response = resource.get(:accept => :json)
       handle_response response
@@ -47,11 +47,20 @@ module Flydata
       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
+      elsif json_response.class == Hash and json_response["auth_token"] 
+        @credentials.write_credentials(json_response["auth_token"])
       end
       json_response
     end
-    def resource_opts
-      {:user => @credentials.user, :password => @credentials.password}
+    def resource_opts(headers=nil)
+      # merge headers and default parameter
+      parameters = {}
+      parameters.merge(headers) if headers
+    end
+    def generate_auth_url(path) 
+      token = @credentials.token
+      token = '' unless token
+      "#{FLYDATA_API_HOST}#{path}?auth_token=#{token}"
     end
   end
 end

data/lib/flydata/command/login.rb

@@ -20,19 +20,11 @@ module Flydata
         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
+        flydata.post('/users/sign_in', {:user => email, :password =>password})
+        puts 'Thank you for logging in'
+        true
       end
     end
   end

data/lib/flydata/command/setup.rb

@@ -15,26 +15,41 @@ module Flydata
       end
 
       def run
-        # login
-        Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
+        # Check authentication token
+        begin
+          flydata.get('/data_entries')
+        rescue => e
+          if e.respond_to?('response') and e.response.code == 401
+            puts("Error logging in, Please enter login information")
+            Flydata::Command::Login.new.run #Check credentials for every run in case corruption
+          else
+            raise e
+          end
+        end
 
         # choose entries
-        unless shown = show_registered_entries and not more_entry?
+        unless (shown = show_registered_entries)
+          list = build_recommended_entries
+          print_recommended(list)
+          register_all(list) if ask_yes_no("Register all of these common entries?")
+        end
+        unless (shown ||= show_registered_entries) and not more_entry?
           begin
             show_registered_entries unless shown
             shown = false
+<<<<<<< HEAD
             path = choose_log_path_from_examples
             case path
             when OTHER; ask_log_path
-            else; create_log_entry(path, ask_log_deletion(path))
+            else; create_log_entry(path)
             end
+=======
+            choose_log_selection(list)
+>>>>>>> feature/auto_scan_logs
             newline
           end while more_entry?
         end
 
-        # register cron if registered log deletion
-        register_crontab
-
         # start client process
         Flydata::Command::Sender.new.restart
       end
@@ -87,7 +102,62 @@ module Flydata
           end
           newline
         end
-        create_log_entry(path, ask_log_deletion(path))
+        create_log_entry(path)
+<<<<<<< HEAD
+=======
+      end
+      def build_recommended_entries
+        path_options=[]
+        Dir['/var/log*/**/*log'].each{|f| if (FileTest.file?(f) and
+                                        FileTest.readable?(f) and
+                                        ( f =~ /apache2|httpd|syslog|mail|auth/)) and
+                                        !(@last_fetched_entries and @last_fetched_entries.any?{|e| e['log_path'] == f})
+                                        then path_options << f end}
+        path_options
+      end
+      def print_recommended(list, options=false)
+        newline
+        puts " Recommended list:"
+        list.each_with_index { |value, index|
+          puts "   #{index+1})   #{value} "
+        }
+        if options
+          puts("   #{list.length+1})   Enter your own path")
+        end
+        newline
+      end
+      def register_all(list)
+        list.each{ |item|
+          create_log_entry(item)
+        }
+        list.reject!{|x| x}
+      end
+      def choose_log_selection(list)
+        path = nil
+        list = build_recommended_entries unless list
+        path_options = list
+
+        loop do
+          if path_options.empty?
+            ask_log_path
+            return
+          end
+          print_recommended(path_options, true)
+          choice = Readline.readline("Here are some common logs, enter the number next to the logs to add the log. Input nothing to cancel.")
+          return if choice.empty?
+          if choice.to_i==path_options.length+1
+            ask_log_path
+            return
+          elsif (path_options[choice.to_i-1] != nil )
+            path = path_options[choice.to_i-1]
+            path_options.delete_at(choice.to_i-1)
+            break
+          else
+            puts("Not a valid entry, please try again"); 
+          end
+        end
+        create_log_entry(path)
+>>>>>>> feature/auto_scan_logs
       end
       def ask_log_deletion(path)
         unless File.writable?(path)
@@ -103,13 +173,13 @@ module Flydata
         say("For more details - http://docs.hapyrus.com/faq/how-log-deletion-works/")
         ask_yes_no("Set auto log deletion mode?")
       end
-      def create_log_entry(path, log_deletion)
+      def create_log_entry(path, log_deletion=false)
         data_port = flydata.data_port.get
         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
+        say("Process added successfuly!") if flydata.response.code == 200
       end
       def more_entry?
-        ask_yes_no("Do you want to add more log path?")
+        ask_yes_no("Do you want to add another log path?")
       end
     end
   end

data/lib/flydata/credentials.rb

@@ -1,41 +1,34 @@
 module Flydata
   class Credentials
     include Helpers
-    attr_reader :user, :password
-    def initialize(user=nil, password=nil)
+    attr_reader :token
+    def initialize
       read_credentials
-      if user && password
-        @user = user
-        @password = password
-      elsif !(@authenticated)
-        @user =  ENV['FLYDATA_LOGIN']
-        @password = ENV['FLYDATA_PASSWORD']
-      end
     end
     def authenticate!
       @authenticated = true
-      write_credentials
     end
     def authenticated?
       @authenticated
     end
-    def write_credentials
+    def write_credentials(token)
       dir = File.dirname(credentials_file)
       FileUtils.mkdir_p(dir)
       File.delete(credentials_file) if FileTest.exists?(credentials_file)
       File.open(credentials_file, 'w', 0400) do |out|
-        out.puts @user
-        out.puts encode(@password)
+	    out.puts token
       end
       FileUtils.chmod(0700, dir)
+      @token = token
     end
     def read_credentials
       if FileTest.exist?(credentials_file)
         File.open(credentials_file, 'r') do |f|
-          @user = f.gets.chomp
-          @password = decode(f.gets.chomp)
-          @authenticated = true if @user and @password
+          @token = f.gets.chomp
+          @authenticated = true if @token
         end
+      else
+        @token = nil
       end
     end
     private

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.2.3
-  prerelease: 
+  version: 0.0.3.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Koichi Fujikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -275,16 +275,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3501060614600902036
+      hash: 1831603908793813549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: FlyData CLI