hakuban 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6822f983334fd24d18385b13f77352026609b85e2f386760b00bae8e60e53cb
-  data.tar.gz: e90301ced5b302e23fcc4c3da3d59c9ac32bf9e22d472272ff43bdb8ad78eadc
+  metadata.gz: 8c827f2e6b27d41fbc349a9928b2039fc04b9cd139ce90641491b3dee250482c
+  data.tar.gz: 6081be62f7bc8abf6ea90543ee79543bc6b7f20678fbe5cce38bd72fc09de897
 SHA512:
-  metadata.gz: 22eb5c5b3223bd25d7b3dea31f52134f9a71a07a1fcdf06e4d6077dc27df689e57a9e92cb059919f283f8708bfbe26e9ed679cdaeee7631d1203eedc4254aa85
-  data.tar.gz: e39db8ea279d53883c61333768928aca255891e105dfb27e82e6ddc88f73a1128fe0b9972da59921074479272ed7baf32b0317dc933bebef1664568414469e8c
+  metadata.gz: 36ed621045173a200cdcf65832f6c126496aae26584c74fc07ceebc303b22f387e22852b03034b0b97164b0b06e739c5b192d06babc275c49b75a8ca5b872f4a
+  data.tar.gz: 35bb3c5a6937b3fbecf3088d90f2da945e7b6643d736df272896eb5a8a2c624bf62629e2c598a2206a4a98bab444f0a6b3736aed803d04c085a2746d54d43653

data/bin/hakuban-observer

@@ -2,7 +2,7 @@
 
 require 'slop'
 require 'pp'
-require 'hakuban/async'
+require 'hakuban/thread'
 
 
 OPTIONS = Slop.parse { |o|
@@ -27,30 +27,38 @@ else
 end		
 
 
-def print_event(descriptor, event)
-	puts "-"*120
-	puts "Event: " + event
-	puts "Descriptor: "
-	descriptor.tags.each { |tag|
-		puts "\tTags: " + JSON.dump(tag.json)
-	}
-	puts "\tJSON: " + JSON.dump(descriptor.json)
+def print_event(descriptor, event, more)
+	if $subsequent 
+		puts ','
+	else
+		$subsequent = true
+	end
+	puts '{'
+	puts '"event": "%s",'%[event]
+	puts '"descriptor_json": %s,'%[JSON.dump(descriptor.json)]
+	puts '"descriptor_tags": [%s],'%[descriptor.tags.map { |tag| JSON.dump(tag.json) }.join(",")]
+	puts more  if more
+	puts '}'
 end
 
-Async {
-			
-	observe_contract.async { |object|
-		print_event(object.descriptor, "create")
-		while object.next_change
-			print_event(object.descriptor, "change")
+
+puts "["
+
+contract = observe_contract.manage.with_thread { |object|
+	print_event(object.descriptor, "create", nil)
+	while object.next_change
+		print_event(object.descriptor, "change", 
 			if state = object.state
-				puts "Version: " + state.version.inspect
-				puts "Last synchronized: " + state.synchronized.to_s + "ms ago"
-				puts "Data:\n"
-				pp state.data
+				[
+					'"version": %s,'%[JSON.dump(state.version)],
+					'"last_sync_ms_ago": %s,'%[JSON.dump(state.synchronized)],
+					'"data": %s,'%[JSON.dump(state.data)],
+				].join("\n")
 			end
-		end
-		print_event(object.descriptor, "drop")
-	}
-
+		)
+	end
+	print_event(object.descriptor, "drop", nil)
 }
+
+$stdin.read(1)
+puts "]"

data/lib/hakuban/manager.rb

@@ -48,6 +48,9 @@ module Hakuban
 
 		class Event < OpenStruct; end
 		class HandlerException < OpenStruct; end
+		if not defined?(:Async)
+			module Async; class Stop < Exception; end; end  #in case Async is not included, meh
+		end  
 
 		def initialize(contract, block, retry_backoff, terminate_on_deactivation, on_exception_policy)
 			@contract = contract
@@ -394,4 +397,4 @@ module Hakuban
 
 	end
 
-end
+end

data/lib/hakuban/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hakuban
-	VERSION = "0.6.3"
+	VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hakuban
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-12 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec