leanci 0.0.3 → 0.0.4

data/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem "serverengine", github: 'frsyuki/serverengine'
-
+gem "rb-inotify"

data/bin/leanci

@@ -4,17 +4,25 @@ require 'rubygems'
 require 'leanci'
 
 config = {
+  daemonize: false,
   script: 'default.leanci',
   pid_path: 'leanci.pid',
   log: 'leanci.log'
 }
 OptionParser.new do |opt|
+  opt.on('-d', 'daemonize') do
+    config[:daemonize] = true
+    config[:supervisor] = true
+  end
   opt.on('-f VALUE', 'specify leanci file') do |f|
     config[:script] = f
   end
-  opt.on('--pid VALUE', 'pid file') do |f|
+  opt.on('--pidfile VALUE', 'pid file') do |f|
     config[:pid_path] = f
   end
+  opt.on('--logfile VALUE', 'log file') do |f|
+    config[:log] = f
+  end
   opt.parse!(ARGV)
 end
 

data/default.leanci

@@ -1,18 +1,26 @@
-per_sec(10) do
-  bash do
-    code <<-EOC
-      cd crape-proto
-      hg incoming
-    EOC
-    success do
-      bash do
-        log "pull --update crape-proto"
-        echo true
-        code <<-EOC
-          cd crape-proto
-          hg pull --update
-        EOC
-      end
+trigger :poll_mercurial do
+  mercurial 'test-repo2' do
+    interval 5
+    user 'hirayama'
+    group 'hirayama'
+    action :hg_update
+  end
+end
+
+action :hg_update do
+  echo 'repository updated'
+end
+
+=begin
+trigger :watch_file do
+  watch 't.txt' do
+    modify do 
+      run :file_update
     end
   end
 end
+
+action :file_update do
+  echo 'file updated'
+end
+=end

data/leanci.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_runtime_dependency "serverengine"
+  spec.add_runtime_dependency "rb-inotify"
 end

data/lib/daemon.rb

@@ -1,25 +1,23 @@
-require_relative 'script'
-
 module MyWorker
   def run
     reload
     until @stop
-      if @script_source
-        Script.new(logger, @script_source)
-      else
-        sleep 1
+      if @script
+        @script.doit
       end
+      sleep 1
     end
   end
 
   def reload
     begin
-      @script_source = nil
+      @script = nil
       File.open(config[:script]) do |f|
-        @script_source = f.read
+        @script = Script::TopLevel.new(logger, f.read)
       end
-    rescue
+    rescue => e
       logger.fatal "can't open script file"
+      logger.fatal e.to_s
     end
   end
   

data/lib/leanci/version.rb

@@ -1,3 +1,3 @@
 module Leanci
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/leanci.rb

@@ -2,4 +2,8 @@ require 'serverengine'
 require 'optparse'
 require 'logger'
 
+require_relative 'script'
+Dir.glob("#{File.dirname(__FILE__)}/plugins/*") do |file|
+  require_relative file
+end
 require_relative 'daemon'

data/lib/plugins/bash.rb

@@ -0,0 +1,64 @@
+module Script
+  class Prog
+    def bash(injection = nil, &block)
+      @prog.push Bash.new(@toplevel, injection, &block)
+    end
+  end
+
+  class Bash
+    def initialize(toplevel, injection = nil, &block)
+      @toplevel = toplevel
+      @injection = injection
+      instance_eval(&block)
+    end
+
+    attr_reader :injection
+
+    def doit
+      if @code
+        command = nil
+        if @user
+          if @user == 'root'
+            command = "sudo /bin/bash"
+          else
+            group = @group || @user
+            command = "sudo -u #{@user} -g #{group} /bin/bash"
+          end
+        else
+          command = "/bin/bash"
+        end
+
+        if exec_code(command) == 0
+          @success && @success.doit
+        else
+          @failure && @failure.doit
+        end
+      end
+    end
+
+    #---------------------------------------------------------------
+    # DSL
+    def user(s); @user = s end
+    def group(s); @group = s end
+    def code(s); @code = s end
+    def log(s); @log = s end
+    def echo(s); @echo = s end
+
+    def success(inj = nil, &block)
+      @success = Prog.new(@toplevel, inj, &block)
+    end
+    def failure(inj = nil, &block)
+      @failure = Prog.new(@toplevel, inj, &block)
+    end
+
+    private
+    def exec_code(cmd)
+      logger = @toplevel.logger
+      logger.info @log if @log
+      logger.info @code.chomp if @echo
+      o, e, s = Open3.capture3(cmd, stdin_data: @code)
+      logger.info o.chomp if @echo
+      s
+    end
+  end
+end

data/lib/plugins/mercurial.rb

@@ -0,0 +1,63 @@
+module Script
+  class Trigger
+    def mercurial(repository, &block)
+      @crawler = Mercurial.new(@toplevel, repository, &block)
+    end
+  end
+
+  class Mercurial
+    def initialize(toplevel, repository, &block)
+      @toplevel = toplevel
+      @repository = repository
+      @m = 0
+      @interval = 5
+      instance_eval(&block)
+    end
+
+    attr_reader :username, :groupname, :repository, :actiontag
+    
+    def doit
+      @m += 1
+      if @interval <= @m
+        Dir.chdir(repository) do 
+          Bash.new(@toplevel, self) do
+            code <<-EOC
+              hg incoming
+            EOC
+            success(injection) do
+              bash(injection) do
+                log "hg: pull --update #{injection.repository}"
+                user injection.username
+                group injection.groupname
+                echo true
+                code <<-EOC
+                  HGENCODING=utf-8 hg pull --update
+                EOC
+              end
+              run injection.actiontag
+            end
+          end.doit
+        end
+        @m = 0
+      end
+    end
+
+    #---------------------------------------------------------------
+    # DSL
+    def interval(n)
+      @interval = n
+    end
+
+    def user(username)
+      @username = username
+    end
+
+    def group(groupname)
+      @groupname = groupname
+    end
+
+    def action(tag)
+      @actiontag = tag
+    end
+  end  
+end

data/lib/plugins/watch.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+module Script
+  class Trigger
+    def watch(filename, &block)
+      @crawler = Watch.new(@toplevel, filename, &block)
+    end
+  end
+
+  class Watch
+    def initialize(toplevel, filename, &block)
+      @toplevel = toplevel
+      @filename = filename
+      @notifier = INotify::Notifier.new
+      instance_eval(&block)
+    end
+
+    def doit
+      @notifier.to_io.tap do |io|
+        rs, = IO.select([io], nil, nil, 0)
+        @notifier.process if rs
+      end
+    end
+
+    #---------------------------------------------------------------
+    # DSL
+    def modify(&block)
+      @modify = Prog.new(@toplevel, &block)
+      @notifier.watch(@filename, :modify) do
+        @modify.doit
+      end
+    end
+  end
+end

data/lib/script.rb

@@ -1,92 +1,131 @@
 require 'open3'
 
-class Bash
-  def initialize(logger, &block)
-    @logger = logger
-    instance_eval(&block)
-
-    if @code 
-      if @user
-        if @user == 'root'
-          exec_code("sudo /bin/bash")
-        else
-          group = @group || @user
-          exec_code("sudo -u #{@user} -g #{group} /bin/bash", stdin_data: @code)
-        end
-      else
-        exec_code("/bin/bash")
-      end
-      if status == 0
-        InnerScript.new(@logger, &@success) if @success
-      else
-        InnerScript.new(@logger, &@failure) if @failure
+module Script
+  class TopLevel
+    def initialize(logger, script_source)
+      @logger = logger
+      @triggers = {}
+      @actions = {}
+      instance_eval(script_source)
+    end
+
+    attr_reader :logger, :triggers, :actions
+
+    def doit
+      @triggers.each do |k, t|
+        t.doit
       end
     end
-  end
 
-  def exec_code(cmd)
-    @logger.info @logtext if @logtext
-    @logger.info @code.chomp if @echo
-    o, e, s = Open3.capture3(cmd, stdin_data: @code)
-    @logger.info o.chomp if @echo
-    @status = s
+    #---------------------------------------------------------------
+    # DSL
+    def trigger(tag, &block)
+      @triggers[tag] = Trigger.new(self, &block)
+    end
+
+    def action(tag, &block)
+      @actions[tag] = Action.new(self, &block)
+    end
   end
 
-  attr_reader :status
+  ################################################################
+  # in TopLevel
+  class Trigger
+    def initialize(toplevel, &block)
+      @toplevel = toplevel
+      instance_eval(&block)
+    end
 
-  def user(s)
-    @user = s
-  end
+    def doit
+      @crawler.doit
+    end
 
-  def group(s)
-    @group = s
+    #---------------------------------------------------------------
+    # DSL
+    def interval(n, &block)
+      @crawler = Interval.new(@toplevel, n, &block)
+    end
   end
 
-  def code(s)
-    @code = s
-  end
+  class Action
+    def initialize(toplevel, &block)
+      @prog = Prog.new(toplevel, &block)
+    end
 
-  def success(&block)
-    @success = block
+    def doit
+      @prog.doit
+    end
   end
 
-  def failure(&block)
-    @failure = block
-  end
+  ################################################################
+  # in Trigger
+  class Interval
+    def initialize(toplevel, n, &block)
+      @toplevel = toplevel
+      @n = n
+      @m = 0
+      @prog = Prog.new(@toplevel, &block)
+    end
 
-  def log(logtext)
-    @logtext = logtext
+    def doit
+      @m += 1
+      if @m == @n
+        @prog.doit
+        @m = 0
+      end
+    end
   end
 
-  def echo(flag)
-    @echo = flag
-  end
-end
+  ################################################################
+  # where procedure required
+  class Prog
+    def initialize(toplevel, injection = nil, &block)
+      @toplevel = toplevel
+      @injection = injection
+      @prog = []
+      instance_eval(&block)
+    end
 
-class InnerScript
-  def initialize(logger, &block)
-    @logger = logger
-    instance_eval(&block)
-  end
+    attr_reader :injection
 
-  def bash(&block)
-    Bash.new(@logger, &block).status
-  end
-end
+    def doit
+      @prog.each do |p|
+        p.doit
+      end
+    end
 
+    #---------------------------------------------------------------
+    # DSL
+    def echo(s)
+      @prog.push Echo.new(@toplevel, s)
+    end
 
-class Script
-  def initialize(logger, script_source)
-    @logger = logger
-    instance_eval(script_source)
+    def run(tag)
+      @prog.push Run.new(@toplevel, tag)
+    end
   end
 
-  def per_sec(sec = 1, &block) 
-    sleep sec
-    instance_eval(&block)
+  ################################################################
+  # in Prog
+  class Echo
+    def initialize(toplevel, s)
+      @toplevel = toplevel
+      @s = s
+    end
+
+    def doit
+      @toplevel.logger.info @s
+    end
   end
 
-  def bash(&block)
-    Bash.new(@logger, &block).status
+  class Run
+    def initialize(toplevel, tag)
+      @toplevel = toplevel
+      @tag = tag
+    end
+
+    def doit
+      @toplevel.actions[@tag].doit
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leanci
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: minimal CI servant
 email:
 - naoyuki.hirayama@gmail.com
@@ -79,6 +95,9 @@ files:
 - lib/daemon.rb
 - lib/leanci.rb
 - lib/leanci/version.rb
+- lib/plugins/bash.rb
+- lib/plugins/mercurial.rb
+- lib/plugins/watch.rb
 - lib/script.rb
 homepage: https://github.com/jonigata/leanci
 licenses: