flydata 0.0.3.4 → 0.0.3.5

data/VERSION

@@ -1 +1 @@
-0.0.3.4
+0.0.3.5

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.3.4"
+  s.version = "0.0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2012-11-14"
+  s.date = "2013-01-10"
   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.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "FlyData CLI"
 
   if s.respond_to? :specification_version then

data/lib/flydata/api_client.rb

@@ -6,11 +6,13 @@ module Flydata
 
   class ApiClient
     include Singleton
+    include Helpers
     attr_reader :response
     attr_accessor :credentials
 
     def initialize
       @credentials = Flydata::Credentials.new
+      read_flydata_api_host
     end
 
     # row level api
@@ -42,6 +44,21 @@ module Flydata
     def respond_to_missing?(method_name, include_private=false); true end
 
     private
+    def read_flydata_api_host
+      if FileTest.exist?(flydata_api_host_file)
+        File.open(flydata_api_host_file, 'r') do |f|
+          @flydata_api_host = f.gets.chomp
+          @flydata_api_host = FLYDATA_API_HOST unless @flydata_api_host and not @flydata_api_host.empty?
+        end
+      else
+        @flydata_api_host = FLYDATA_API_HOST
+      end
+      # delete the '/'
+      @flydata_api_host = @flydata_api_host[0..-2] if @flydata_api_host =~ /\/$/
+    end
+    def flydata_api_host_file
+      File.join(home_directory, '.flydata', 'flydata_api_host')
+    end
     def handle_response(response)
       json_response = JSON.parse(response)
       if json_response.class == Hash and json_response["success"] == false
@@ -60,7 +77,7 @@ module Flydata
     def generate_auth_url(path) 
       token = @credentials.token
       token = '' unless token
-      "#{FLYDATA_API_HOST}#{path}?auth_token=#{token}"
+      "#{@flydata_api_host}#{path}?auth_token=#{token}"
     end
   end
 end

data/lib/flydata/command/setup.rb

@@ -30,22 +30,22 @@ module Flydata
         # choose entries
         unless (shown = show_registered_entries)
           list = build_recommended_entries
-          if list.empty?
-            newline
-            puts("  No common log paths found. This may be because you are not root user.")
-            puts("  If you have access to the root user, try the command below")
-            puts("     $ sudo ~/.flydata/bin/flydata setup")
-            puts("  Otherwise, please input log path below")
-          else
-            print_recommended(list)
-            register_all(list) if ask_yes_no("Register all of these common entries?")
-          end
+          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
-            choose_log_selection
+<<<<<<< HEAD
+            path = choose_log_path_from_examples
+            case path
+            when OTHER; ask_log_path
+            else; create_log_entry(path)
+            end
+=======
+            choose_log_selection(list)
+>>>>>>> feature/auto_scan_logs
             newline
           end while more_entry?
         end
@@ -103,6 +103,8 @@ module Flydata
           newline
         end
         create_log_entry(path)
+<<<<<<< HEAD
+=======
       end
       def build_recommended_entries
         path_options=[]
@@ -130,9 +132,10 @@ module Flydata
         }
         list.reject!{|x| x}
       end
-      def choose_log_selection
+      def choose_log_selection(list)
         path = nil
-        path_options = build_recommended_entries
+        list = build_recommended_entries unless list
+        path_options = list
 
         loop do
           if path_options.empty?
@@ -142,9 +145,7 @@ module Flydata
           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 not choice =~ /^[1-9][0-9]*$/
-            puts("Not a valid entry, please try again");
-          elsif choice.to_i==path_options.length+1
+          if choice.to_i==path_options.length+1
             ask_log_path
             return
           elsif (path_options[choice.to_i-1] != nil )
@@ -156,6 +157,7 @@ module Flydata
           end
         end
         create_log_entry(path)
+>>>>>>> feature/auto_scan_logs
       end
       def ask_log_deletion(path)
         unless File.writable?(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.0.3.4
+  version: 0.0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2013-01-10 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: -3302561874043640605
+      hash: -3676718197553447961
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: FlyData CLI