redfish_tools 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dde903d12481a6fcfd6d1ad22361a3241aa66e6b352749343c815bf7e8c41d2
-  data.tar.gz: 4c3093c8e30d947371aecb3d1ebe33b7a6450ee23ab5bfd920388fdf4b564f6a
+  metadata.gz: fc9c77cc1157ae9cd393037166415de232253227a598a0e6a6e4f21cb13d7099
+  data.tar.gz: eaa18973472a9ade244813bf46430f8aa185a0cf9f374e7608020995796c3c00
 SHA512:
-  metadata.gz: 38949cd88d05c30c39bbb9c9a37aa318084ab12d10aa3d9501bf2419f08ee88e6002ed0c4426940b40b0a0ec790c79604a00b97f194b871879656cb9037422ae
-  data.tar.gz: 18ec60a00bf481fab900a3c8d9a50629209d3b6f3bcb40dd4301526fc425e14858b907d2925ef7a1a9f8fd4565fb85498f4c29319e17fa3fcf84565310985831
+  metadata.gz: 4b622a6604c1c5584055108cc19ad6a637b619cb5dc6a2890b4f0dcf016903b55b9ec190444dfad7369dce497a776073f992de46ece288f98b2feef1bf07469c
+  data.tar.gz: 2d4b1ebf6bb2761b0f0853ee741dca6ff1d5e5a36b8700301ad8307f8ad857498d6a9e6d444019f9604ab149ab3fa35985ed337aa00a8fa7b5cbbf816543fe0e

data/lib/redfish_tools/cli.rb

@@ -67,5 +67,28 @@ module RedfishTools
     rescue StandardError => e
       raise Thor::Error, e.to_s
     end
+
+    desc "serve_sse [OPTIONS] SOURCE", "serve events from SOURCE"
+    option :port,
+           desc: "port that should be used to serve events",
+           default: 8001,
+           type: :numeric
+    option :bind,
+           desc: "address that server should bind to",
+           default: "127.0.0.1"
+    option :ssl,
+           desc: "use SSL",
+           default: false,
+           type: :boolean
+    def serve_sse(source)
+      require "redfish_tools/cli/serve_sse"
+      ServeSse.new(source, options).run
+    end
+
+    desc "listen_sse ADDRESS", "listen to events from ADDRESS"
+    def listen_sse(address)
+      require "redfish_tools/cli/listen_sse"
+      ListenSse.new(address, options).run
+    end
   end
 end

data/lib/redfish_tools/cli/listen_sse.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "redfish_tools/sse_client"
+
+module RedfishTools
+  class Cli
+    class ListenSse
+      def initialize(address, options)
+        @address = address
+        @options = options
+      end
+
+      def run
+        sse = RedfishTools::SseClient.new(@address)
+        trap("INT") { exit }
+        sse.start
+      end
+    end
+  end
+end

data/lib/redfish_tools/cli/serve_sse.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "redfish_tools/sse_server"
+
+module RedfishTools
+  class Cli
+    class ServeSse
+      def initialize(source, options)
+        @source = source
+        @options = options
+      end
+
+      def run
+        sse = RedfishTools::SseServer.new(
+          @source, @options[:bind], @options[:port]
+        )
+        trap("INT") { exit }
+        sse.start
+      end
+    end
+  end
+end

data/lib/redfish_tools/datastore.rb

@@ -4,7 +4,7 @@ require "json"
 
 module RedfishTools
   class DataStore
-    Resource = Struct.new(:id, :body, :headers, :time)
+    Resource = Struct.new(:id, :body, :headers, :time, :parent)
 
     def initialize(base_path)
       @base_path = File.expand_path(base_path)
@@ -16,11 +16,11 @@ module RedfishTools
 
     def get(id)
       id = id.chomp("/")
-      @overlay[id] ||= load_resource(id)
+      @overlay[id] = @overlay.fetch(id, load_resource(id))
     end
 
-    def set(id, body, headers: nil, time: nil)
-      @overlay[id] = Resource.new(id, body, headers, time)
+    def set(id, body, headers: nil, time: nil, parent: nil)
+      @overlay[id] = Resource.new(id, body, headers, time, parent)
     end
 
     private

data/lib/redfish_tools/servlet.rb

@@ -56,8 +56,9 @@ module RedfishTools
       response.status = 501
     end
 
-    def do_DELETE(_request, response)
-      response.status = 501
+    def do_DELETE(request, response)
+      delete_item(datastore.get(request.path))
+      response.status = 204
     end
 
     private
@@ -86,7 +87,17 @@ module RedfishTools
       item.body["Members"].push("@odata.id" => oid)
 
       base = { "@odata.id" => oid, "Id" => id, "Name" => id }
-      datastore.set(id, base.merge(data))
+      datastore.set(oid, base.merge(data), parent: item)
+    end
+
+    def delete_item(item)
+      if item.parent
+        item.parent.body["Members@odata.count"] -= 1
+        item.parent.body["Members"].delete_if do |m|
+          m["@odata.id"] == item.id
+        end
+      end
+      datastore.set(item.id, nil)
     end
 
     def authorized?(request)

data/lib/redfish_tools/sse_client.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "json"
+
+require "server_sent_events"
+
+module RedfishTools
+  class SseClient
+    def initialize(address)
+      @address = address
+    end
+
+    def start
+      ServerSentEvents.listen(@address) do |event|
+        puts JSON.pretty_generate("id"   => event.id,
+                                  "data" => JSON.parse(event.data))
+      end
+    end
+  end
+end

data/lib/redfish_tools/sse_server.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "date"
+require "json"
+require "socket"
+
+module RedfishTools
+  class SseServer
+    HEADERS = "HTTP/1.1 200 OK\r\n"\
+              "Content-Type: text/event-stream\r\n"\
+              "\r\n"
+
+    def initialize(source, address, port)
+      @events = load_events(source)
+      @server = TCPServer.open(address, port)
+    end
+
+    def start
+      loop { Thread.start(@server.accept) { |client| handle_client(client) } }
+    end
+
+    private
+
+    def load_events(source)
+      JSON.parse(File.read(source))
+    end
+
+    def handle_client(socket)
+      socket.print(HEADERS)
+      id = 0
+      loop do
+        event = @events.sample
+        event["Events"][0]["EventTimestamp"] = DateTime.now.to_s
+        socket.print("id: #{id}\ndata: #{event.to_json}\n\n")
+        sleep(rand(1..10))
+        id += 1
+      end
+    ensure
+      socket.close
+    end
+  end
+end

data/lib/redfish_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedfishTools
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/redfish_tools.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "redfish_client", "~> 0.2.2"
+  spec.add_runtime_dependency "server_sent_events", "~> 0.1.1"
   spec.add_runtime_dependency "thor", "~> 0.19"
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redfish_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tadej Borovšak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redfish_client
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: server_sent_events
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -129,12 +143,16 @@ files:
 - exe/redfish
 - lib/redfish_tools.rb
 - lib/redfish_tools/cli.rb
+- lib/redfish_tools/cli/listen_sse.rb
 - lib/redfish_tools/cli/record.rb
 - lib/redfish_tools/cli/serve.rb
+- lib/redfish_tools/cli/serve_sse.rb
 - lib/redfish_tools/datastore.rb
 - lib/redfish_tools/recorder.rb
 - lib/redfish_tools/server.rb
 - lib/redfish_tools/servlet.rb
+- lib/redfish_tools/sse_client.rb
+- lib/redfish_tools/sse_server.rb
 - lib/redfish_tools/version.rb
 - redfish_tools.gemspec
 homepage: https://github.com/xlab-si/redfish-tools-ruby