isono 0.1.0 → 0.2.0

data/spec/util_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+require 'isono'
+include Isono
+
+require 'stringio'
+require 'eventmachine'
+
+describe Isono::Util do
+
+  it "gen_id" do
+    Util.gen_id.length.should > 0
+  end
+
+  it "quote_args" do
+    Util.quote_args('/bin/ls').should == '/bin/ls'
+    Util.quote_args('/bin/ls %s', %w[/home]).should == '/bin/ls \'/home\''
+    Util.quote_args('/bin/ls %s', ['$a']).should == '/bin/ls \'\\$a\''
+  end
+
+  it "system" do
+    io = StringIO.new
+
+    EM.run {
+      EM.defer {
+        begin
+          Util.system('/bin/ls', [], {:io=>io})
+          puts io.string
+        io.string.length.should > 0
+        EM.next_tick {EM.stop}
+      rescue => e
+          p e
+        end
+      }
+    }
+  end
+
+end

data/tasks/load_resource_manifest.rake

@@ -0,0 +1,7 @@
+
+require 'isono'
+
+raise "Please set ENV['RESOURCE_MANIFEST']" if ENV['RESOURCE_MANIFEST'].nil? || ENV['RESOURCE_MANIFEST'] == ''
+
+$manifest = Isono::ResourceManifest.load(ENV['RESOURCE_MANIFEST'])
+$instance_data = $manifest.instance_data

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: isono
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - axsh Ltd.
@@ -15,44 +16,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +09:00
+date: 2011-05-26 00:00:00 +09:00
 default_executable: cli
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        - 6
         - 7
-        version: 0.6.7
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196357
         segments: 
+        - 1
         - 0
-        - 12
-        - 10
-        version: 0.12.10
+        - 0
+        - beta
+        - 3
+        version: 1.0.0.beta.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: statemachine
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -64,9 +73,11 @@ dependencies:
   name: log4r
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -76,9 +87,11 @@ dependencies:
   name: bacon
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -88,9 +101,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -107,48 +122,65 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- LICENSE
+- NOTICE
+- Rakefile
 - bin/cli
+- isono.gemspec
 - lib/ext/shellwords.rb
 - lib/isono.rb
-- lib/isono/rack/object_method.rb
-- lib/isono/rack/proc.rb
-- lib/isono/rack/data_store.rb
-- lib/isono/rack/map.rb
-- lib/isono/rack/job.rb
-- lib/isono/rack/builder.rb
-- lib/isono/rack/thread_pass.rb
+- lib/isono/amqp_client.rb
+- lib/isono/daemonize.rb
+- lib/isono/event_delegate_context.rb
+- lib/isono/event_observable.rb
 - lib/isono/logger.rb
-- lib/isono/rack.rb
+- lib/isono/manifest.rb
 - lib/isono/messaging_client.rb
-- lib/isono/resource_manifest.rb
+- lib/isono/models/event_log.rb
+- lib/isono/models/job_state.rb
+- lib/isono/models/node_state.rb
+- lib/isono/models/resource_instance.rb
 - lib/isono/node.rb
-- lib/isono/manifest.rb
-- lib/isono/event_delegate_context.rb
-- lib/isono/amqp_client.rb
-- lib/isono/node_modules/job_channel.rb
 - lib/isono/node_modules/base.rb
-- lib/isono/node_modules/event_logger.rb
-- lib/isono/node_modules/event_channel.rb
-- lib/isono/node_modules/node_heartbeat.rb
-- lib/isono/node_modules/node_collector.rb
 - lib/isono/node_modules/data_store.rb
+- lib/isono/node_modules/event_channel.rb
+- lib/isono/node_modules/event_logger.rb
+- lib/isono/node_modules/job_channel.rb
 - lib/isono/node_modules/job_collector.rb
-- lib/isono/node_modules/rpc_channel.rb
 - lib/isono/node_modules/job_worker.rb
+- lib/isono/node_modules/node_collector.rb
+- lib/isono/node_modules/node_heartbeat.rb
+- lib/isono/node_modules/rpc_channel.rb
+- lib/isono/rack.rb
+- lib/isono/rack/builder.rb
+- lib/isono/rack/data_store.rb
+- lib/isono/rack/job.rb
+- lib/isono/rack/map.rb
+- lib/isono/rack/object_method.rb
+- lib/isono/rack/proc.rb
+- lib/isono/rack/thread_pass.rb
+- lib/isono/resource_manifest.rb
+- lib/isono/runner/base.rb
+- lib/isono/runner/cli.rb
+- lib/isono/runner/rpc_server.rb
 - lib/isono/serializer.rb
-- lib/isono/models/node_state.rb
-- lib/isono/models/resource_instance.rb
-- lib/isono/models/event_log.rb
-- lib/isono/models/job_state.rb
-- lib/isono/daemonize.rb
-- lib/isono/util.rb
 - lib/isono/thread_pool.rb
-- lib/isono/runner/rpc_server.rb
-- lib/isono/runner/agent.rb
-- lib/isono/event_observable.rb
-- isono.gemspec
-- LICENSE
-- NOTICE
+- lib/isono/util.rb
+- lib/isono/version.rb
+- spec/amqp_client_spec.rb
+- spec/event_observable_spec.rb
+- spec/file_channel_spec.rb
+- spec/job_channel_spec.rb
+- spec/logger_spec.rb
+- spec/manifest_spec.rb
+- spec/node_spec.rb
+- spec/resource_loader_spec.rb
+- spec/rpc_channel_spec.rb
+- spec/spec_helper.rb
+- spec/thread_pool_spec.rb
+- spec/util_spec.rb
+- tasks/load_resource_manifest.rake
 has_rdoc: true
 homepage: http://github.com/axsh/isono
 licenses: []
@@ -159,27 +191,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: isono
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Messageing and agent fabric
+summary: Messaging and agent fabric
 test_files: []
 

data/lib/isono/runner/agent.rb

@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'optparse'
-require 'amqp'
-require 'digest/sha1'
-
-require 'isono/agent'
-
-module Isono
-  module Runner
-    class Agent
-      include Daemonize
-      
-      def initialize(argv)
-        @argv = argv.dup
-        
-        @options = {
-          :amqp_server_uri => URI.parse('amqp://guest:guest@localhost/'),
-          :log_file => nil,
-          :pid_file => nil,
-          :daemonize => true
-        }
-        
-        parser.parse! @argv
-      end
-      
-      
-      def parser
-        @parser ||= OptionParser.new do |opts|
-          opts.banner = "Usage: agent [options]"
-          
-          opts.separator ""
-          opts.separator "Agent options:"
-          opts.on( "-i", "--id ID", "Manually specify the Agent ID" ) {|str| @options[:agent_id] = str }
-          opts.on( "-p", "--pid PIDFILE", "pid file path" ) {|str| @options[:pid_file] = str }
-          opts.on( "-s", "--server AMQP_URI", "amqp broker server to connect" ) {|str|
-            begin
-              @options[:amqp_server_uri] = URI.parse(str)
-            rescue URI::InvalidURIError => e
-              abort "#{e}"
-            end
-          }
-          opts.on("-X", "Run in foreground" ) { @options[:daemonize] = false }
-        end
-      end
-
-      
-      def run(manifest_path=nil)
-        #%w(QUIT INT TERM).each { |i|
-        %w(EXIT).each { |i|
-          Signal.trap(i) { Isono::Agent.stop{ remove_pidfile if @options[:daemonize]} }
-        }
-
-
-        # load manifest file
-        manifest = Manifest.load_file(manifest_path.nil? ? @options[:manifest_path] : manifest_path)
-
-        if @options[:node_id]
-          # force overwrite node_id if the command line arg was given.
-          manifest.node_id(@options[:node_id])
-        elsif manifest.node_id.nil?
-          # nobody specified the node_id then set the ID in the
-          # default manner. 
-          manifest.node_id(default_node_id)
-        end
-
-        @options[:log_file] ||= "/var/log/%s.log" % [manifest.node_name]
-        @options[:pid_file] ||= "/var/run/%s.pid" % [manifest.node_name]
-
-        if @options[:daemonize]
-          daemonize(@options[:log_file])
-        end
-
-        EventMachine.epoll
-        EventMachine.run {
-          Isono::Agent.start(manifest, @options)
-        }
-      end
-
-      private
-      def default_node_id
-        # use the ip address for the default routeas key value
-        Digest::SHA1.hexdigest(`/sbin/ip route get 8.8.8.8`.split("\n")[0].split.last)[0, 10]
-      end
-
-    end
-
-  end
-end