tengine_job_agent 0.3.17 → 1.1.0

data/Gemfile

@@ -1,22 +1,4 @@
 # -*- coding: utf-8 -*-
 source "http://rubygems.org"
 
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-gem "tengine_support", "~> 0.3.0"
-gem "tengine_event", "~> 0.4.0"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.6.0"
-  gem "yard", "~> 0.7.2"
-  gem "bundler", "~> 1.0.18"
-  gem "jeweler", "~> 1.6.4"
-  # gem "rcov", ">= 0"
-  gem "simplecov", "~> 0.5.3"
-  gem "ZenTest", "~> 4.6.2"
-  gem "ci_reporter", "~>1.6.5"
-end
+gemspec

data/Gemfile.lock

@@ -1,8 +1,15 @@
+PATH
+  remote: .
+  specs:
+    tengine_job_agent (1.1.0)
+      tengine_event (~> 1.1.0)
+      tengine_support (~> 1.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.2)
-    activesupport (3.2.1)
+    ZenTest (4.8.2)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     amq-client (0.8.7)
@@ -13,55 +20,53 @@ GEM
       amq-client (~> 0.8.7)
       amq-protocol (~> 0.8.4)
       eventmachine
-    builder (3.0.0)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    builder (3.1.3)
     ci_reporter (1.6.9)
       builder (>= 2.1.2)
     diff-lcs (1.1.3)
-    eventmachine (0.12.10)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
-    multi_json (1.0.4)
+    eventmachine (1.0.0)
+    i18n (0.6.1)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    multi_json (1.3.6)
     rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rdiscount (1.6.8)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    systemu (2.4.2)
-    tengine_event (0.4.6)
+    systemu (2.5.2)
+    tengine_event (1.1.0)
       activesupport (>= 3.0.0)
       amqp (~> 0.8.0)
-      tengine_support (>= 0.3.24)
+      tengine_support (~> 1.1.0)
       uuid (~> 2.3.4)
-    tengine_support (0.3.24)
+    tengine_support (1.1.0)
       activesupport (>= 3.0.0)
     uuid (2.3.5)
       macaddr (~> 1.0)
-    yard (0.7.5)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest (~> 4.6.2)
-  bundler (~> 1.0.18)
+  autotest
+  bundler
   ci_reporter (~> 1.6.5)
-  jeweler (~> 1.6.4)
-  rspec (~> 2.6.0)
-  simplecov (~> 0.5.3)
-  tengine_event (~> 0.4.0)
-  tengine_support (~> 0.3.0)
-  yard (~> 0.7.2)
+  rake (~> 0.9.2.2)
+  rdiscount
+  rspec (~> 2.10.0)
+  simplecov (~> 0.6.4)
+  tengine_job_agent!
+  yard (~> 0.8.1)

data/README.rdoc

@@ -17,4 +17,4 @@ tengine_job_agent is distributed under the MPL2.0 or LGPLv3 or the dual license
 
 == Copyright
 
-Copyright (c) 2011 nautilus-technologies.com
+Copyright (c) 2012 Groovenauts, Inc.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_job_agent
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,99 +13,155 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
-  requirement: &2156137340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156137340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tengine_event
-  requirement: &2156087460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156087460
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2156073520 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156073520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2156062440 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2156062440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2156054940 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.18
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *2156054940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2156048520 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *2156048520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156033760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156033760
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &2156020140 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156020140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156011300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,9 +169,14 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2156011300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 description: tengine_job_agent works with tengine_job
-email: tengine@nautilus-technologies.com
+email: tengine-info@groovenauts.jp
 executables:
 - tengine_job_agent_kill
 - tengine_job_agent_run
@@ -124,30 +185,16 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
-- Rakefile
-- VERSION
 - bin/tengine_job_agent_kill
 - bin/tengine_job_agent_run
 - bin/tengine_job_agent_watchdog
-- lib/tengine_job_agent.rb
 - lib/tengine_job_agent/command_utils.rb
 - lib/tengine_job_agent/run.rb
 - lib/tengine_job_agent/watchdog.rb
-- spec/.gitignore
-- spec/config/tengine_job_agent.yml.erb
-- spec/log/.gitignore
-- spec/spec_helper.rb
-- spec/tengine_job_agent/command_utils_spec.rb
-- spec/tengine_job_agent/run_spec.rb
-- spec/tengine_job_agent/scripts/echo_foo.sh
-- spec/tengine_job_agent/scripts/sleep.sh
-- spec/tengine_job_agent/watchdog_spec.rb
-- tengine_job_agent.gemspec
+- lib/tengine_job_agent.rb
 homepage: http://github.com/tengine/tengine_job_agent
 licenses:
 - MPL2.0/LGPLv3
@@ -163,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2510971988355542702
+      hash: -739102963510828694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: tengine_job_agent invoke job, watches it and notify its finish to tengine

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/Rakefile

@@ -1,42 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "tengine_job_agent"
-  gem.homepage = "http://github.com/tengine/tengine_job_agent"
-  gem.license = "MPL2.0/LGPLv3"
-  gem.summary = %Q{tengine_job_agent invoke job, watches it and notify its finish to tengine server}
-  gem.description = %Q{tengine_job_agent works with tengine_job}
-  gem.email = "tengine@nautilus-technologies.com"
-  gem.authors = %w[taigou totty g-morita shyouhei akm]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +0,0 @@
-0.3.17

data/spec/.gitignore

@@ -1 +0,0 @@
-/pid_for_*

data/spec/config/tengine_job_agent.yml.erb

@@ -1,17 +0,0 @@
----
-timeout: 1
-# log_dir: "log"
-logfile: "<%= %!log/#{File.basename($PROGRAM_NAME)}-#{`hostname`.strip}-#{Process.pid}.log! %>"
-connection:
-  host: 'localhost'
-  port: 5672
-  # vhost:
-  # user:
-  # pass:
-exchange:
-  name: 'tengine_event_exchange'
-  type: 'direct'
-  durable: true
-heartbeat:
-  job:
-    interval: 1

data/spec/spec_helper.rb

@@ -1,14 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'simplecov'
-SimpleCov.start if ENV["COVERAGE"]
-require 'rspec'
-require 'tengine_job_agent'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end

data/spec/tengine_job_agent/command_utils_spec.rb

@@ -1,124 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-require 'tmpdir'
-require 'tempfile'
-
-describe TengineJobAgent::CommandUtils do
-  describe ".included" do
-    it "ClassMethodsを追加" do
-      foo = Class.new do
-        include TengineJobAgent::CommandUtils
-      end
-      foo.singleton_class.ancestors.should include(TengineJobAgent::CommandUtils::ClassMethods)
-    end
-  end
-
-  context "::ClassMethods" do
-    describe "#load_config" do
-      subject { Class.new { include TengineJobAgent::CommandUtils::ClassMethods }.new }
-
-      it "Hashをかえす" do
-        Dir.chdir File.expand_path("../..", __FILE__) do
-          subject.load_config.should be_kind_of(Hash)
-        end
-      end
-
-      it "./tengine_job_agent.ymlを読む" do
-        Dir.mktmpdir do |nam|
-          Dir.chdir nam do
-            File.open("tengine_job_agent.yml", "wb") {|f| f.puts "foo: bar\n" }
-            subject.load_config.should == { "foo" => "bar" }
-          end
-        end
-      end
-
-      it "./config/tengine_job_agent.ymlを読む" do
-        Dir.mktmpdir do |nam|
-          Dir.chdir nam do
-            Dir.mkdir "config"
-            File.open("config/tengine_job_agent.yml", "wb") {|f| f.puts "foo: bar\n" }
-            subject.load_config.should == { "foo" => "bar" }
-          end
-        end
-      end
-
-      it "/etc/tengine_job_agent.ymlを読む" do
-        begin
-          if File.exist? "/etc/tengine_job_agent.yml"
-            obj = YAML.load_file "/etc/tengine_job_agent.yml"
-            subject.load_config.should == obj
-          else
-            File.open("/etc/tengine_job_agent.yml", "wb") {|f| f.puts "foo: bar\n" }
-            subject.load_config.should == { "foo" => "bar" }
-          end
-        rescue Errno::EACCES
-          pending $!.message
-        end
-      end
-    end
-
-    describe "#new_logger" do
-      subject { Class.new { include TengineJobAgent::CommandUtils::ClassMethods }.new }
-      before { subject.stub(:name).and_return("foobar") }
-
-      it "logfileを指定する場合" do
-        Dir.mktmpdir do |nam|
-          Logger.should_receive(:new).with("foo/bar/baz.log")
-          subject.new_logger('logfile' => "foo/bar/baz.log")
-        end
-      end
-
-      it "logfileもlog_dirも指定する場合" do
-        Dir.mktmpdir do |nam|
-          Logger.should_receive(:new).with(/\/foobar-\d+?.log$/)
-          subject.new_logger({})
-        end
-      end
-
-      it "Loggerを返す" do
-        Dir.mktmpdir do |nam|
-          subject.new_logger('log_dir' => nam).should be_kind_of(Logger)
-        end
-      end
-
-      it "引数はディレクトリである" do
-        Tempfile.new("") do |f|
-          subject.new_logger('log_dir' => "nonexistent").should raise_exception(Errno::ENOENT)
-          subject.new_logger('log_dir' => f.path).should raise_exception(Errno::ENOENT)
-        end
-      end
-
-      it "ログファイルは引数のディレクトリの中にできる" do
-        Dir.mktmpdir do |nam|
-          subject.new_logger('log_dir' => nam)
-          nam.should have_at_least(3).files
-        end
-      end
-
-    end
-
-    describe "#process" do
-      subject { Class.new { include TengineJobAgent::CommandUtils } }
-      let(:instance) { mock(subject.new) }
-      before do
-        instance
-        subject.stub(:new).with(anything, anything, anything).and_return(instance)
-        subject.stub(:name).and_return(File.basename(__FILE__, ".rb"))
-      end
-
-      it "インスタンスを生成してprocessを呼ぶ" do
-        instance.should_receive(:process)
-        Dir.chdir File.expand_path("../..", __FILE__) do
-          subject.process
-        end
-      end
-
-      it "失敗するとfalseを返す" do
-        instance.should_receive(:process).and_raise(RuntimeError)
-        Dir.chdir File.expand_path("../..", __FILE__) do
-          subject.process.should == false
-        end
-      end
-    end
-  end
-end

data/spec/tengine_job_agent/run_spec.rb

@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-
-require 'yaml'
-require 'tengine/support/yaml_with_erb'
-require 'rbconfig'
-
-describe TengineJobAgent::Run do
-
-  before do
-    @log_buffer = StringIO.new
-    @logger = Logger.new(@log_buffer)
-    config = YAML.load_file(File.expand_path("../config/tengine_job_agent.yml.erb",
-                                             File.dirname(__FILE__)))
-    @config = config.inject({}) {|r, (k, v)| r.update k.intern => v }
-  end
-
-  subject do
-    Dir.chdir File.expand_path("../..", __FILE__) do
-      TengineJobAgent::Run.new(@logger, %w"scripts/echo_foo.sh", @config)
-    end
-  end
-
-  it { should_not be_nil }
-
-  describe "#process" do
-
-    let(:f) { mock(File.open("/dev/null")) }
-
-    before do
-      subject.stub(:spawn_watchdog).and_return mock(Numeric.new)
-      f
-      File.stub(:open).with(an_instance_of(String), "r").and_yield(f)
-      File.stub(:open).with(an_instance_of(String), "w")
-    end
-
-    context "正常起動" do
-      it "EXIT_SUCCESS" do
-        STDOUT.stub(:puts).with(an_instance_of(String))
-        f.stub(:gets).and_return("0\n")
-        subject.process.should == true
-      end
-    end
-
-    context "spawnできない" do
-      it "EXIT_FAILURE" do      
-        STDERR.stub(:puts) do |arg|
-          arg.should =~ /foo bar/
-        end
-        f.stub(:read).and_return("foo bar")
-        f.stub(:gets).and_return("foo bar")
-        f.stub(:rewind)
-        subject.process.should == false
-      end
-    end
-
-    context "timeout" do
-      it "EXIT_FAILURE" do
-        f.stub(:gets)
-        lambda { subject.process }.should raise_exception(Timeout::Error)
-      end
-    end
-  end
-
-  describe "#spawn_watchdog" do
-    it "tengine_job_agent_watchdogを起動する" do
-      watchdog = File.expand_path("../../bin/tengine_job_agent_watchdog", File.dirname(__FILE__))
-      Process.should_receive(:spawn).with(RbConfig.ruby, watchdog, an_instance_of(String), anything)
-      subject.spawn_watchdog
-    end
-
-    it "pidを返す" do
-      pid = mock(Numeric.new)
-      Process.stub(:spawn).with(RbConfig.ruby, anything, anything, anything).and_return(pid)
-      subject.spawn_watchdog.should == pid
-    end
-
-    it "終了を待たない" do
-      Process.stub(:spawn).with(RbConfig.ruby, anything, anything, anything)
-      Process.should_not_receive :wait
-      Process.should_not_receive :waitpid
-      Process.should_not_receive :waitpid2
-      subject.spawn_watchdog
-    end
-  end
-
-  describe "#initialize" do
-    it "第一引数にlogger" do
-      watchdog = File.expand_path("../../bin/tengine_job_agent_watchdog", File.dirname(__FILE__))
-      Process.should_receive(:spawn).with(RbConfig.ruby, watchdog, an_instance_of(String), anything)
-      subject.spawn_watchdog
-      @log_buffer.string.should_not be_empty
-    end
-
-    it "第二引数は起動するプロセスへの引数の配列" do
-      watchdog = File.expand_path("../../bin/tengine_job_agent_watchdog", File.dirname(__FILE__))
-      Process.should_receive(:spawn).with(RbConfig.ruby, watchdog, an_instance_of(String), "scripts/echo_foo.sh")
-      subject.spawn_watchdog
-    end
-
-    it "第三引数はconfig" do
-      subject.stub(:timeout) do |tim|
-        tim.should == @config[:timeout]
-      end
-    end
-  end
-end

data/spec/tengine_job_agent/scripts/echo_foo.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-echo 'foo'
-exit 0

data/spec/tengine_job_agent/scripts/sleep.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-typeset -i time=$1
-echo "`date` sleep.sh start"
-sleep `expr 1 + $time`
-echo "`date` sleep.sh finish"

data/spec/tengine_job_agent/watchdog_spec.rb

@@ -1,307 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-require 'amqp'
-
-require 'timeout'
-
-require 'yaml'
-require 'tengine/support/yaml_with_erb'
-
-describe TengineJobAgent::Watchdog do
-
-  before do
-    @log_buffer = StringIO.new
-    @logger = Logger.new(@log_buffer)
-    @config = YAML.load_file(File.expand_path("../config/tengine_job_agent.yml.erb",
-                                              File.dirname(__FILE__)))
-  end
-
-  subject do
-    @pid_path = "/dev/null"
-    echo_foo = File.expand_path "../scripts/echo_foo.sh", __FILE__
-    TengineJobAgent::Watchdog.new(@logger, [@pid_path, echo_foo], @config)
-  end
-
-  it { should_not be_nil }
-
-  describe "#process" do
-    let(:pid) { mock(Numeric.new) }
-    let(:stat) { mock($?) }
-    before do
-      bigzero = (1 << 1024).coerce(0)[0]
-      pid.stub(:to_int).and_return(bigzero)
-      stat.stub(:exitstatus).and_return(bigzero)
-    end
-
-    it "spawnする" do
-      subject.should_receive(:spawn_process).and_return(pid)
-      subject.stub(:detach_and_wait_process).with(pid).and_return(stat)
-      subject.stub(:fire_finished).with(pid, stat)
-      sender = mock(:sender)
-      sender.stub_chain(:mq_suite, :ensures).with(:connection).and_yield
-      subject.stub(:sender).and_return(sender)
-      sender.stub(:wait_for_connection).and_yield
-      EM.run do
-        EM.add_timer(0.1) { EM.stop }
-        subject.process
-      end
-    end
-
-    it "子プロセスを待つ" do
-      subject.stub(:spawn_process).and_return(pid)
-      subject.should_receive(:detach_and_wait_process).and_return(stat)
-      subject.stub(:fire_finished).with(pid, stat)
-      sender = mock(:sender)
-      sender.stub_chain(:mq_suite, :ensures).with(:connection).and_yield
-      subject.stub(:sender).and_return(sender)
-      sender.stub(:wait_for_connection).and_yield
-      EM.run do
-        EM.add_timer(0.1) { EM.stop }
-        subject.process
-      end
-    end
-
-    context "ファイルへの出力" do
-      before do
-        @echo_foo = File.expand_path "../scripts/echo_foo.sh", __FILE__
-        mock_stdout = mock(:stdout, :path => "/tmp/stdout")
-        mock_stderr = mock(:stderr, :path => "/tmp/stderr")
-        subject.should_receive(:with_tmp_outs).and_yield(mock_stdout, mock_stderr)
-        sender = mock(:sender)
-        sender.stub_chain(:mq_suite, :ensures).with(:connection).and_yield
-        subject.stub(:sender).and_return(sender)
-        sender.stub(:wait_for_connection).and_yield
-      end
-
-      it "実行に成功した場合はPIDが出力される" do
-        subject.should_receive(:spawn_process).and_return(pid)
-        mock_pid_file = mock(:pid_file)
-        File.should_receive(:open).with(@pid_path, "a").and_yield(mock_pid_file)
-        mock_pid_file.should_receive(:puts).with(pid)
-        subject.should_receive(:detach_and_wait_process).with(pid)
-        EM.run do
-          EM.add_timer(0.1) { EM.stop }
-          subject.process
-        end
-      end
-
-      it "ファイルが存在せずspawnに失敗した場合、エラーを出力する" do
-        subject.should_receive(:spawn_process).and_raise(Errno::ENOENT.new(@echo_foo))
-        mock_pid_file = mock(:pid_file)
-        File.should_receive(:open).with(@pid_path, "a").and_yield(mock_pid_file)
-        mock_pid_file.should_receive(:puts).with("[Errno::ENOENT] No such file or directory - #{@echo_foo}")
-        timeout(0.5) do
-          EM.run do
-            # EM.add_timer(0.1) { EM.stop } # 起動に失敗したらEMは自動でstopされる
-            subject.process
-          end
-        end
-      end
-    end
-
-  end
-
-  describe "#spawn_process" do
-    let(:pid) { mock(Numeric.new) }
-    let(:thr) { mock(Thread.start do Thread.stop end) }
-    let(:stat) { mock($?) }
-    before do
-      o = mock(STDOUT)
-      e = mock(STDERR)
-      o.stub(:path).and_return(String.new)
-      e.stub(:path).and_return(String.new)
-      subject.instance_eval do
-        @stdout = o
-        @stderr = e
-      end
-    end
-
-    it "spawnする" do
-      echo_foo = File.expand_path "../scripts/echo_foo.sh", __FILE__
-      Process.should_receive(:spawn).with(echo_foo, an_instance_of(Hash)).and_return(pid)
-      subject.spawn_process.should == pid
-    end
-
-    it "No such file or directoryで失敗する" do
-      echo_foo = File.expand_path "../scripts/echo_foo.sh", __FILE__
-      Process.should_receive(:spawn).with(echo_foo, an_instance_of(Hash)).
-        and_raise(Errno::ENOENT.new(echo_foo))
-      expect {
-        subject.spawn_process
-      }.to raise_error(Errno::ENOENT)
-    end
-  end
-
-  describe "#detach_and_wait_process" do
-    let(:pid) { mock(Numeric.new) }
-    let(:stat) { mock($?) }
-    before do
-      bigzero = (1 << 1024).coerce(0).first
-      stat.stub(:exitstatus).and_return(bigzero)
-      pid.stub(:to_int).and_return(bigzero)
-      Process.stub(:waitpid2).with(pid) do
-        sleep 3
-        [pid, stat]
-      end
-      subject.stub(:fire_finished) do EM.stop end
-      subject.stub(:fire_heartbeat).with(pid).and_yield
-    end
-
-    it "pidを待つ" do
-      EM.run do
-        subject.should_receive(:fire_finished) do EM.stop end
-        subject.detach_and_wait_process(pid)
-      end
-    end
-
-    it "heartbeatをfireしつづける" do
-      EM.run do
-        subject.should_receive(:fire_heartbeat).at_least(2).times.and_yield
-        subject.detach_and_wait_process(pid)
-      end
-    end
-
-    it "https://www.pivotaltracker.com/story/show/21515847" do
-      EM.run do
-        subject.instance_eval { @config["heartbeat"]["job"]["interval"] = 0 }
-        subject.unstub(:fire_heartbeat)
-        subject.should_receive(:fire_heartbeat).at_least(1).times.and_yield
-        subject.detach_and_wait_process(pid)
-      end
-    end
-
-    context "プロセスは正常に動き続けているがfireに失敗した場合" do
-      it "その回のfireはあきらめる。例外などで死なない" do
-        EM.run do
-          subject.unstub(:fire_heartbeat)
-          s = mock(Tengine::Event::Sender.new)
-          subject.stub(:sender).and_return(s)
-          def s.fire e, h, &b
-            h[:retry_count].should_not == nil
-            h[:retry_count].should == 0
-            b.yield if b
-          end
-          expect {
-            subject.detach_and_wait_process(pid)
-          }.to_not raise_exception(Tengine::Event::Sender::RetryError)
-        end
-      end
-    end
-
-    context "finishしたときのtimerの挙動" do
-      def live_timers_count
-        # これはひどい...
-        ObjectSpace.each_object(EM::PeriodicTimer).reject do |i|
-          i.instance_eval do
-            @cancelled
-          end
-        end
-      end
-      it "https://www.pivotaltracker.com/story/show/21466285" do
-        n = live_timers_count
-        EM.run do
-          subject.detach_and_wait_process(pid)
-        end
-        live_timers_count.should == n
-      end
-    end
-  end
-
-  describe "#fire_finished" do
-    let(:pid) { mock(Numeric.new) }
-    let(:stat) { mock($?) }
-    before do
-      pid.stub(:to_int).and_return(-0.0/1.0)
-      conn  = mock(:connection)
-      ch    = Object.new
-
-      AMQP.stub(:connect).with(an_instance_of(Hash)).and_return(conn)
-      AMQP::Channel.stub(:new).with(conn, :prefetch => 1, :auto_recovery => true).and_return(ch)
-      AMQP::Exchange.stub(:new).with(ch, "direct", "exchange1",
-        :passive=>false, :durable=>true, :auto_delete=>false, :internal=>false, :nowait=>true)
-      conn.stub(:on_tcp_connection_loss)
-      conn.stub(:after_recovery)
-      conn.stub(:on_closed)
-      sender = mock(:sender)
-      subject.stub(:sender).and_return(sender)
-      sender.stub(:wait_for_connection).and_yield
-
-      o = mock(STDOUT)
-      e = mock(STDERR)
-      o.stub(:path).and_return(String.new)
-      e.stub(:path).and_return(String.new)
-      subject.instance_eval do
-        @stdout = o
-        @stderr = e
-      end
-    end
-
-    it "finished.process.job.tengineをfire" do
-      EM.run do
-        FileUtils.stub(:cp).with(an_instance_of(String), an_instance_of(String))
-        stat.stub(:exitstatus).and_return(0)
-        s = mock(Tengine::Event::Sender.new)
-        subject.stub(:sender).and_return s
-        s.stub(:stop)
-        s.should_receive(:fire) do |k, v|
-          k.should == "finished.process.job.tengine"
-          v[:level_key].should == :info
-          v[:properties]["pid"].should == pid
-          v[:properties]["exit_status"].should == stat.exitstatus
-        end
-        subject.fire_finished(pid, stat)
-        EM.add_timer(0.1) { EM.stop }
-      end
-    end
-
-    it "プロセスが失敗していた場合" do
-      EM.run do
-        FileUtils.stub(:cp).with(an_instance_of(String), an_instance_of(String))
-        stat.stub(:exitstatus).and_return(256)
-        s = mock(Tengine::Event::Sender.new)
-        subject.stub(:sender).and_return s
-        s.stub(:stop)
-        s.should_receive(:fire) do |k, v|
-          k.should == "finished.process.job.tengine"
-          v[:level_key].should == :error
-          v[:properties][:message].should =~ /^Job process failed./
-        end
-        subject.fire_finished(pid, stat)
-        EM.add_timer(0.1) { EM.stop }
-      end
-    end
-
-    context "プロセスは正常に終了したがfireに失敗した場合" do
-      it "fireできるようになるまでリトライを続ける" do
-        EM.run do
-          stat.stub(:exitstatus).and_return(0)
-          s = mock(Tengine::Event::Sender.new)
-          n = 0
-          subject.stub(:sender).and_return(s)
-          s.stub(:stop)
-          s.stub(:fire).with("finished.process.job.tengine", an_instance_of(Hash)) do |e, h|
-            if h[:retry_count]
-                h[:retry_count].should > 0
-            end
-          end
-          expect {
-            subject.fire_finished(pid, stat)
-          }.to_not raise_exception(Tengine::Event::Sender::RetryError)
-          EM.add_timer(0.1) { EM.stop }
-        end
-      end
-    end
-  end
-
-  describe "#sender" do
-    before do
-      conn = mock(:connection)
-      conn.stub(:on_tcp_connection_loss)
-      conn.stub(:after_recovery)
-      conn.stub(:on_closed)
-      AMQP.stub(:connect).with(an_instance_of(Hash)).and_return(conn)
-    end
-    subject { TengineJobAgent::Watchdog.new(@logger, %w"", @config).sender }
-    it { should be_kind_of(Tengine::Event::Sender) }
-  end
-end

data/tengine_job_agent.gemspec

@@ -1,87 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "tengine_job_agent"
-  s.version = "0.3.17"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["taigou", "totty", "g-morita", "shyouhei", "akm"]
-  s.date = "2012-02-09"
-  s.description = "tengine_job_agent works with tengine_job"
-  s.email = "tengine@nautilus-technologies.com"
-  s.executables = ["tengine_job_agent_kill", "tengine_job_agent_run", "tengine_job_agent_watchdog"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/tengine_job_agent_kill",
-    "bin/tengine_job_agent_run",
-    "bin/tengine_job_agent_watchdog",
-    "lib/tengine_job_agent.rb",
-    "lib/tengine_job_agent/command_utils.rb",
-    "lib/tengine_job_agent/run.rb",
-    "lib/tengine_job_agent/watchdog.rb",
-    "spec/.gitignore",
-    "spec/config/tengine_job_agent.yml.erb",
-    "spec/log/.gitignore",
-    "spec/spec_helper.rb",
-    "spec/tengine_job_agent/command_utils_spec.rb",
-    "spec/tengine_job_agent/run_spec.rb",
-    "spec/tengine_job_agent/scripts/echo_foo.sh",
-    "spec/tengine_job_agent/scripts/sleep.sh",
-    "spec/tengine_job_agent/watchdog_spec.rb",
-    "tengine_job_agent.gemspec"
-  ]
-  s.homepage = "http://github.com/tengine/tengine_job_agent"
-  s.licenses = ["MPL2.0/LGPLv3"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.12"
-  s.summary = "tengine_job_agent invoke job, watches it and notify its finish to tengine server"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tengine_support>, ["~> 0.3.0"])
-      s.add_runtime_dependency(%q<tengine_event>, ["~> 0.4.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.18"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.5.3"])
-      s.add_development_dependency(%q<ZenTest>, ["~> 4.6.2"])
-      s.add_development_dependency(%q<ci_reporter>, ["~> 1.6.5"])
-    else
-      s.add_dependency(%q<tengine_support>, ["~> 0.3.0"])
-      s.add_dependency(%q<tengine_event>, ["~> 0.4.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<yard>, ["~> 0.7.2"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.18"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<simplecov>, ["~> 0.5.3"])
-      s.add_dependency(%q<ZenTest>, ["~> 4.6.2"])
-      s.add_dependency(%q<ci_reporter>, ["~> 1.6.5"])
-    end
-  else
-    s.add_dependency(%q<tengine_support>, ["~> 0.3.0"])
-    s.add_dependency(%q<tengine_event>, ["~> 0.4.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<yard>, ["~> 0.7.2"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.18"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<simplecov>, ["~> 0.5.3"])
-    s.add_dependency(%q<ZenTest>, ["~> 4.6.2"])
-    s.add_dependency(%q<ci_reporter>, ["~> 1.6.5"])
-  end
-end
-