right_infrastructure_agent 1.1.4 → 2.0.0

data/README.rdoc

@@ -1,3 +1,5 @@
+"master" branch: {<img src="https://magnum.travis-ci.com/rightscale/right_infrastructure_agent.svg?token=iMyNTpAx4RVEN4cmH4uH&branch=master" alt="Build Status" />}[https://magnum.travis-ci.com/rightscale/right_infrastructure_agent]
+
 = RightInfrastructureAgent
 
 = DESCRIPTION
@@ -9,7 +11,7 @@ servers that connect into the RightScale system via the RabbitMQ message bus.
 It extends RightAgent in configuration, monitoring, and packet handling areas
 as needed generically by infrastructure servers.
 
-Maintained by the RightScale Teal Team
+Maintained by the RightScale Cornsilk Team
 
 == Interface
 

data/Rakefile

@@ -23,64 +23,51 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'fileutils'
+
 require 'rake'
-require 'rspec/core/rake_task'
-require 'rdoc/task'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/clean'
+require 'rspec/core/rake_task'
+require 'fileutils'
 
-task :default => 'spec'
-
-# == Gem packaging == #
-
-desc "Package gem"
-gemtask = Rake::GemPackageTask.new(Gem::Specification.load("right_infrastructure_agent.gemspec")) do |package|
-  package.package_dir = ENV['PACKAGE_DIR'] || 'pkg'
-  package.need_zip = true
-  package.need_tar = true
+# These dependencies can be omitted using "bundle install --without"; tolerate their absence.
+['rdoc/task'].each do |optional|
+  begin
+    require optional
+  rescue LoadError
+    # ignore
+  end
 end
 
-directory gemtask.package_dir
-
-CLEAN.include(gemtask.package_dir)
-
-# == Unit tests == #
-
-RSPEC_OPTS = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+desc "Run unit tests"
+task :default => :spec
 
 desc 'Run unit tests'
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = RSPEC_OPTS
+RSpec::Core::RakeTask.new do |t| 
+  t.rspec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+  t.pattern = Dir['**/*_spec.rb']
 end
 
-namespace :spec do
-  desc 'Run unit tests with RCov'
-  RSpec::Core::RakeTask.new(:rcov) do |t|
-    t.rspec_opts = RSPEC_OPTS
-    t.rcov = true
-    t.rcov_opts = %q[--exclude "spec"]
-  end
-
-  desc 'Print Specdoc for all unit tests'
-  RSpec::Core::RakeTask.new(:doc) do |t|
-    t.rspec_opts = ["--format", "documentation"]
+if defined?(Rake::RDocTask)
+  desc 'Generate documentation for the right_infrastructure_agent gem.'
+  Rake::RDocTask.new(:rdoc) do |rdoc|
+    rdoc.rdoc_dir = 'doc'
+    rdoc.title    = 'RightAgent'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README.rdoc')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_files.exclude('spec/**/*')
   end
 end
+CLEAN.include('doc')
 
-# == Documentation == #
-
-desc 'Generate API documentation to doc/rdocs/index.html'
-Rake::RDocTask.new do |rd|
-  rd.rdoc_dir = 'doc/rdocs'
-  rd.main = 'README.rdoc'
-  rd.rdoc_files.include 'README.rdoc', 'lib/**/*.rb'
+desc "Package gem"
+gemtask = Gem::PackageTask.new(Gem::Specification.load("right_infrastructure_agent.gemspec")) do |pkg|
+  pkg.package_dir = 'pkg'
+  pkg.need_zip = true
+  pkg.need_tar = true
 end
-CLEAN.include('doc/rdocs')
+CLEAN.include('pkg')
 
-# == Emacs integration ==
-
-desc 'Rebuild TAGS file for emacs'
-task :tags do
-  sh 'rtags -R lib spec'
-end
+require 'right_develop'
+RightDevelop::CI::RakeTask.new

data/lib/right_infrastructure_agent/rainbows_agent_controller.rb

@@ -35,9 +35,12 @@ module RightScale
     # Start agent and create error tracker for its use
     # Choose agent type from candidate types based on contents of configuration directory
     # Assign agent name by using worker index to suffix agent type
+    # Agent is required to call Proc in :ready_proc option when it is ready to receive traffic
     #
     # @param [Array] agent_types for candidate agents
-    # @param [Integer] worker_index for this rainbows worker process; 0-based
+    # @param [Unicorn::Worker] worker created by rainbows for this worker process;
+    #   worker index is contained in its :nr attribute; worker will not receive HTTP traffic
+    #   until its :ready attribute is set to true
     # @param [Object] logger to use
     #
     # @option options [String] :cfg_dir containing configuration for all agents
@@ -48,10 +51,10 @@ module RightScale
     # the configuration hash and returning the updated configuration hash, optional
     #
     # @return [TrueClass] always true
-    def self.start(agent_types, worker_index, logger, options = {}, &block)
+    def self.start(agent_types, worker, logger, options = {}, &block)
       RightSupport::Log::Mixin.default_logger = logger
       Log.force_logger(logger) if logger
-      @worker_index = worker_index
+      @worker_index = worker.nr
       agent_name = nil
 
       # Need next_tick here to wait for rainbows worker to start EventMachine
@@ -91,7 +94,7 @@ module RightScale
           cfg.inject([]) do |t, (k, v)|
             t << "-  #{k}: #{k.to_s =~ /pass|auth/ ? "<hidden>" : (v.respond_to?(:each) ? v.inspect : v)}"
           end.sort.each { |l| Log.info(l) }
-          @agent = agent_class.start(cfg)
+          @agent = agent_class.start(cfg.merge(:ready_proc => Proc.new { worker.ready = true }))
 
         rescue PidFile::AlreadyRunning
           Log.error("#{agent_name} already running") rescue nil

data/right_infrastructure_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_infrastructure_agent'
-  spec.version   = '1.1.4'
-  spec.date      = '2014-08-22'
+  spec.version   = '2.0.0'
+  spec.date      = '2015-05-12'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_infrastructure_agent'
@@ -37,9 +37,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.8.7'
   spec.require_path = 'lib'
 
-  spec.add_dependency('right_support', '~> 2.1')
-  spec.add_dependency('right_amqp', '~> 0.4')
-  spec.add_dependency('right_agent', '~> 2.0')
+  spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
+  spec.add_dependency('right_agent', '~> 2.4')
 
   spec.description = <<-EOF
   RightInfrastructureAgent provides the foundation for RightScale infrastructure

data/spec/spec_helper.rb

@@ -12,8 +12,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'flexmock'
 require 'rspec'
+require 'flexmock'
+require 'simplecov'
 require 'eventmachine'
 require 'fileutils'
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: right_infrastructure_agent
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Lee Kirchhoff
@@ -9,55 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.4.1
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: right_amqp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: right_agent
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
-description: |2
-    RightInfrastructureAgent provides the foundation for RightScale infrastructure
-    servers that connect into the RightScale system via the RabbitMQ message bus.
-    It extends RightAgent in configuration, monitoring, and packet handling areas
-    as needed generically by infrastructure servers.
+        version: '2.4'
+description: ! "  RightInfrastructureAgent provides the foundation for RightScale
+  infrastructure\n  servers that connect into the RightScale system via the RabbitMQ
+  message bus.\n  It extends RightAgent in configuration, monitoring, and packet handling
+  areas\n  as needed generically by infrastructure servers.\n"
 email: lee@rightscale.com
 executables: []
 extensions: []
@@ -88,29 +84,33 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/rightscale/right_infrastructure_agent
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.rdoc
-- "--title"
+- --title
 - RightInfrastructureAgent
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4260722709866981988
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.26
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RightAgent extension for use by RightScale infrastructure servers
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 596c56ba8756ec6dfba54af77974094be8d270a4
-  data.tar.gz: 341d620ed223b1456ec935dcbbc7b74a1a79d909
-SHA512:
-  metadata.gz: 72c1b1d847e9fd0ee93e2e5d1999e7699f6415cb14adf3a30d9ce712ceb032081eb75ccf1e8c0752b52041b8b3876f0f2c558f4f63f42b8dec540c524c69b19a
-  data.tar.gz: d87575a698c4352f9073987ac1e72dab87fc3f61c9fbfcd9cf1da7f49da304faea276cb3b2fc53e769450fa718777883a33ed9a32ad95aa69983cde0d08ec28e