rypple 0.0.2 → 0.0.3

data/lib/rypple/base.rb

@@ -26,10 +26,11 @@ module Rypple
     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."
-      puts "Please enter your Dropbox API key"
-      dropboxKeys['key'] = gets.chomp!
-      puts "Please enter your Dropbox API secret"
-      dropboxKeys['secret'] = gets.chomp!
+      print "Please enter your Dropbox API key:"
+      dropboxKeys = {}
+      dropboxKeys[:key] = gets.chomp!
+      print "Please enter your Dropbox API secret:"
+      dropboxKeys[:secret] = gets.chomp!
     end
 
     session = nil
@@ -83,21 +84,28 @@ module Rypple
     return conf
   end
 
-  def Rypple.cleanup(conf, keys, path)
+  def Rypple.saveConfig(conf, path)
     dropConfig = File.join(path, DropboxKeyFile)
     File.open(dropConfig, 'w') do|file|
       file.puts keys.to_yaml
     end
+  end
 
+  def Rypple.saveDropbox(keys, path)
     ryppleConf = File.join(path, RyppleConfigFile)
     File.open(ryppleConf, 'w') do |file|
       file.puts conf.to_yaml
     end
   end
 
+  def Rypple.cleanup(conf, keys, path)
+    Rypple.saveConfig(conf, path)
+    Rypple.saveDropbox(keys, path)
+  end
+
   # Iterates over dropbox directory, returing paths and state hash for each file
   # oldFileState should be a hash of paths to state hashes, same as return values
-  def Rypple.walkDropbox(client, path, fileState, oldFileState)
+  def Rypple.walkDropbox(client, path, oldFileState)
     #Here we need to actually sync newest files.
     begin
       useState = (!oldFileState.nil? and oldFileState.has_key?(path) and oldFileState[path]["path"] == path)
@@ -114,7 +122,7 @@ module Rypple
       states["contents"].each{ |xx|
         useState = (!oldFileState.nil? and oldFileState.has_key?(xx["path"]))
         old = (useState ? oldFileState[xx["path"]] : nil)
-        subs = Rypple.walkDropbox(client, xx["path"], fileState, old)
+        subs = Rypple.walkDropbox(client, xx["path"], old)
         if !subs.nil?
           files.merge!(subs)
         end
@@ -148,9 +156,8 @@ module Rypple
 
     destDir = conf[:destinationDir]
 
-    fileState = {}
     oldFileState = dropboxKeys[:files]
-    files = Rypple.walkDropbox(client, '/', fileState, oldFileState)
+    files = Rypple.walkDropbox(client, '/', oldFileState)
 
     if !files.nil?
       files.keys.each { |x|
@@ -175,7 +182,7 @@ module Rypple
       }
     }
 
-    dropboxKeys[:files] = Rypple.walkDropbox(client, '/', fileState, {})
+    dropboxKeys[:files] = Rypple.walkDropbox(client, '/', {})
     Rypple.cleanup(conf, dropboxKeys, path)
 
     return true

data/lib/rypple/version.rb

@@ -1,3 +1,3 @@
 module Rypple
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rypple
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jason Ziglar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 Z
+date: 2012-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll