cilite 0.2.0 → 0.2.1

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_dependency 'kvs'
     gem.add_dependency 'sinatra'
     gem.add_dependency 'choice'
+    gem.add_dependency 'termcolor', '>= 1.2.0'
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/cilite

@@ -76,7 +76,7 @@ options = Choice.choices
 
 CiLite::Runner.start(
   :branch => options[:branch],
-  :test_command => options[:command],
+  :command => options[:command],
   :interval => options[:interval]
 )
 

data/lib/cilite.rb

@@ -6,6 +6,8 @@ end
 require 'kvs'
 require 'singleton'
 require 'sinatra'
+gem 'termcolor', '>= 1.2.0'
+require 'termcolor'
 
 work_dir = '.cilite'
 Dir.mkdir(work_dir) unless File.exists?(work_dir)

data/lib/cilite/{process.rb → build.rb}

@@ -1,5 +1,5 @@
 module CiLite
-  class Process < Struct.new(:status, :pid)
+  class Build < Struct.new(:status, :pid)
     attr_reader :command, :status, :pid, :output
 
     def initialize(command)
@@ -13,6 +13,11 @@ module CiLite
       end
       @status = $?.exitstatus.to_i
     rescue Exception => e
+      @status = -1
+    end
+
+    def success?
+      status == 0
     end
 
     def to_hash

data/lib/cilite/runner.rb

@@ -4,12 +4,14 @@ module CiLite
       self.new(options).start
     end
 
-    attr_reader :config, :checker
-    attr_accessor :testing, :started
+    attr_reader :branch, :command, :interval
+    attr_accessor :started
 
     def initialize(options)
-      @config = (KVS['config'] || {}).merge(options)
-      @checker = Checker.new(@config[:branch])
+      options = (KVS['config'] || {}).merge(options)
+      @branch = options[:branch]
+      @command = options[:command]
+      @interval = options[:interval]
     end
 
     def start
@@ -19,9 +21,9 @@ module CiLite
           begin
             test_if_updated
           rescue Exception => e
-            puts "#{e.message}\n  #{e.backtrace.join("\n  ")}"
+            puts "<red>#{TermColor.escape(e.to_s)}</red>".termcolor
           ensure
-            sleep config[:interval]
+            sleep interval
           end
         end
       end
@@ -29,26 +31,43 @@ module CiLite
     end
 
     def test_if_updated
-      checker.if_updated do |hash|
-        begin
-          self.testing = true
-          test(hash)
-        ensure
-          self.testing = false
-        end
+      hash = git_update
+      unless KVS[hash]
+        test(hash)
+      end
+    end
+
+    def git_update
+      if system("git fetch origin && git reset --hard origin/#{branch}")
+        hash = `git rev-parse origin/#{branch}`.chomp
+        raise "failed to get HEAD commit of origin/#{branch}" unless $? == 0
+        hash
+      else
+        raise "failed to update origin/#{branch}"
       end
     end
 
     def test(hash)
-      process = Process.new(config[:test_command])
-      process.start
-      puts "#{hash} => #{process.status}"
-      puts process.output
-      Log[hash] = process.to_hash.merge(
+      puts "start: #{hash}", command
+
+      build = Build.new(command)
+      build.start
+      Log[hash] = build.to_hash.merge(
                     :hash => hash,
                     :created_at => Time.now,
-                    :branch => config[:branch]
+                    :branch => branch
                   )
+
+      output_result(hash, build)
+    end
+
+    def output_result(hash, build)
+      puts build.output
+      if build.success?
+        puts "<green>[Success!] #{hash}</green>".termcolor
+      else
+        puts "<red>[Failure!] #{hash}</red>".termcolor
+      end
     end
   end
 end

data/test/{tester/test_process.rb → cilite/test_build.rb}

@@ -1,10 +1,10 @@
 require 'helper'
 require 'tmpdir'
 
-class TestProcess < Test::Unit::TestCase
+class TestBuild < Test::Unit::TestCase
   context 'main' do
     setup do
-      @test = CiLite::Process.new('foo')
+      @test = CiLite::Build.new('foo')
     end
 
     should 'pass the test' do

data/test/cilite/test_runner.rb

@@ -0,0 +1,32 @@
+require 'helper'
+
+class TestRunner < Test::Unit::TestCase
+  context 'main' do
+    setup do
+      @runner = CiLite::Runner.new({:branch => 'foo', :command => 'bar', :interval => 10})
+    end
+
+    should 'test if updated' do
+      test_build_stub = Object.new
+      mock(test_build_stub).start
+      stub(test_build_stub).to_hash { {:foo => :bar} }
+      stub(test_build_stub).status { 0 }
+      stub(test_build_stub).output { 'output' }
+      stub(test_build_stub).success? { true }
+      mock(CiLite::Build).new(@runner.command) { test_build_stub }
+      mock(CiLite::Log).[]=.with_any_args
+      stub(Time).now { 'now' }
+
+      $stdout = StringIO.new
+      @runner.test('XXXX')
+      $stdout = STDOUT
+    end
+
+    should 'not test if not updated' do
+      KVS['foo'] = 'bar'
+      stub(@runner).git_update { 'foo' }
+      mock(@runner).test('foo').times(0)
+      @runner.test_if_updated
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cilite
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - jugyo
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: termcolor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
 description: CiLite is lite CI tool for project that use git.
 email: jugyo.org@gmail.com
 executables: 
@@ -79,9 +89,8 @@ files:
 - VERSION
 - bin/cilite
 - lib/cilite.rb
-- lib/cilite/checker.rb
+- lib/cilite/build.rb
 - lib/cilite/log.rb
-- lib/cilite/process.rb
 - lib/cilite/runner.rb
 - lib/cilite/server.rb
 - lib/cilite/views/index.haml
@@ -89,13 +98,12 @@ files:
 - lib/cilite/views/show.haml
 - lib/cilite/views/styles.css
 - lib/cilite/views/styles.sass
+- test/cilite/test_build.rb
+- test/cilite/test_log.rb
+- test/cilite/test_runner.rb
 - test/helper.rb
 - test/test_cilite.rb
 - test/tester.ru
-- test/tester/test_checker.rb
-- test/tester/test_log.rb
-- test/tester/test_process.rb
-- test/tester/test_runner.rb
 has_rdoc: true
 homepage: http://github.com/jugyo/cilite
 licenses: []
@@ -125,9 +133,8 @@ signing_key:
 specification_version: 3
 summary: CiLite is lite CI tool.
 test_files: 
+- test/cilite/test_build.rb
+- test/cilite/test_log.rb
+- test/cilite/test_runner.rb
 - test/helper.rb
 - test/test_cilite.rb
-- test/tester/test_checker.rb
-- test/tester/test_log.rb
-- test/tester/test_process.rb
-- test/tester/test_runner.rb

data/lib/cilite/checker.rb

@@ -1,27 +0,0 @@
-module CiLite
-  class Checker
-    attr_reader :branch
-    attr_accessor :last_hash
-
-    def initialize(branch)
-      @branch = branch
-    end
-
-    def if_updated(&block)
-      update
-      hash = head
-      if KVS['HEAD'] != hash
-        block.call(hash)
-        KVS['HEAD'] = self.last_hash = hash
-      end
-    end
-
-    def update
-      `git fetch origin && git reset --hard origin/#{branch}`
-    end
-
-    def head
-      `git rev-parse origin/#{branch}`.chomp
-    end
-  end
-end

data/test/tester/test_checker.rb

@@ -1,27 +0,0 @@
-require 'helper'
-require 'fakefs'
-
-class TestChecker < Test::Unit::TestCase
-  context 'main' do
-    setup do
-      KVS.dir = 'foo'
-      KVS['HEAD'] = ''
-      @checker = CiLite::Checker.new('master')
-      stub(@checker).update
-    end
-
-    should 'check updated' do
-      stub(@checker).head { 'foo' }
-      block = lambda {}
-      mock(block).call('foo')
-      # NOTE: rr が思ったような動作をしてくれないのでこんな書き方になってます...
-      @checker.if_updated do |hash|
-        block.call(hash)
-      end
-      mock(block).call('foo').times(0)
-      @checker.if_updated do |hash|
-        block.call(hash)
-      end
-    end
-  end
-end

data/test/tester/test_runner.rb

@@ -1,28 +0,0 @@
-require 'helper'
-
-class TestRunner < Test::Unit::TestCase
-  context 'main' do
-    setup do
-      @runner = CiLite::Runner.new({:branch => 'foo', :test_command => 'bar', :interval => 10})
-    end
-
-    should 'Runner.new' do
-      assert_equal(@runner.config[:branch], @runner.checker.branch)
-    end
-
-    should 'test if updated' do
-      test_process_stub = Object.new
-      mock(test_process_stub).start
-      stub(test_process_stub).to_hash { {:foo => :bar} }
-      stub(test_process_stub).status { 0 }
-      stub(test_process_stub).output { 'output' }
-      mock(CiLite::Process).new(@runner.config[:test_command]) { test_process_stub }
-      mock(CiLite::Log).[]=.with_any_args
-      stub(Time).now { 'now' }
-
-      $stdout = StringIO.new
-      @runner.test('XXXX')
-      $stdout = STDOUT
-    end
-  end
-end