britebox 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e800dec5d7cc7526497042fdd135dfeefb49b08
-  data.tar.gz: caef336a484073e5b13fdbe31ab1c72d92155281
+  metadata.gz: ae190d938423b74e7df0f20150c509aef201a73f
+  data.tar.gz: ef9bc4daf6cb23fe62984a4b55a5ce63315c9235
 SHA512:
-  metadata.gz: d8cf57385c286d5a807c0a3e04fc5c4ed0ec73754ebe1c0072d73951461b1d3285a63b93fe0f4dc94b5cd887e5209e5fe8fc2bdc80cd95257998e146005a87b6
-  data.tar.gz: a887c75d7e6423e5e17fccb2b226f16a13b97c91839676cab6f11d6856aaa84312a34796247dffffa3f73e1f53c1840d2efba86340320ef457a69fadd5b5c4ac
+  metadata.gz: f9f7b8ac141941117e93326f84bb93cda6615b9bc7d2247f97767bc9f03e4e395b958a4884a7dcba5c4eb11801e46da1f3f8362627a1085caa447d128c10f764
+  data.tar.gz: 6f5222d89f56495be4404e8f7907272573e372d93996914e43a5d1e9cbc45c54310bcf44c2986083b2f410bfebf4d576e079936814c93f58dc2bbd3d2b9a1521

data/bin/britebox

@@ -7,6 +7,9 @@ require 'britebox/cli'
 Thread.abort_on_exception = true
 THREAD_NUM_MAX = 10
 
+# Register action on Ctrl-C
+trap("SIGINT") { exit! }
+
 commands = ['watch']
 
 if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')

data/lib/britebox/cli.rb

@@ -18,12 +18,16 @@ module Britebox
         raise("Please provide directory-to-watch")
       end
 
+      raise("Directory #{@dir} does not exist") unless File.exists? @dir
+
       if params[:output]
         @out_dir = File.expand_path params[:output]
       else
         @out_dir = File.expand_path 'verified', @dir
       end
 
+      FileUtils.mkdir_p(@out_dir) unless File.exists? @out_dir
+
       fj_options = {threads: params[:threads]}
 
       puts "Watching directory #{@dir}"
@@ -32,10 +36,7 @@ module Britebox
 
       fj_pool = FileJobPool.new(params[:threads])
 
-      options = {filter: /\.(#{MONITOR_EXTENSIONS.join('|')})$/}
-      if @out_dir.include? @dir
-        options[:ignore] = Regexp.new "^" + @out_dir.sub(@dir + File::SEPARATOR, '')
-      end
+      options = {filter: /\.(#{MONITOR_EXTENSIONS.join('|')})$/, ignore: /\//}
 
       brite_client = BriteAPI::Client.new(@api_key)
 

data/lib/britebox/file_job.rb

@@ -4,7 +4,8 @@ require 'csv'
 module Britebox
   class FileJob
 
-    attr_reader :file_name, :threads_count, :error, :status, :size_total, :size_processed
+    attr_reader :file_name, :threads_count, :error, :status, :size_total, :size_processed,
+                :started_at, :processed_at
 
     EMAIL_PATTERN   = /(\S+)@(\S+)/
     COL_SEPARATORS = [";", "|", "\t"]
@@ -21,10 +22,12 @@ module Britebox
       @size_processed = 0
 
       unless File.exist?(file_name)
-        report_error!("File #{file_name} not found") and return
+        report_error!("File not found")
+        return
       end
       if (@size_total = File.size(file_name)) == 0
-        report_error!("File #{file_name} is empty") and return
+        report_error!("File is empty")
+        return
       end
 
       @semaphore = Mutex.new
@@ -34,6 +37,13 @@ module Britebox
       @threads_count * 4
     end
 
+    def duration
+      if @started_at
+        end_time = @processed_at || Time.now
+        end_time - @started_at
+      end
+    end
+
     def percent_complete
       if @size_total.to_i > 0
         (100.0 * @size_processed / @size_total).round(1)
@@ -68,6 +78,7 @@ module Britebox
       # Block processing if some another FileJob processing lines
       @queue.pop if @queue
 
+      @started_at = Time.now
       @status = 'verifying'
 
       @in_buffer = Queue.new
@@ -120,6 +131,7 @@ module Britebox
       @out_buffer.flush_backlog
       @out_buffer.close
 
+      @processed_at = Time.now
       @status = 'complete'
 
       # Release the lock
@@ -173,7 +185,7 @@ module Britebox
       end
 
       # Single column file
-      if @col_separator.nil? && test_lines.first.size == 1 && is_separator?(' ', test_lines)
+      if @col_separator.nil? && test_lines.first.size == 1 && !is_separator?(' ', test_lines)
         @col_separator = ','
       end
 

data/lib/britebox/file_job_pool.rb

@@ -6,7 +6,7 @@ module Britebox
     attr_reader :file_jobs
 
     SPINNERS = ["|", "/", "—", "\\"]
-    THREAD_NUM_DEFAULT = 8
+    THREAD_NUM_DEFAULT = 10
 
     def initialize(num_threads = nil)
       num_threads ||= THREAD_NUM_DEFAULT
@@ -84,6 +84,13 @@ module Britebox
           status_str = "#{fj.percent_complete} %".rjust(7)
         end
 
+        if fj.status != 'error'
+          status_str += ' | '
+          if fj.duration
+            status_str += Time.at(fj.duration.ceil).gmtime.strftime('%R:%S').gsub(/\A00:/,'').rjust(8)
+          end
+        end
+
         buffer << "\n#{fname.ljust(20)} | #{fj.status.to_s.ljust(9)} | #{human_size(fj.size_total).rjust(8)} | #{status_str}"
       end
 

data/lib/britebox/version.rb

@@ -1,3 +1,3 @@
 module Britebox
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: britebox
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexander Shapiotko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brite-api
@@ -58,7 +58,8 @@ files:
 - LICENSE
 - bin/britebox
 homepage: https://github.com/thousandsofthem/britebox
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: BriteVerify API CLI tool