smart_s3_sync 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8214123ba6189742c8b87d62600513448e54bf7f
-  data.tar.gz: 8aa4c37adacbedc3a1de7ec9ad07ebd4e7e155e5
+  metadata.gz: a368a353c21091f1acd3cfd2db6292e5f3ccdd8c
+  data.tar.gz: 1be713c432e980985fa5fd455fcfa71c1bce9d6a
 SHA512:
-  metadata.gz: 52dbcb5285295c8b7ecbc52fb116c3a98b9356fb64c362b7b5aa52fcbd46d06c2e9ade8168ee2ea1b3fec8b7cfaed9b33f4c20b64a543e1a55386fc4adbee468
-  data.tar.gz: c668bb00211a1340f2d25e10652414c9dbbed6201c75a537ed1cb78cd23a2e5bd4c7b1c691970bd5ec05ab858244b096574371f1937eebd30bf14dc96fbee589
+  metadata.gz: af6620d81c194070e162ce3a2d54241ca37d81a7676f58cc5d819c5fc22f6f8ef86f154476b2b969b66d8288ffe2986a7c617abfc1c9814eb2be3156c7126baf
+  data.tar.gz: faa3a79b469b21523181d7aaa3e293e71068d41b515d62cb80458fca7a2f923e0e44cb0ebb3eec128d2e15cb5ea3b16f4b891ccb496192151776a82857c8c6ae

data/.gitignore

@@ -1 +1,2 @@
 pkg
+Gemfile.lock

data/lib/smart_s3_sync.rb

@@ -13,9 +13,17 @@ module SmartS3Sync
       get(remote_dir, {:prefix => remote_prefix})
 
     # Add all files in the cloud to our map.
-    bucket.files.each { |file| table.push(file) }
+    print "Checking Files: 0"
+    checked = 0
+    bucket.files.each do |file|
+      table.push(file)
+      print "\b" * checked.to_s.length
+      print (checked += 1).to_s
+    end
 
-    puts "To Copy: #{table.to_copy.join(', ')}"
+    puts "\n"
+    puts "Status: Need to download #{table.to_download.length} files (#{table.to_download.map(&:size).inject(&:+)} bytes)"
+    puts "Status: with an effective total of #{table.to_copy.length} files (#{table.to_copy.map{|x| x.size * x.destinations.length }.inject(&:+)} bytes)"
 
     # And copy them to the right places
     table.copy!(bucket)
@@ -23,13 +31,14 @@ module SmartS3Sync
     # sweep through and remove all files not in the cloud
     Dir[File.join(dir, '**/*')].each do |file|
       if !File.directory?(file)
-        File.unlink(file) unless table.keep?(file)
+        File.unlink(file) and puts "DELETING: #{file}" unless table.keep?(file)
       end
     end
 
     # and then all empty directories
     Dir[File.join(dir, '**/*')].each do |file|
       if File.directory?(file) && Dir.entries(file).length == 0
+        puts "DELETING: #{file}"
         Dir.rmdir(file)
       end
     end

data/lib/smart_s3_sync/file_table.rb

@@ -11,7 +11,7 @@ module SmartS3Sync
 
     def push(fog_file)
       digest = hash_key(fog_file) # pull cloud calculated hex digest from file
-      @map[digest] ||= FileTarget.new(digest, fog_file.key) # grab or create target
+      @map[digest] ||= FileTarget.new(digest, fog_file.key, fog_file.content_length) # grab or create target
       destination_filename = File.expand_path(strip_prefix(fog_file.key), @root) # calculate local path
       @files.push destination_filename # add local path to global list of files to keep
       @map[digest].add_destination(destination_filename) # and add local path to the target
@@ -28,7 +28,11 @@ module SmartS3Sync
     end
 
     def to_copy
-      @map.map{|(k, target)| target.destinations }.flatten
+      @_tc ||= @map.select {|key, target| target.destinations.length > 0 }.map{|x, y| y }
+    end
+
+    def to_download
+      @_td ||= to_copy.select {|target| target.local_source.nil? }
     end
 
     private

data/lib/smart_s3_sync/file_target.rb

@@ -3,10 +3,11 @@ require 'smart_s3_sync/digest_cache'
 
 module SmartS3Sync
   class FileTarget
-    attr_reader :digest, :remote_filename, :local_source, :destinations
+    attr_reader :digest, :remote_filename, :local_source, :destinations, :size
 
-    def initialize(digest, remote_filename)
+    def initialize(digest, remote_filename, size)
       @digest          = digest
+      @size            = size
       @remote_filename = remote_filename
       @local_source    = nil
       @destinations    = []
@@ -41,7 +42,7 @@ module SmartS3Sync
     private
 
     def copy_from_fog(fog_dir)
-      puts "Downloading #{remote_filename}."
+      puts "Downloading #{remote_filename}"
       tries = 0
       file = nil
       begin
@@ -68,7 +69,7 @@ module SmartS3Sync
     end
 
     def copy_from_local(source)
-      puts "retrieved #{destinations.join(', ')}"
+      puts "Linking #{destinations.join(', ')}"
       destinations.each do |dest|
         FileUtils.mkdir_p(File.dirname(dest))
         FileUtils.ln(source, dest, :force => true)

data/lib/smart_s3_sync/version.rb

@@ -1,3 +1,3 @@
 module SmartS3Sync
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_s3_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Chris Rhoden
@@ -76,7 +76,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: .
-  specs:
-    smart_s3_sync (0.0.5)
-      fog
-      sqlite3
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    excon (0.37.0)
-    fog (1.22.1)
-      fog-brightbox
-      fog-core (~> 1.22)
-      fog-json
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.1.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto
-    fog-core (1.22.0)
-      builder
-      excon (~> 0.33)
-      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-json (1.0.0)
-      multi_json (~> 1.0)
-    formatador (0.2.5)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    rake (10.3.2)
-    sqlite3 (1.3.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  rake
-  smart_s3_sync!