populus 0.0.1.pre3 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b59e4ac86d6d258766507d44cc26045420690e
-  data.tar.gz: 146bdb3308470befc1145bb9a67d26778568bb17
+  metadata.gz: 0af5cd919676d03ad1cf32acd295b5f56274d0c6
+  data.tar.gz: 373393234f80be72ec88e5d546e84a51f3aaa080
 SHA512:
-  metadata.gz: 0ff3f1f915b797f0bb519bf12ed99d44cf52db9d228dfe97dd8b57445f1fdeed22e9f26c7fc24ac923173a394c867e59a65aa744cd55bcfb8362df80e720b8d3
-  data.tar.gz: 9abc728c5c1b032cc8a9cc43c478afde83cf16b13c93a3dca74c7a431cc26d81befcded09ee1b1eb1af9a01b90ebea81b06b932c862be363b0b88e39a26a70f0
+  metadata.gz: 63e3cd016902a544e7d173c4695218786a10bfd7f5f2cc0830c14a48834dd500635a1f3d341f30fac661ed9b1f43367a5c82cc48a59372726b938699e6c27489
+  data.tar.gz: 55f5b7ca913d0896f3d26006d96446a68361ccf40f95ae907971af6e06db8a22ecf8155d21e4acd0306a911722b9e55d742a196441d879cfebd31329f9b1edcc

data/README.md

@@ -1,6 +1,6 @@
 # Populus
 
-TODO: Write a gem description
+[WIP][Will breaking change] Consul event handlers definition DSL
 
 ## Installation
 
@@ -20,11 +20,31 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Usages below are just a draft
+
+```ruby
+Populus.watch 'node' do
+  on_receive do |nodes|
+    if nodes.count < 10
+	  logger.warn "nodes are too short!"
+	end
+  end
+end
+```
+
+```bash
+consul watch -type node "bundle exec populus accept sample.popl"
+```
+
+### TODOs
+
+* Deployment switching by node name
+* Condition phrase against JSON
+* Local/remote execution by specinfra
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/populus/fork )
+1. Fork it ( https://github.com/udzura/populus/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/populus

@@ -3,15 +3,19 @@
 
 require 'populus'
 
-mode = ARGV[0] # This is for forward compatibility
-if mode != 'accept'
-  puts "Unknown arg: #{mode}"
-  exit 127
-end
-
+mode = ARGV[0]
 setting = ARGV[1]
 
-Populus.eval_setting setting
+case mode
+when 'accept'
+  # FIXME: implement one-time runner
+  Populus.logger.error "FIXME: implement one-time runner"
+  exit 127
+when 'watch'
+  Populus::Daemon.run(setting: setting)
+else
+  Populus.logger.error "Unknown arg: #{mode}"
+  exit 127
+end
 
-data = STDIN.read
-Populus::Do.accept data
+exit 0

data/examples/echo.popl

@@ -1,7 +1,11 @@
 # -*- mode: ruby -*-
+require 'base64'
 
-Populus.watch 'node' do
-  on_receive do |json|
-    p json
+Populus.watch :event, name: "sample" do
+  When {|data| data.any?{|d| d.has_key?('Payload')} }
+  Runs do |data|
+    event = data.find{|d| d.has_key?('Payload')}
+    Populus.logger.info "From populus!!!"
+    Populus.logger.info Base64.decode64(event['Payload'])
   end
 end

data/lib/populus/accepter.rb

@@ -0,0 +1,44 @@
+module Populus
+  class Accepter
+    # TODO: validators
+    class Base
+      attr_accessor :condition, :runner, :metadata
+
+      def initialize(cond: nil, runs: nil, metadata: {})
+        self.condition = cond
+        self.runner = runs
+        self.metadata = metadata
+      end
+
+      def type?(t)
+        current_type = self.class.name.downcase
+          .split('::')
+          .last
+        current_type == t
+      end
+
+      def accept(data)
+        if condition[data]
+          Populus.logger.debug "Condition judged true: #{data.inspect}"
+          runner[data]
+          return true
+        else
+          Populus.logger.debug "Condition judged false: #{data.inspect}"
+          return false
+        end
+      end
+    end
+
+    class Event < Base
+      def has_name?(name)
+        metadata[:name] == name
+      end
+
+      def create_thread
+        _name = metadata[:name]
+        Populus.logger.debug "Create thread: consul watch -type event -name #{_name}"
+        Populus::WatchThread.consul_watch('-type', 'event', '-name', _name)
+      end
+    end
+  end
+end

data/lib/populus/daemon.rb

@@ -0,0 +1,20 @@
+require 'populus/watch_thread'
+require 'securerandom'
+
+module Populus
+  module Daemon
+    def self.run(setting: nil)
+      raise ArgumentError unless setting
+      Populus.eval_setting(setting)
+      threads = Populus::Pool.gen_threads
+
+      trap(:INT) do
+        STDERR.puts "Caught SIGINT. Quitting..."
+        threads.each(&:kill)
+      end
+
+      threads.each(&:join)
+      Populus.logger.warn "Consul process exited. Aborting..."
+    end
+  end
+end

data/lib/populus/default_logger.rb

@@ -0,0 +1,24 @@
+require 'logger'
+require 'colorize'
+module Populus
+  class DefaultLoggerFormatter < ::Logger::Formatter
+    COLOR_CODE = {
+      'DEBUG' => :black,
+      'INFO'  => :green,
+      'WARN'  => :yellow,
+      'ERROR' => :red,
+      'FATAL' => :magenta,
+    }
+
+    def call(severity, time, progname, msg)
+      s = super
+      s[0] = ("%5s" % severity).colorize(:color => COLOR_CODE[severity])
+      s
+    end
+  end
+
+  logger = ::Logger.new(STDOUT)
+  logger.level = ::Logger::DEBUG
+  logger.formatter = DefaultLoggerFormatter.new
+  DefaultLogger = logger
+end

data/lib/populus/dsl.rb

@@ -1,23 +1,44 @@
-require 'populus/do'
-require 'populus/watch/node'
+require 'populus/pool'
+require 'populus/accepter'
 
 module Populus
+
+  # Populus.watch :event, name: "sample" do
+  #   When {|data| data.has_key?('Payload') }
+  #   Runs do |data|
+  #     Populus.logger.info Base64.decode(data['Payload'])
+  #   end
+  # end
   module DSL
-    def watch(arg, &b)
-      watching = find_watch_obj(arg)
-      watching.instance_eval(&b)
-      Do.register_object watching
+    class DSLContext
+      def initialize(wrap_obj)
+        @wrap_obj = wrap_obj
+      end
+
+      def When(&do_foobar)
+        @wrap_obj.condition = do_foobar
+      end
+
+      def Runs(&do_foobar)
+        @wrap_obj.runner = do_foobar
+      end
+    end
+
+    def watch(type, *arg, &b)
+      accepter = find_accepter(type.to_s).new(metadata: arg.first)
+      DSLContext.new(accepter).instance_eval(&b)
+      Pool.register_object accepter
     end
 
-    def find_watch_obj(arg)
-      const = arg.gsub(/(^.|_.)/) {|c| c.tr('_', '').upcase }
-      Watch.const_get(const).new
+    def find_accepter(type)
+      const = type.gsub(/(^.|_.)/) {|c| c.tr('_', '').upcase }
+      Accepter.const_get(const)
     end
 
     def eval_setting(path)
       load path
     rescue => e
-      STDERR.puts "Invalid setting format! #{path}", "error is:", e
+      STDERR.puts "Invalid setting format! #{path}", "error is:", e.class, e.message, e.backtrace
       exit 1
     end
   end

data/lib/populus/pool.rb

@@ -0,0 +1,34 @@
+require 'singleton'
+require 'json'
+
+module Populus
+  class Pool
+    include Singleton
+
+    def objects
+      @objects ||= []
+    end
+
+    class << self
+      def register_object(o)
+        instance.objects << o
+        Populus.logger.info "Registered: #{o.inspect}"
+      end
+
+      # TODO: Trying Enumerable#lazy
+      def events
+        instance.objects.select {|o| o.type?('event') }
+      end
+
+      def find_events_by_name(name)
+        events.select{|o| o.has_name?(name) }
+      end
+
+      def gen_threads
+        instance.objects.map { |o|
+          o.create_thread
+        }
+      end
+    end
+  end
+end

data/lib/populus/version.rb

@@ -1,3 +1,3 @@
 module Populus
-  VERSION = "0.0.1.pre3"
+  VERSION = "0.0.1"
 end

data/lib/populus/watch_thread.rb

@@ -0,0 +1,37 @@
+require 'thread'
+require 'open3'
+
+require 'populus/pool'
+require 'json'
+
+module Populus
+  class WatchThread
+    def self.consul_watch(*args)
+      wait = Thread.fork do
+        begin
+          stdin, stdout, stderr = *Open3.popen3(
+            Populus.consul_bin, 'watch', *args, '/bin/cat'
+          )
+          stdin.close
+          name = args[args.index('-name') + 1]
+          while l = stdout.gets
+            Populus.logger.debug "accept JSON: %s" % l
+            data = JSON.parse l
+
+            accepters = Populus::Pool.find_events_by_name(name)
+            accepters.each do |accepter|
+              begin
+                accepter.accept(data)
+              rescue => e
+                Populus.logger.warn "Error on event: %s, %s. Skip." % [e.class, e.message]
+              end
+            end
+          end
+        rescue => e
+          Populus.logger.error e
+        end
+      end
+      return wait
+    end
+  end
+end

data/lib/populus.rb

@@ -1,5 +1,18 @@
 module Populus; end
 
-require "populus/do"
+require "logger"
+require "populus/pool"
 require "populus/dsl"
+require "populus/daemon"
+require "populus/watch_thread"
+require "populus/default_logger"
 require "populus/version"
+
+module Populus
+  class << self
+    attr_accessor :consul_bin, :logger
+  end
+
+  self.consul_bin = 'consul' # default to count on $PATH
+  self.logger = Populus::DefaultLogger
+end

data/populus.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "specinfra"
+  spec.add_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", ">= 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populus
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre3
+  version: 0.0.1
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: specinfra
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -55,8 +69,7 @@ dependencies:
 description: Consul event definition DSL
 email:
 - udzura@udzura.jp
-executables:
-- populus
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -69,10 +82,13 @@ files:
 - bin/populus
 - examples/echo.popl
 - lib/populus.rb
-- lib/populus/do.rb
+- lib/populus/accepter.rb
+- lib/populus/daemon.rb
+- lib/populus/default_logger.rb
 - lib/populus/dsl.rb
+- lib/populus/pool.rb
 - lib/populus/version.rb
-- lib/populus/watch/node.rb
+- lib/populus/watch_thread.rb
 - populus.gemspec
 homepage: https://github.com/udzura/populus
 licenses:
@@ -89,12 +105,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Consul event definition DSL

data/lib/populus/do.rb

@@ -1,25 +0,0 @@
-require 'singleton'
-require 'json'
-
-module Populus
-  class Do
-    include Singleton
-    def objects
-      @objects ||= []
-    end
-
-    class << self
-      def register_object(o)
-        instance.objects << o
-        puts "Registered: #{o.inspect}"
-      end
-
-      def accept(input)
-        json = JSON.parse(input)
-        instance.objects.each do |o|
-          o.accept json
-        end
-      end
-    end
-  end
-end

data/lib/populus/watch/node.rb

@@ -1,23 +0,0 @@
-module Populus
-  module Watch
-    class Node
-      def initialize
-        @on_receive_hooks = []
-      end
-
-      def on_receive(&b)
-        @on_receive_hooks << b
-      end
-
-      def accept(json)
-        @on_receive_hooks.each do |hook|
-          begin
-            hook.call(json)
-          rescue => e
-            puts e, "Ignore."
-          end
-        end
-      end
-    end
-  end
-end