iron_worker_ng 0.5.1 → 0.6.0

data/README.md

@@ -27,10 +27,11 @@ gem install typhoeus
 
 # Creating A Worker
 
-Each IronWorkerNG Ruby worker is just Ruby code. It can be as simple or as complex as you want. For example, the following is an acceptable worker:
+Each IronWorkerNG Ruby worker is just Ruby code. It can be as simple or as complex as you want. For example, 
+the following is an acceptable worker:
 
 ```ruby
-puts "I'm worker"
+puts "Hello Worker!"
 puts "My task_id is #{@iron_worker_task_id}"
 puts "I got '#{params}' parameters"
 ```
@@ -39,15 +40,48 @@ All output to `STDOUT` will be logged and available for your review when your wo
 
 # Creating The Code Package
 
-Because your worker will be executed in the cloud, you'll need to bundle all the necessary gems, supplementary data, and other dependencies with it. `IronWorkerNG::Code::Ruby` makes this easy.
+Before you can run use IronWorker, be sure you've [created a free account with Iron.io](http://www.iron.io)
+and [setup your Iron.io credentials on your system](http://dev.iron.io/articles/configuration/) (either in a json 
+file or using ENV variables). You only need to do that once for your machine. If you've done that, then you can continue. 
+
+Since our worker will be executed in the cloud, you'll need to bundle all the necessary gems, 
+supplementary data, and other dependencies with it. `.worker` files make it easy to define your worker.
 
 ```ruby
-code = IronWorkerNG::Code::Ruby.new
+# define the runtime language, this can be ruby, java, node, php, go, etc. 
+runtime "ruby"
+# exec is the file that will be executed:
+exec "hello_worker.rb"
+```
 
-code.merge_exec 'my_worker.rb'
-code.merge_file '../lib/utils.rb'
-code.merge_dir '../config'
-code.merge_gem 'activerecord'
+You can read more about `.worker` files here: http://dev.iron.io/worker/reference/worker-files/
+
+## Uploading the Code Package
+
+If your .worker file is called `hello.worker`, then run: 
+
+    iron_worker upload hello
+
+This will upload your worker with the name "hello" so you can reference it like that when queuing up tasks for it.
+
+## Queue Up a Task for your Worker
+
+You can quicky queue up a task for your worker from the command line using:
+
+    iron_worker queue hello
+
+Use the `-p` parameter to pass in a payload:
+
+    iron_worker queue hello -p "{\"hi\": \"world\"}"
+
+Most commonly you'll be queuing up tasks from code though, so you can do this:
+
+```ruby
+require "iron_worker_ng"
+client = IronWorkerNG::Client.new
+100.times do 
+   client.tasks.create("hello", "foo"=>"bar")
+end
 ```
 
 ## IronWorkerNG::Code::Ruby API

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lib/iron_worker_ng/code/base.rb

@@ -9,6 +9,7 @@ module IronWorkerNG
   module Code
     class Base
       attr_reader :features
+      attr_accessor :base_dir
 
       @@registered_types = []
     
@@ -41,6 +42,7 @@ module IronWorkerNG
 
       def initialize(*args, &block)
         @features = []
+        @base_dir = './'
 
         initialize_code(*args, &block)
       end
@@ -107,11 +109,13 @@ module IronWorkerNG
 # iron_worker_ng-#{IronWorkerNG.full_version}
 
 root() {
-  while [ $# -gt 0 ]; do
+  while [ $# -gt 1 ]; do
     if [ "$1" = "-d" ]; then
-      printf "%s\n" "$2"
+      printf "%s" "$2"
       break
     fi
+
+    shift
   done
 }
 

data/lib/iron_worker_ng/code/initializer.rb

@@ -15,22 +15,26 @@ module IronWorkerNG
             merge_exec(exec) unless exec.nil?
           end
 
-          if args.length == 1 and (opts = args[0]).is_a? Hash and wfile = opts[:workerfile] || opts['workerfile']
-            IronCore::Logger.info 'IronWorkerNG', "Processing workerfile #{wfile}"
-            eval(File.read(File.expand_path wfile))
-          end
+          wfiles = []
 
-          wfiles = ['Workerfile']
+          if args.length == 1 && args[0].class == Hash && (args[0][:workerfile] || args[0]['workerfile'])
+            wfiles << args[0][:workerfile] || args[0]['workerfile']
+          end
 
           unless name.nil?
             wfiles << name + '.worker'
             wfiles << name + '.workerfile'
           end
 
+          wfiles << 'Workerfile'
+
           wfiles.each do |wfile|
             if File.exists?(wfile)
-              IronCore::Logger.info 'IronWorkerNG', "Processing workerfile #{wfile}"
               eval(File.read(wfile))
+
+              @base_dir = File.dirname(wfile) + '/'
+
+              break
             end
           end
 

data/lib/iron_worker_ng/code/ruby.rb

@@ -12,23 +12,13 @@ module IronWorkerNG
       def bundle(zip)
         super(zip)
 
-        gempath_code_array = []
-      
-        @features.each do |f|
-          if f.respond_to?(:code_for_gempath)
-            gempath_code_array << f.send(:code_for_gempath)
-          end
-        end
-
-        gempath_code = gempath_code_array.join("\n")
-
         zip.get_output_stream('__runner__.rb') do |runner|
           runner.write <<RUBY_RUNNER
 # iron_worker_ng-#{IronWorkerNG.full_version}
 
 module IronWorkerNG
-  #{File.read(File.dirname(__FILE__) + '/../../3rdparty/hashie/merge_initializer.rb')}
-  #{File.read(File.dirname(__FILE__) + '/../../3rdparty/hashie/indifferent_access.rb')}
+#{File.read(File.dirname(__FILE__) + '/../../3rdparty/hashie/merge_initializer.rb')}
+#{File.read(File.dirname(__FILE__) + '/../../3rdparty/hashie/indifferent_access.rb')}
 end
 
 class IronWorkerNGHash < Hash
@@ -46,9 +36,8 @@ task_id = nil
   task_id = $*[i + 1] if $*[i] == '-id'
 end
 
-Dir.chdir(root)
+ENV['GEM_PATH'] = ([root + '__gems__'] + (ENV['GEM_PATH'] || '').split(':')).join(':')
 
-#{gempath_code}
 $:.unshift("\#{root}")
 
 require 'json'

data/lib/iron_worker_ng/feature/base.rb

@@ -1,6 +1,23 @@
 module IronWorkerNG
   module Feature
     class Base
+      def initialize(code)
+        @code = code
+      end
+
+      def zip_add(zip, dest, src, rebase = true)
+        if rebase && (not src.start_with?('/'))
+          src = @code.base_dir + src
+        end
+
+        unless File.exists?(src)
+          IronCore::Logger.error 'IronWorkerNG', "Can't find src with path='#{src}'"
+          raise IronCore::IronError.new("Can't find src with path='#{src}'")
+        end
+
+        zip.add(dest, src)
+      end
+
       def hash_string
         ''
       end

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

@@ -5,13 +5,10 @@ module IronWorkerNG
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
 
-          def initialize(path)
-            unless File.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find binary exec with path='#{path}'"
-              raise IronCore::IronError.new("Can't find binary exec with path='#{path}'")
-            end
+          def initialize(code, path)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
           end
 
           def hash_string
@@ -21,7 +18,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling binary exec with path='#{@path}'"
 
-            zip.add(File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), @path)
           end
         end
 
@@ -34,7 +31,7 @@ module IronWorkerNG
               return
             end
 
-            @exec = IronWorkerNG::Feature::Binary::MergeExec::Feature.new(path)
+            @exec = IronWorkerNG::Feature::Binary::MergeExec::Feature.new(self, path)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging binary exec with path='#{path}'"
 

data/lib/iron_worker_ng/feature/common/merge_dir.rb

@@ -8,13 +8,10 @@ module IronWorkerNG
           attr_reader :path
           attr_reader :dest
 
-          def initialize(path, dest)
-            unless Dir.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find directory with path='#{path}'"
-              raise IronCore::IronError.new("Can't find directory with path='#{path}'")
-            end
+          def initialize(code, path, dest)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
             @dest = dest
             @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
           end
@@ -33,7 +30,7 @@ module IronWorkerNG
             IronCore::Logger.debug 'IronWorkerNG', "Bundling dir with path='#{@path}' and dest='#{@dest}'"
 
             Dir.glob(@path + '/**/**') do |path|
-              zip.add(@dest + File.basename(@path) + path[@path.length .. -1], path)
+              zip_add(zip, @dest + File.basename(@path) + path[@path.length .. -1], path)
             end
           end
         end
@@ -42,7 +39,7 @@ module IronWorkerNG
           def merge_dir(path, dest = '')
             IronCore::Logger.info 'IronWorkerNG', "Merging dir with path='#{path}' and dest='#{dest}'"
 
-            @features << IronWorkerNG::Feature::Common::MergeDir::Feature.new(path, dest)
+            @features << IronWorkerNG::Feature::Common::MergeDir::Feature.new(self, path, dest)
           end
 
           alias :dir :merge_dir

data/lib/iron_worker_ng/feature/common/merge_file.rb

@@ -8,13 +8,10 @@ module IronWorkerNG
           attr_reader :path
           attr_reader :dest
 
-          def initialize(path, dest)
-            unless File.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find file with path='#{path}'"
-              raise IronCore::IronError.new("Can't find file with path='#{path}'")
-            end
+          def initialize(code, path, dest)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
             @dest = dest
             @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
           end
@@ -26,7 +23,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling file with path='#{@path}' and dest='#{@dest}'"
 
-            zip.add(@dest + File.basename(@path), @path)
+            zip_add(zip, @dest + File.basename(@path), @path)
           end
         end
 
@@ -34,7 +31,7 @@ module IronWorkerNG
           def merge_file(path, dest = '')
             IronCore::Logger.info 'IronWorkerNG', "Merging file with path='#{path}' and dest='#{dest}'"
 
-            @features << IronWorkerNG::Feature::Common::MergeFile::Feature.new(path, dest)
+            @features << IronWorkerNG::Feature::Common::MergeFile::Feature.new(self, path, dest)
           end
 
           alias :file :merge_file

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

@@ -6,13 +6,10 @@ module IronWorkerNG
           attr_reader :path
           attr_reader :klass
 
-          def initialize(path, klass)
-            unless File.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find java exec with path='#{path}'"
-              raise IronCore::IronError.new("Can't find java exec with path='#{path}'")
-            end
+          def initialize(code, path, klass)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
             @klass = klass
           end
 
@@ -23,7 +20,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling java exec with path='#{@path}' and class='#{@klass}'"
 
-            zip.add(File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), @path)
           end
 
           def code_for_classpath
@@ -40,7 +37,7 @@ module IronWorkerNG
               return
             end
 
-            @exec = IronWorkerNG::Feature::Java::MergeExec::Feature.new(path, klass)
+            @exec = IronWorkerNG::Feature::Java::MergeExec::Feature.new(self, path, klass)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging java exec with path='#{path}' and class='#{klass}'"
 

data/lib/iron_worker_ng/feature/java/merge_jar.rb

@@ -5,13 +5,10 @@ module IronWorkerNG
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
 
-          def initialize(path)
-            unless File.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find java jar with path='#{path}'"
-              raise IronCore::IronError.new("Can't find java jar with path='#{path}'")
-            end
+          def initialize(code, path)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
           end
 
           def hash_string
@@ -21,7 +18,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling java jar with path='#{@path}'"
 
-            zip.add(File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), @path)
           end
 
           def code_for_classpath
@@ -33,7 +30,7 @@ module IronWorkerNG
           def merge_jar(path)
             IronCore::Logger.info 'IronWorkerNG', "Merging java jar with path='#{path}'"
 
-            @features << IronWorkerNG::Feature::Java::MergeJar::Feature.new(path)
+            @features << IronWorkerNG::Feature::Java::MergeJar::Feature.new(self, path)
           end
 
           alias :jar :merge_jar

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

@@ -5,13 +5,10 @@ module IronWorkerNG
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
 
-          def initialize(path)
-            unless File.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find node exec with path='#{path}'"
-              raise IronCore::IronError.new("Can't find node exec with path='#{path}'")
-            end
+          def initialize(code, path)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
           end
 
           def hash_string
@@ -21,7 +18,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling node exec with path='#{@path}'"
 
-            zip.add(File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), @path)
           end
         end
 
@@ -34,7 +31,7 @@ module IronWorkerNG
               return
             end
 
-            @exec = IronWorkerNG::Feature::Node::MergeExec::Feature.new(path)
+            @exec = IronWorkerNG::Feature::Node::MergeExec::Feature.new(self, path)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging node exec with path='#{path}'"
 

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

@@ -6,13 +6,10 @@ module IronWorkerNG
           attr_reader :path
           attr_reader :klass
 
-          def initialize(path, klass)
-            unless File.exist?(path)
-              IronCore::Logger.error 'IronWorkerNG', "Can't find ruby exec with path='#{path}'"
-              raise IronCore::IronError.new("Can't find ruby exec with path='#{path}'")
-            end
+          def initialize(code, path, klass)
+            super(code)
 
-            @path = File.expand_path(path)
+            @path = path
             @klass = klass
           end
 
@@ -23,7 +20,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby exec with path='#{path}' and class='#{klass}'"
 
-            zip.add(File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), @path)
           end
         end
 
@@ -36,7 +33,7 @@ module IronWorkerNG
               return
             end
 
-            @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(path, klass)
+            @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(self, path, klass)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging ruby exec with path='#{path}' and class='#{klass}'"
 

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

@@ -15,7 +15,9 @@ module IronWorkerNG
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :spec
 
-          def initialize(spec)
+          def initialize(code, spec)
+            super(code)
+
             @spec = spec
           end
 
@@ -42,22 +44,16 @@ module IronWorkerNG
             if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?
               IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby gem with name='#{@spec.name}' and version='#{@spec.version}'"
 
-              zip.add('__gems__/' + @spec.full_name, gem_path)
+              zip_add(zip, '__gems__/gems/' + @spec.full_name, gem_path, false)
+              zip_add(zip, "__gems__/specifications/#{@spec.full_name}.gemspec", File.expand_path(gem_path + '/../../specifications/' + @spec.full_name + '.gemspec'), false)
+
               Dir.glob(gem_path + '/**/**') do |path|
-                zip.add('__gems__/' + @spec.full_name + path[gem_path.length .. -1], path)
+                zip_add(zip, '__gems__/gems/' + @spec.full_name + path[gem_path.length .. -1], path, false)
               end
             else
               IronCore::Logger.warn 'IronWorkerNG', "Skipping ruby gem with name='#{@spec.name}' and version='#{@spec.version}' as it contains native extensions"
             end
           end
-
-          def code_for_gempath
-            if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?
-              '$:.unshift("#{root}/__gems__/' + @spec.full_name + '/lib")'
-            else
-              '# native gem ' + @spec.full_name
-            end
-          end
         end
 
         module InstanceMethods
@@ -101,7 +97,7 @@ module IronWorkerNG
 
                 IronCore::Logger.info 'IronWorkerNG', "Merging ruby gem with name='#{spec.name}' and version='#{spec.version}'"
 
-                @features << IronWorkerNG::Feature::Ruby::MergeGem::Feature.new(spec)
+                @features << IronWorkerNG::Feature::Ruby::MergeGem::Feature.new(self, spec)
               end
             end
           end

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

@@ -8,8 +8,10 @@ module IronWorkerNG
           attr_reader :path
           attr_reader :groups
 
-          def initialize(path, groups)
-            @path = File.expand_path(path)
+          def initialize(code, path, groups)
+            super(code)
+
+            @path = path
             @groups = groups
           end
 
@@ -31,7 +33,7 @@ module IronWorkerNG
               merge_gem(spec.name, spec.version.to_s)
             end
 
-            @features << IronWorkerNG::Feature::Ruby::MergeGemfile::Feature.new(path, groups)
+            @features << IronWorkerNG::Feature::Ruby::MergeGemfile::Feature.new(self, path, groups)
           end
 
           alias :gemfile :merge_gemfile

data/ng_tests_worker.rb

@@ -1,3 +1,2 @@
-Dir.chdir Dir.glob('iwng/*').first
-ENV['NG_GEM_PATH'] = $:.join ':'
-exec 'rake -f test/Rakefile test TESTP=basic'
+Dir.chdir 'iwng'
+exec 'rake -f test/Rakefile test'

data/remote_test.rb

@@ -20,7 +20,13 @@ code = IronWorkerNG::Code::Ruby.new do
   exec 'ng_tests_worker.rb'
   gemfile 'Gemfile'
   gemfile 'test/Gemfile'
-  dir '.', 'iwng'
+
+  Dir.glob('*').each do |p|
+    dir p, 'iwng'  if Dir.exist? p
+    file p, 'iwng' if File.exist? p
+  end
+
+  iron_io_config 'iwng'
 end
 
 puts client.codes.create(code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 257115443
+      hash: 667437213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: