datapimp 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42b604bf4e65ab42f866c53a65965fbda89a7f5
-  data.tar.gz: 93fb5195047c3526751a596dc37bea8f0f641b43
+  metadata.gz: cfce180729b6e2c602a86df40edd9349b4f282aa
+  data.tar.gz: 76b302c41cee05dab82b51bb42599c6b6b62db36
 SHA512:
-  metadata.gz: 1456e0203c464bf256bd59618b649336cdc81a22f5b0e9f404c41bb2e2a648d8bb72d0b8e8895ccc95f1142146ffe095fb1ed9f5a04f1dbfb481973ad33b4276
-  data.tar.gz: 9639178e9e730e702451a4215194f534808b60582cc42c1e3ebb06f46d305f7a6b9627c333048a6894a56eaa2e2d97e9586675b4f98fa2d76d109e7132585b17
+  metadata.gz: ea267a7bc421320087d31f270fb8faee86acbcc87469d3331a020cf9e57a20f8b6d107bb0e36213dc05f7b8ec4f874173e45fcee2d7dd1614f5f549a80d7c3b7
+  data.tar.gz: f1e7bb996b15243c674b6de6a8d5d6605bdadff11cea2c0f6629c3ce4de0ff9a080e6a9a4cd603bca6cdcf80f33469befd83bb9d9fb91353758537a476875a90

data/lib/datapimp/cli/sync.rb

@@ -4,29 +4,14 @@ command "sync folder" do |c|
 
   c.option '--type TYPE', String, "Which service is hosting the folder"
   c.option '--action ACTION', String, "Which sync action to run? push, pull"
+  c.option '--reset', nil, "Reset the local path (if supported by the syncable folder)"
 
   Datapimp::Cli.accepts_keys_for(c, :amazon, :google, :github, :dropbox)
 
   c.action do |args, options|
-    options.default(action:"pull", type: "dropbox")
-
+    options.default(action:"pull", type: "dropbox", reset: false)
     local, remote = args
-
-    folder = case
-             when options.type == "dropbox"
-               Datapimp::Sync::DropboxFolder.new(local: local, remote: remote)
-             when options.type == "google"
-               # Return the folders
-               # collection = Datapimp::Sync.google.api.collections.first
-               #
-               # svg = collection.files.first
-               # svg.export_as_file(/download/path, "image/svg+xml")
-               Datapimp::Sync::GoogleDriveFolder.new(local: local, remote: remote)
-             when options.type == "aws" || options.type == "s3"
-               Datapimp::Sync::S3Bucket.new(local: local, remote: remote)
-             end
-
-    folder.run(options.action, options.to_hash.to_mash)
+    Datapimp::Sync.dispatch_sync_folder_action(local, remote, options.to_hash)
   end
 end
 
@@ -44,7 +29,7 @@ command "sync data" do |c|
   Datapimp::Cli.accepts_keys_for(c, :google, :github, :dropbox)
 
   c.action do |args, options|
-    if options.type == "google-spreadsheet"
+    if options.type == "google-spreadsheet" || options.type == "google"
       Datapimp::DataSync.sync_google_spreadsheet(options, args)
     end
   end

data/lib/datapimp/sync/s3_bucket.rb

@@ -124,6 +124,12 @@ module Datapimp
       def run_pull_action(options={})
         directories = Datapimp::Sync.amazon.storage.directories
         bucket = directories.get(remote)
+        options = options.to_mash
+
+        if options.reset == true
+          FileUtils.rm_rf(local_path)
+          FileUtils.mkdir_p(local_path)
+        end
 
         bucket.files.each do |file|
           local_file = local_path.join(file.key)
@@ -131,7 +137,7 @@ module Datapimp
 
           FileUtils.mkdir_p(local_file.dirname)
 
-          local_file.open("w+") {|fh| log("Updating docs entry") ;fh.write(file.body) }
+          local_file.open("w+") {|fh| log("Updated #{ file.key }"); fh.write(file.body) }
         end
       end
 
@@ -157,9 +163,9 @@ module Datapimp
         elsif action == :create
           run_create_action(options)
         elsif action == :update_acl
-          run_update_acl_action(options={})
+          run_update_acl_action(options)
         elsif action == :pull
-          run_pull_action
+          run_pull_action(options)
         end
       end
     end

data/lib/datapimp/sync.rb

@@ -7,6 +7,34 @@ module Datapimp
       %w(dropbox amazon github google json excel nokogiri)
     end
 
+    # Create any type of syncable folder and dispatch a run call to it
+    # with whatever options you want.
+    #
+    # options:
+    #   - local: relative path to th local version of this folder
+    #   - remote: an identifier for the remote folder in the remote system
+    #   - action: push, pull, etc
+    def self.dispatch_sync_folder_action(local, remote, options)
+      options = options.to_mash
+      action = options.action
+
+      folder = case
+               when options.type == "dropbox"
+                 Datapimp::Sync::DropboxFolder.new(local: local, remote: remote)
+               when options.type == "google"
+                 # Return the folders
+                 # collection = Datapimp::Sync.google.api.collections.first
+                 #
+                 # svg = collection.files.first
+                 # svg.export_as_file(/download/path, "image/svg+xml")
+                 Datapimp::Sync::GoogleDriveFolder.new(local: local, remote: remote)
+               when options.type == "aws" || options.type == "s3"|| options.type == "amazon"
+                 Datapimp::Sync::S3Bucket.new(local: local, remote: remote)
+               end
+
+      folder.run(action, options)
+    end
+
     def self.amazon(options={})
       require 'datapimp/clients/amazon'
       Datapimp::Clients::Amazon.client(options)

data/lib/datapimp/version.rb

@@ -1,3 +1,3 @@
 module Datapimp
-  VERSION = "1.0.26"
+  VERSION = "1.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry