dis 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769e16af4437ba86e74fcae272a4e7d893737cc1
-  data.tar.gz: 64330af5cd3172d8f94804391bbbab85c8f87435
+  metadata.gz: f063aea5fca2c1baf077761de89c6fde85db6b1f
+  data.tar.gz: dc15a0aeceea3f78a95ec92c96ef528353ca5741
 SHA512:
-  metadata.gz: 361ec8faf76e47ba5bb8185e4d34ea8f30667d395aee2530cf4956e021d3925d8f8196228506bfaa0080ef0a60d429f6915ceb67560be8cdde61e689749f3eb7
-  data.tar.gz: 0edc37ad592b0c61c01ff984b801e954472913b716d74d78f1556cfb23845d78600c64d0a925a8cd53cd205f582e52e6cf66a993677df93901111da0f33a432e
+  metadata.gz: b4bde9efdc4391dbeed1fa5e2abfc1dfb443fde7c1841bf65064a3f83e227bcd5a866f5b5178dd812575ebc8bd8e801acd48221f12467f62a1660367d0eb2010
+  data.tar.gz: c25a646f50936750cf90087934dd20ce0988139a5701d6b6b2b04102737596ac8c86fab865b2e181100a7b9dd15a6ff95c58c9ae55d28b3d0569703abaadd65f

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dis
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.0.7'.freeze
 end

data/lib/tasks/dis.rake

@@ -11,6 +11,8 @@ namespace :dis do
 
     models = ENV['MODELS'].split(',').map(&:strip).map(&:constantize)
 
+    jobs = Set.new
+
     models.each do |model|
       puts "-- #{model.name} --"
 
@@ -19,21 +21,43 @@ namespace :dis do
                 .select(content_hash_attr)
                 .uniq
                 .map { |r| r.send(content_hash_attr) }
+      global_missing = objects.dup
 
       puts "Unique objects: #{objects.length}"
 
       Dis::Storage.layers.each do |layer|
+        print "Checking #{layer.name}... "
         existing = objects
                    .pmap { |hash| [hash, layer.exists?(model.dis_type, hash)] }
                    .select(&:last)
                    .map(&:first)
         missing = objects - existing
-        puts "#{layer.name}: #{existing.length} (#{missing.length} missing)"
+        global_missing -= existing
+        puts "#{existing.length} existing, #{missing.length} missing"
+
+        next unless layer.delayed? #&& layer.writeable?
+
+        jobs += missing.pmap do |hash|
+          [model.dis_type, hash] if Dis::Storage.exists?(model.dis_type, hash)
+        end.compact
+      end
 
-        puts "Missing objects:\n#{missing.inspect}" if missing.any?
+      if global_missing.any?
+        puts "\n#{global_missing.length} objects are missing from all layers:"
+        pp global_missing
       end
 
       puts
     end
+
+    if jobs.any?
+      print "#{jobs.length} objects can be transferred to delayed layers, " \
+            "queue now? (y/n) "
+      response = STDIN.gets.chomp
+      if response =~ /^y/i
+        puts "Queueing jobs..."
+        jobs.each { |type, hash| Dis::Jobs::Store.perform_later(type, hash) }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails