clockker 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7404b361d1f21b145d39ff872ed9901c19f7944
-  data.tar.gz: 7af9d8d18fdbfaf1779250f579a24fa8ef7e57c7
+  metadata.gz: b3089d570b9f0d1ad6335a44c1a4674c99b94e40
+  data.tar.gz: 82133e63ff5da97a15bcdee6bfcdf76503a62c9c
 SHA512:
-  metadata.gz: 66432b991bcbd96026f1761bd87211afad2b626e47df12b9627367cb767574ea2eb34f255b58fca4e17c369970e4bcbd7b1327d95f8b0eb981283317d68c7bf8
-  data.tar.gz: 69bd52efc272a2fa17ed05893e234b81a533d148548c5a1da5bb1afbd215d84b76fac85fb7adda1775cae0eefe5096ff38de45e084bff90cc106ea06b1e5ece6
+  metadata.gz: 2b794a8121b1b8d2044337d2bf4c44831e7420dca280c19a790d5d849b818fc12266dcf4dce0c81cd4d45e3ef2a77de98ba9ddb58d778525752ddaca7446853d
+  data.tar.gz: 4a4aff4b8b7e5dbe55b3eaeb776bc367c62ab593d8ee0447593ba1df338de5e2515092e6e61dbaab3c83e9f3b753ff385484cb32a8104d2c823b549f6b864b04

data/README.md

@@ -65,14 +65,12 @@ Instead of using the command-line options, you can specify a default configurati
   "blacklist": [
     "/Users/paul/Library",
     "/Users/paul/Pictures",
-    "/Users/paul/.dropbox",
-    "/tmp/",
-    "/log/",
-    "/logs/"
+    "/Users/paul/.dropbox"
   ]
 }
 ```
 
+Note: Version 0.1.0 is the Clockker configuration file version.
 
 ## Development
 

data/lib/clockker/version.rb

@@ -1,5 +1,5 @@
 module Clockker
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 
   def self.macos_version
     @mov ||= `sw_vers -productVersion`

data/lib/clockker/watcher.rb

@@ -44,7 +44,11 @@ module Clockker
         event_meta['events'].each do |event|
           next if white_black_list.ignore?(event['path'])
           count += 1
-          @submitter_queue << {touched_at: t, contents: event['path'], type: "file", metadata: {flags: event['flags'], id: event['id']}}
+          file_path = Pathname.new(event['path'])
+          dirs, name = file_path.split
+          last_dir = dirs.split[-1]
+          title = (last_dir + name).to_s
+          @submitter_queue << {touched_at: t, contents: file_path.to_s, meta_type: "file", metadata: {title: title, file_path: file_path.to_s}}
         end
         logger.debug "#{Time.now} checked #{event_meta['numEvents']} events and added #{count} to the submitter_queue"
       end
@@ -84,8 +88,7 @@ module Clockker
           id, visited_at, visit_time, title, url = row
           visited_at = Time.parse(visited_at+"Z") # the time is already UTC; let's make doubly sure!
           # TODO check the whitelisted domain regexes to see if we can submit this one.
-          logger.info " - #{visited_at} - #{url} - #{title}"
-          @submitter_queue << {touched_at: visited_at, contents: url, type: "url", metadata: {title: title}}
+          @submitter_queue << {touched_at: visited_at, contents: url, meta_type: "url", metadata: {url: url, title: title}}
           last_time = visit_time
         end
 
@@ -133,7 +136,7 @@ module Clockker
           end
 
           begin
-            dev_data = {artifacts: @changeset.map{|c| {contents: c[:contents], touched_at: c[:touched_at].strftime("%Y-%m-%d %H:%M:%S"), type: c[:type], metadata: c[:metadata], identifier: identifier, agent: Clockker.version}}}.to_json
+            dev_data = {artifacts: @changeset.map{|c| {contents: c[:contents], touched_at: c[:touched_at].strftime("%Y-%m-%d %H:%M:%S"), meta_type: c[:meta_type], metadata: c[:metadata], identifier: identifier, agent: Clockker.version}}}.to_json
 
             # temporarily we're keeping the old data structure, until all of our APIs are up to date.
             prod_data = @changeset.find_all{|c| c[:type] == "file"}

data/lib/clockker/white_black_list.rb

@@ -7,12 +7,21 @@ module Clockker
     # blacklist_path should return an array of absolute paths that are to be ignored. Implicitly any path that isn't whitelisted is blacklisted; this method is only useful if it returns subpaths of whitelisted paths. i.e. /Users/paul/Documents is whitelisted, but /Users/paul/Documents/customers/Bell is blacklisted.
     attr_accessor :whitelist, :blacklist
 
+    DEFAULT_BLACKLIST = [
+      "/tmp/",
+      "/log/",
+      "/logs/",
+      "/node_modules/",
+      "/dist/",
+      "/build/", "/_build/",
+      "/private/",
+      '\/\..+'  # hide .* files
+    ]
+
     def initialize(clockker_config)
       @whitelist = clockker_config.whitelist.map{|wl| Regexp.new(wl)}
       @blacklist = clockker_config.blacklist.map{|bl| Regexp.new(bl)}
-
-      # hide .* files
-      @blacklist << /\/\..+/
+      @blacklist += DEFAULT_BLACKLIST.map{|bl| Regexp.new(bl)}
 
       # Now set defaults in the absence of a config file
       @whitelist ||= [ Regexp.new(Pathname.new(Dir.home).to_s) ]
@@ -26,6 +35,5 @@ module Clockker
       return false if file_matches_whitelist
       return true
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clockker
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul Doerwald
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent