em-fs 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQzZDIyMzlkZGEzZGVjZjUwNzEyM2IyMmU2N2Y4YTJkMjZlNGIwOQ==
+    OTM1Y2ZmNTM1Nzc0ZTMxYjkxMTViYzUyNGYwYTcwOTk5YjA5MzVhZQ==
   data.tar.gz: !binary |-
-    YjE3MmY1NTI3YTc0NTE3MGIwM2VmY2M0YTZmZmUxYTY4ZTUwYWU4Yg==
+    NDE1YTI4ZmVhMWQ0ZTY1ZTdlYTE4NmRhMjFmYzQwYTliNDA1ODJmOQ==
 SHA512:
   metadata.gz: !binary |-
-    YjdjYjdkZjQ0ZGJjMzUzM2MwMjRkOWEyOGM5OGUzZWM2NzBjOGE5Y2Q4NGFh
-    NjFlYTA4OThkNTFlYTExY2NmMmQ2OWE2MjdjOWJjMDllNzU2NGNmOTVkYTE2
-    ZDRmYjZjOTJkNDJlYzM2Y2RhYTUwNjk3MDlkODM3ODk2NTZmN2M=
+    MDM0ZDlkN2M0OWM5MmE2NDFiNDViMmY3M2EzYWFlMDkwNGFjMGRiYjA3NWUy
+    YWM5ZTFkZTMyNWVkZTZlYmNkNmJjNjIxOTZkMjc1Y2QxMGY1NDQ2MmM0ZmVj
+    YmVjZjczNTg2ZDUyMTY4MDc3OTMzNGRlYjIwNjcyNzc2MTZmOWE=
   data.tar.gz: !binary |-
-    MThhMjNjYTc0NTI2OWI3MjQyZGQ3ZmY4ODc0YWQ5NThlYjExZmYyY2Q1OWQy
-    MTRhNTUzMzE0ZTc4ZDg1NDc1ZDVhZWMzZDk4ODJjOTAyNjYwNTdjNmUwZDEz
-    MjI0NWJmNmQ0ZjlkNDRmZThlYzEyZjMzNzJiMjU4Y2Q3NDIwYTI=
+    ZDkxMGNmZWQ3OWNhMDA0OWRlNzRiODc2MDMyOWRiNzRlYWM3NmZmOGRjYzg4
+    ZjBhNzgyZjdiZGYyZTU4MzE1ZWZiNjc0YzNjMTUxMTcyMmNlNzE4NWViN2Rl
+    MGY1Nzg0ZjkyMzU1OTU4NTFjZjkwMWQ0Yjg2ZmIyYjdhMWUxNmQ=

data/lib/em-fs/fs/command.rb

@@ -2,16 +2,24 @@
 module EventMachine
   class FS
     class Command < EM::SystemCommand
-
-      PROGRESS_REGEXP = /([A-Za-z0-9\.,\-\/]+)\n[ ]+([^ ]+)/.freeze
+      PROGRESS_REGEXP = /([^\n]+)\n[ ]+([^ ]+)[ ]+(.+)%/.freeze
 
       ##
       # Invokes `#execute` of super-class and adds a progress matcher.
       def execute &block
         super &block
 
-        stdout.match PROGRESS_REGEXP, match: :last, in: :output do |file, bytes|
-          receive_progress file, bytes.gsub(/[^\d]/,'').to_i
+        last_progress    = 0
+        last_progress_at = Time.new.to_f
+        stdout.match PROGRESS_REGEXP, match: :last, in: :output do |file, total_bytes, percentage|
+          progress = total_bytes.gsub(/[^\d]/,'').to_i
+          progress_at = Time.new.to_f
+          speed = (progress - last_progress) / (progress_at - last_progress_at)
+
+          receive_progress(file, progress, percentage.to_i, speed)
+
+          last_progress    = progress
+          last_progress_at = progress_at
         end
 
         self
@@ -25,9 +33,9 @@ module EventMachine
       #
       # @param [String] file The file that´s been updated.
       # @param [Integer] bytes The bytes moved or copied.
-      def receive_progress file, bytes
+      def receive_progress *args
         progress_callbacks.each do |cb|
-          cb.call file, bytes
+          cb.call(*args)
         end
       end
 

data/lib/em-fs/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class FS
-    VERSION = "0.1.1"
+    VERSION = '0.1.2'
   end
 end

data/spec/fs/rsync_command_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
-describe EM::FS::RsyncCommand do
+describe EM::FS::RsyncCommand, focus: true do
   context 'copying one file' do
     before :each do
       @source = File.join SPEC_ROOT, 'data', 'test'
       @target = File.join SPEC_ROOT, 'data', 'test.copy'
-      @progress_updates = {}
+      @progress_updates   = {}
+      @percentage_updates = {}
+      @speed_updates      = {}
       EM.run do
         EM::FS.rsync @source, @target do |on|
-          on.progress do |file, bytes|
-            (@progress_updates[file] ||= []) << bytes
+          on.progress do |file, bytes, percentage, speed|
+            (@progress_updates[file] ||= [])   << bytes
+            (@percentage_updates[file] ||= []) << percentage
+            (@speed_updates[file] ||= [])      << speed
           end
 
           on.exit do |status|
@@ -32,6 +36,18 @@ describe EM::FS::RsyncCommand do
       @progress_updates['test'].length.should be > 0
       @progress_updates['test'].last.should == 102400
     end
+
+    it 'should track percentages' do
+      @percentage_updates.values.flatten.each do |percentage|
+        percentage.should be_a Integer
+      end
+    end
+
+    it 'should track speed' do
+      @speed_updates.values.flatten.each do |speed|
+        speed.should be_a Float
+      end
+    end
   end
 
   context 'copying multiple files' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-fs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Arthur Leonard Andersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake