iron_worker_ng 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/iron_worker_ng/code/base.rb

@@ -9,7 +9,6 @@ module IronWorkerNG
   module Code
     class Base
       attr_reader :features
-      attr_accessor :name
 
       @@registered_types = []
     
@@ -43,28 +42,31 @@ module IronWorkerNG
         elsif args.length == 1 && args[0].class == Hash
           @name = args[0][:name] || args[0]['name']
 
-          exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
+          exec = args[0][:exec] || args[0]['exec'] ||
+            args[0][:worker] || args[0]['worker']
           merge_exec(exec) unless exec.nil?
         end
 
-        if args.length == 1 && args[0].class == Hash && ((not args[0][:workerfile].nil?) || (not args[0]['workerfile'].nil?))
-          eval(File.read(File.expand_path(args[0][:workerfile] || args[0]['workerfile'])))
+        if args.length == 1 and (opts = args[0]).is_a? Hash and wfile = opts[:workerfile] || opts['workerfile']
+          eval(File.read(File.expand_path wfile))
         end
 
         unless @exec.nil?
           @name ||= guess_name(@exec.path)
         end
 
-        if (not @name.nil?) && File.exists?(@name + '.worker')
-          eval(File.read(@name + '.worker'))
-        end
+        wfiles = ['Workerfile']
 
-        if (not @name.nil?) && File.exists?(@name + '.workerfile')
-          eval(File.read(@name + '.workerfile'))
+        unless @name.nil?
+          wfiles << @name + '.worker'
+          wfiles << @name + '.workerfile'
         end
 
-        if File.exists?('Workerfile')
-          eval(File.read('Workerfile'))
+        wfiles.each do |wfile|
+          if File.exists? wfile
+            eval(File.read wfile)
+            IronCore::Logger.info 'IronWorkerNG', "Processing workerfile #{wfile}"
+          end
         end
 
         unless block.nil?
@@ -76,6 +78,16 @@ module IronWorkerNG
         end
       end
 
+      def name(*args)
+        @name = args[0] if args.length == 1
+
+        @name
+      end
+
+      def name=(name)
+        @name = name
+      end
+
       def guess_name(path)
         File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -641630419
+      hash: -200243437
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: