flydata 0.0.3.5 → 0.0.3.6

data/VERSION

@@ -1 +1 @@
-0.0.3.5
+0.0.3.6

data/flydata.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.3.5"
+  s.version = "0.0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]

data/lib/flydata/command/setup.rb

@@ -15,17 +15,8 @@ module Flydata
       end
 
       def run
-        # 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
+        #login
+        Flydata::Command::Login.new.run unless flydata.credentials.authenticated?
 
         # choose entries
         unless (shown = show_registered_entries)
@@ -37,15 +28,7 @@ module Flydata
           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)
-            end
-=======
             choose_log_selection(list)
->>>>>>> feature/auto_scan_logs
             newline
           end while more_entry?
         end
@@ -103,8 +86,6 @@ module Flydata
           newline
         end
         create_log_entry(path)
-<<<<<<< HEAD
-=======
       end
       def build_recommended_entries
         path_options=[]
@@ -157,7 +138,6 @@ 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.5
+  version: 0.0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3676718197553447961
+      hash: -292233040597083940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: