qqq 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221dbef300b4bf5d3f57a4be9fc0ef9584358981e914c17857d110ec42e20a09
-  data.tar.gz: bac7bd7c093ce99079eb74d3ad71cf598e8a3d80c37cff9bf089f5ac7e0398f4
+  metadata.gz: 901963455ef035a7b1055749513102b79fa568304c668038a585dcff606f73b8
+  data.tar.gz: 7de4aa5267b50b0d62b8815237ad61e36111d0859a0f7379f5d83388dc03ebf8
 SHA512:
-  metadata.gz: d57613b3bec97a6e8871006fa16874cf59ed71baac77c79eb0d57e201cb16f0ee724c1950d4208175b696d2a3e8901f36f342257b2d24e1da73816574a7a37e6
-  data.tar.gz: e43afd5dfe602d67b16e76e8d2925717c73611877aed0e336a16befe966d3c5b6a91f704ee7b48ea3e20a6f663df4d412d6b8762198d973cd1b622dc52575c6c
+  metadata.gz: f3739b7a3fcbc083cf1017e64c5fc0182e120afb6b6e9736c69bfd6f175497ecbb8a79971e749e689622367f3b77df12802ad088f22f259403ba2da6fea4cfc2
+  data.tar.gz: 471fc79d97ac7583978b2582eaa4bb77366e58e9cd445abf750069f399ec308e7232a175f1aaeac8e482262f1efb949dc945797213906abcae847fc10d8e488b

data/CHANGELOG.org

@@ -1,39 +1,59 @@
-* Milestone I
+
+* Version 0.1.0 - Milestone I
 
 "Better than puts"
 
 features
-- [ ] object inspection
-- [ ] metaprogramming / reflection
-
-- [ ] rich data
-- [ ] recorded timestamp and uuid recorded in db
+- [X] recorded timestamp and uuid recorded in db
 - [X] record in a database
 - [X] send to an api
 - [X] timestamps 
 - [X] send message from command line
 - [X] tail and mark from command line
-- [ ] did not run (no wondering if line didn't run)... possible?
-- [ ] increments if run multiple times..
-- [ ] start / stop 'marks' 
 
-dev 
+dev
+- [ ] simplify dashboard 
 - [X] create rudimentary uh... dashboard/orchestration
 - [X] Tighten e2e.sh test.
-- [ ] local gem dev - de-req rake install loop
-- [ ] some sort of handshake system for handling processes
+
+** 0.1.1 
+
+table stakes
+- [ ] some sort of supervisor around cli, etc. e.g. api send dies if server not up yet. should hang out and retry
+- [ ] update documentation
+- [ ] general presentation polish
+- [ ] more tests? CI?
+
+features
+- [ ] a way to specifiy redis config (my qqq's in tests are getting lost to a fake redis)
 
 * Milestone II
 
 features
+- [ ] did not run (no wondering if line didn't run)... possible?
+- [ ] increments if run multiple times..
+- [ ] start / stop 'marks' 
 - [ ] some recent history (last 100?) when I start tailing
 - [ ] q, qq, qqq levels
 - [ ] file worker (append to /tmp/qqq)
 - [ ] plugin arch for worker 
 - [ ] updated development documentation 
 - [ ] api key to follow me around (~/.qqq.conf or whatever) 
+- [ ] updating webapp (websockets) 
+- [ ] handles complex object printing
+- [ ] rich data
+- [ ] metaprogramming / reflection
+- [ ] config panel to turn on/off 'q steams'
 
-dev 
+
+dev
+- [ ] some sort of handshake system for handling processes
+- [ ] local gem dev - de-req rake install loop 
 - [ ] split out configuration (yaml?) for 'service' interaction
 - [ ] split the development panel / user panel 
-- [ ] config panel to turn on/off 'q steams'
+
+* Beyond
+
+- move to a ruby only actor model? (https://github.com/ntl/actor)
+- consider other options?
+- electron app for dashboard? get away from shell stuff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qqq (0.1.0)
+    qqq (0.1.1)
       activerecord
       faraday
       json
@@ -14,32 +14,32 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (0.9.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    i18n (1.5.2)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     minitest (5.11.3)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     mustermann (1.0.3)
     mysql2 (0.5.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-protection (2.0.5)
       rack
     rake (10.5.0)

data/Rakefile

@@ -3,10 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :critical
-
-desc "Critical path suite"
-task :critical do
-  `sh spec/e2e.sh`
-end
-
+task :default => :spec

data/lib/qqq/api.rb

@@ -2,10 +2,10 @@ require 'faraday'
 
 module QQQ
   module API
-    def self.publish(msg)
+    def self.publish(event)
       conn = Faraday.new(:url => "http://localhost:3600")
-      resp = conn.post '/messages', { :message => { message: msg } }
+      resp = conn.post '/events', { :event => event.as_json }
       puts resp.status, resp.body
     end
   end
-end
+end

data/lib/qqq/cli.rb

@@ -7,16 +7,15 @@ module QQQ
 
     desc :tail, "Tails the qqq log"
     def tail
-      puts "hi"
-      QQQ.subscribe do |msg|
-        puts msg
+      QQQ.subscribe do |event|
+        puts event.message
       end
     end
 
     desc :payload, "For now- separate tail"
     def payload
-      QQQ.subscribe_payload do |payload|
-        puts payload.to_s
+      QQQ.subscribe do |event|
+        puts event.to_s
       end
     end
 
@@ -32,12 +31,18 @@ module QQQ
 
     desc :send, "Sends message to a remote server"
     def send
-      QQQ.subscribe do |msg|
-        puts "Remotely publishing: #{msg}"
-        API.publish(msg)
+      QQQ.subscribe do |event|
+        puts "Remotely publishing: #{event.message}"
+        API.publish(event)
       end
     end
 
+    desc :version, "Publishes the version number"
+    def version
+      puts "QQQ Version #{QQQ::VERSION}"
+      QQQ.publish(QQQ::VERSION)
+    end
+
     # desc :server, "Starts server to receive message"
     # def server
     #   Sinatra....how?

data/lib/qqq/event.rb

@@ -1,10 +1,30 @@
 module QQQ
   class Event
+
+    attr_reader :uuid, :message, :recorded_at
+
+    def self.from(json_string:)
+      payload = JSON.parse json_string
+      puts payload
+      Event.new(uuid: payload["uuid"], message: payload["message"], recorded_at: payload["recorded_at"])
+    end
+
     def initialize(uuid:, message:, recorded_at:)
       @uuid = uuid
       @message = message
       @recorded_at = recorded_at
     end
 
+    def as_json(options={})
+      { uuid: @uuid,
+        message: @message,
+        recorded_at: @recorded_at,
+      }
+    end
+
+    def to_json(*options)
+      as_json(*options).to_json(*options)
+    end
+
   end
-end
+end

data/lib/qqq/keys.rb

@@ -1,6 +1,6 @@
 module QQQ
   module Keys
     MESSAGES_CHANNEL_KEY = "qqq::messages_channel"
-    PAYLOAD_CHANNEL_KEY = "qqq::payload_channel"
+    EVENT_CHANNEL_KEY = "qqq::payload_channel"
   end
 end

data/lib/qqq/version.rb

@@ -1,3 +1,3 @@
 module QQQ
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/qqq.rb

@@ -2,6 +2,7 @@ require 'redis'
 require 'json'
 
 # Lib
+require 'qqq/event'
 require 'qqq/api'
 require 'qqq/cli'
 require 'qqq/keys'
@@ -12,45 +13,45 @@ require 'uuidtools'
 module QQQ
   class Error < StandardError; end
 
-  # message = 'hi'
+  # message = "hello world"
   def self.qqq(message)
     publish(message)
   end
 
   def self.publish(message)
-    @redis = Redis.new
-
-    uuid = UUIDTools::UUID.random_create()
+    uuid = UUIDTools::UUID.random_create().to_s
     timestamp = Time.now
 
     message_for_humans = "[#{uuid}] [#{timestamp}] #{message}"
-    @redis.publish(Keys::MESSAGES_CHANNEL_KEY, message_for_humans.to_json)
+    redis.publish(Keys::MESSAGES_CHANNEL_KEY, message_for_humans.to_json)
 
-    payload = {message: message, uuid: uuid, recorded_at: timestamp}
-    @redis.publish(Keys::PAYLOAD_CHANNEL_KEY, payload.to_json)
+    event = Event.new(uuid: uuid, message: message, recorded_at: timestamp)
+    redis.publish(Keys::EVENT_CHANNEL_KEY, event.to_json)
   end
 
   def self.subscribe &block
-    @redis = Redis.new
-    @redis.subscribe Keys::MESSAGES_CHANNEL_KEY do |on|
+    redis.subscribe Keys::EVENT_CHANNEL_KEY do |on|
       puts "Connected..."
 
-      on.message do |channel, msg|
-        block.call(msg)
+      on.message do |channel, event_json_string|
+        event = Event.from(json_string: event_json_string)
+        block.call(event)
       end
     end
   end
 
-  def self.subscribe_payload &block
-    @redis = Redis.new
-    @redis.subscribe Keys::PAYLOAD_CHANNEL_KEY do |on|
-      puts "Connected..."
+  private
 
-      on.message do |channel, payload_json_string|
-        payload = JSON.parse payload_json_string
-        block.call(payload)
-      end
+  def self.redis
+    puts "wha hoo"
+    if defined?(FakeRedis) && FakeRedis.enabled?
+      FakeRedis.disable
+      @redis ||= Redis.new
+      FakeRedis.enable
+    else
+      @redis ||= Redis.new
     end
   end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qqq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jon Skulski