conquer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf4765d8e3b3654cca97c56fa4689fe19625410
-  data.tar.gz: f23ae868d569a33e37877b459e4c6dcbb0697ca5
+  metadata.gz: 04927a4ee65cc431c91bb841a3e02e3811a8b772
+  data.tar.gz: 0145552faa91f177e69d9a4a39ddcab618bfad57
 SHA512:
-  metadata.gz: 5a9c43ff8d956af027d6e1c23a3647cb36d54070dd73600cae55e9032d92ed3a9b44d543a5d36a5ab1c761f6c64c60103b5ac6ee54e703d8c0731e57567c9e7f
-  data.tar.gz: 0872e53f714150a0ea14e9e3e2f869cd1e74a4aaaa753d6cac57b8e194847f556dfe497e9e73b9d469676f9ff47e349d016f02cb00fe6efee38fba7d980e520b
+  metadata.gz: e4d9a0881e87ccc2de1da43abb7615c06218894b3b01af462031ff4ffc35021935b59be250200aa039a1bea2d81e0aba5b1b781ed9eed43b8026fd9a53f7d50b
+  data.tar.gz: 7259acd38a69e3631e56446bdf7350c263e8c728c375ebc283a01ef35f452fed2cc02af9e9c6b623e387c704096686765e15b604eee24d63837d87e7d1f2b78c

data/conquer.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency 'celluloid', '~> 0.1'
+  spec.add_dependency 'celluloid-io', '~> 0.1'
 end

data/exe/conquer

@@ -1,6 +1,33 @@
 #!/usr/bin/env ruby
 
-abort 'Usage: conquer bar.rb' if ARGV.empty?
+require 'optparse'
 
-require 'conquer'
-require File.join(ENV['PWD'], ARGV[0])
+module Conquer
+  options = {}
+  parser = OptionParser.new do |p|
+    p.banner = 'Usage: conquer [options] bar.rb'
+    p.on('-s', '--socket=PATH', 'use rpc socket in PATH') do |path|
+      options[:socket] = path
+    end
+
+    p.on('-h', '--help') do
+      puts p
+      exit
+    end
+  end
+
+  parser.parse!
+  abort(parser.to_s) if ARGV.empty?
+
+  runtime_dir = ENV['XDG_RUNTIME_DIR'] || "/run/user/#{ENV['UID']}"
+  RPC_SOCKET = options[:socket] || "#{runtime_dir}/conquer.socket"
+end
+
+begin
+  require 'conquer'
+  file = ARGV[0]
+  file.prepend("#{ENV['PWD']}/") unless file.start_with?('/')
+  require file
+ensure
+  File.delete(Conquer::RPC_SOCKET) if File.exist?(Conquer::RPC_SOCKET)
+end

data/lib/conquer/dsl.rb

@@ -12,10 +12,16 @@ module Conquer
       Helpers.singleton_class.class_eval(&block)
     end
 
-    def separator(string = ' | ')
-      every(100.hours) { string }
+    def separator(string = ' | ', &block)
+      if block_given?
+        every(100.hours, &block)
+      else
+        every(100.hours) { string }
+      end
     end
 
+    alias static separator
+
     def every(timespan, &block)
       @container.register(Segment, timespan, block)
     end

data/lib/conquer/rpc.rb

@@ -0,0 +1,54 @@
+require 'celluloid/current'
+require 'celluloid/io'
+require 'json'
+require 'socket'
+
+module Conquer
+  class RPC
+    include Celluloid::IO
+    include Celluloid::Notifications
+    include Celluloid::Internals::Logger
+
+    def initialize
+      info('Starting rpc server')
+      @server = UNIXServer.new(RPC_SOCKET)
+      async.run
+    end
+
+    def shutdown
+      @server.close if @server
+    end
+
+    def event(type, *args)
+      publish(type, *args)
+    end
+
+    private
+
+    def run
+      loop do
+        async.handle_connection(@server.accept)
+      end
+    end
+
+    def handle_connection(socket)
+      info('RPC: connection initiated')
+      loop do
+        line = socket.gets
+        break unless line
+        info("RPC: #{line}")
+        command = JSON.parse(line)
+        public_send(command['method'], *(command['params'] || []))
+      end
+    end
+
+    def rpc_server(&block)
+      UNIXServer.open(RPC_SOCKET) do |server|
+        info('RPC: socket opened')
+        loop do
+          server.accept(&block)
+        end
+      end
+    end
+  end
+end

data/lib/conquer/version.rb

@@ -1,3 +1,3 @@
 module Conquer
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'.freeze
 end

data/lib/conquer.rb

@@ -2,18 +2,30 @@ require 'conquer/version'
 require 'conquer/container'
 require 'conquer/dsl'
 require 'conquer/bar'
+require 'conquer/rpc'
 
 module Conquer
   MAIN_TOPIC = 'conquer'.freeze
 
-  def self.bar(io = STDOUT, &block)
+  @startup_hooks = []
+
+  module_function
+
+  def bar(io = STDOUT, &block)
     main_container = Container.new(MAIN_TOPIC)
     dsl = DSL.new(main_container)
     dsl.instance_eval(&block)
 
+    @startup_hooks.each(&:call)
+
+    RPC.supervise
     Bar.supervise(args: [MAIN_TOPIC, io])
     main_container.start_worker
 
     sleep
   end
+
+  def on_startup(&block)
+    @startup_hooks << block
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conquer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joakim Reinert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Conquer is a DSL for writing concurrent status bars
 email:
 - mail@jreinert.com
@@ -91,6 +105,7 @@ files:
 - lib/conquer/core_ext/numeric.rb
 - lib/conquer/dsl.rb
 - lib/conquer/helpers.rb
+- lib/conquer/rpc.rb
 - lib/conquer/scroller.rb
 - lib/conquer/segment.rb
 - lib/conquer/version.rb