rypple 0.0.4 → 0.0.5

data/lib/rypple/base.rb

@@ -12,44 +12,25 @@ module Rypple
     :dropbox => {
       :root => '/',
       :sync => ['**'],
-      :access_type => :app_folder,
     }
   }
 
-  DropboxKeyFile = "dropbox_session.yaml"
-  RyppleConfigFile = "rypple.yaml"
+  DropboxKeyFile = "dropbox_session.yml"
+  RyppleConfigFile = "rypple.yml"
 
   def Rypple.connectToDropbox(path)
+    session = nil
+    dropboxKeys = {:access_type => :app_folder}
     dropConf = File.join(path, DropboxKeyFile)
     #Load Dropbox API dropboxKeys from file, if applicable.
     if File.exists?(dropConf)
       dropboxKeys = YAML::load(File.read(dropConf))
-    else
-      puts "A Dropbox API key/secret is required for accessing your sync files."
-      puts "You can visit https://www.dropbox.com/developers/apps to generate these."
-      print "Please enter your Dropbox API key:"
-      dropboxKeys = {}
-      dropboxKeys[:key] = gets.chomp!
-      print "Please enter your Dropbox API secret:"
-      dropboxKeys[:secret] = gets.chomp!
-      print "Should this API access be used in sandbox mode? (Y/n):"
-      answer = gets.downcase.chomp
-      if !answer.empty? and answer == 'n'
-        dropboxKeys[:access_type]= :dropbox
-      end
     end
 
-    session = nil
-
     if dropboxKeys.has_key?(:session)
       session = DropboxSession.deserialize(dropboxKeys[:session])
     else
-      session = DropboxSession.new(dropboxKeys[:key], dropboxKeys[:secret])
-      session.get_request_token
-      authorize_url = session.get_authorize_url
-      puts "Visit #{authorize_url} to log in to Dropbox. Hit enter when you have done this."
-      gets
-      session.get_access_token
+      dropboxKeys[:access], session = Rypple.buildLoginSession()
     end
 
     if session.nil?
@@ -90,6 +71,29 @@ module Rypple
     return conf
   end
 
+  def Rypple.buildLoginSession()
+    puts "A Dropbox API key/secret is required for accessing your sync files."
+    puts "You can visit https://www.dropbox.com/developers/apps to generate these."
+    print "Please enter your Dropbox API key:"
+    key = gets.chomp!
+    print "Please enter your Dropbox API secret:"
+    secret = gets.chomp!
+    access = :app_folder
+    print "Should this API access be used in sandbox mode? (Y/n):"
+    answer = gets.downcase.chomp
+    if !answer.empty? and answer == 'n'
+      access = :dropbox
+    end
+
+    session = DropboxSession.new(key, secret)
+    session.get_request_token
+    authorize_url = session.get_authorize_url
+    puts "Visit #{authorize_url} to log in to Dropbox. Hit enter when you have done this."
+    gets
+    session.get_access_token
+    return access, session
+  end
+
   def Rypple.saveDropbox(keys, path)
     dropConfig = File.join(path, DropboxKeyFile)
     File.open(dropConfig, 'w') do|file|

data/lib/rypple/version.rb

@@ -1,3 +1,3 @@
 module Rypple
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rypple
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jason Ziglar