iron_worker_ng 0.2.7 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.0

data/lib/iron_worker_ng/api_client.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'rest'
 require 'json'
+require 'yaml'
 require 'time'
 
 require_relative 'api_client_error'
@@ -19,7 +20,33 @@ module IronWorkerNG
 
     def initialize(options = {})
       @token = options[:token] || options['token']
+      @token ||= ENV['IRON_IO_TOKEN']
+      @token ||= ENV['IRON_TOKEN']
+
       @project_id = options[:project_id] || options['project_id']
+      @project_id ||= ENV['IRON_IO_PROJECT_ID']
+      @project_id ||= ENV['IRON_PROJECT_ID']
+
+      if @token.nil? || @project_id.nil?
+        [ENV['IRON_IO_CONFIG'], ENV['IRON_IO_CONFIG_FILE'], ENV['IRON_CONFIG'], ENV['IRON_CONFIG_FILE'], '~/.iron', '/etc/iron.conf'].each do |config_file|
+          if (not config_file.nil?) && File.exists?(File.expand_path(config_file))
+            config = YAML.load_file(File.expand_path(config_file))
+          
+            unless config['iron_io'].nil?
+              @token ||= config['iron_io']['token']
+              @project_id ||= config['iron_io']['project_id']
+            end
+
+            unless config['iron'].nil?
+              @token ||= config['iron']['token']
+              @project_id ||= config['iron']['project_id']
+            end
+
+            @token ||= config['token']
+            @project_id ||= config['project_id']
+          end
+        end
+      end
 
       if (not @token) || (not @project_id)
         IronWorkerNG::Logger.error 'Both iron.io token and project_id must be specified' 

data/lib/iron_worker_ng/code/ruby.rb

@@ -42,6 +42,7 @@ $:.unshift("\#{root}")
 require 'json'
 
 @iron_worker_task_id = task_id
+@iron_task_id = task_id
 
 @payload = File.read(payload_file)
 
@@ -52,7 +53,9 @@ rescue
 end
 
 @iron_io_token = parsed_payload['token'] || nil
+@iron_token = @iron_io_token
 @iron_io_project_id = parsed_payload['project_id'] || nil
+@iron_project_id = @iron_io_project_id
 @params = parsed_payload['params'] || {}
 
 keys = @params.keys
@@ -68,14 +71,26 @@ def iron_worker_task_id
   @iron_worker_task_id
 end
 
+def iron_task_id
+  @iron_task_id
+end
+
 def iron_io_token
   @iron_io_token
 end
 
+def iron_token
+  @iron_token
+end
+
 def iron_io_project_id
   @iron_io_project_id
 end
 
+def iron_project_id
+  @iron_project_id
+end
+
 def params
   @params
 end

data/lib/iron_worker_ng/feature/ruby/merge_exec.rb

@@ -46,6 +46,8 @@ module IronWorkerNG
             @features << @exec
           end
 
+          alias :merge_worker :merge_exec
+
           def self.included(base)
             IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH[,CLASS]')
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -383095743
+      hash: -806070963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: