iron_worker_ng 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/bin/{iron_worker_ng → iron_worker}

@@ -5,9 +5,9 @@ require 'time'
 require 'iron_worker_ng'
 
 if $*.size == 0 || (not ['codes.create', 'tasks.create', 'schedules.create', 'tasks.log'].include?($*[0]))
-  puts 'usage: iron_worker_ng COMMAND [OPTIONS]'
+  puts 'usage: iron_worker COMMAND [OPTIONS]'
   puts '    COMMAND: codes.create, tasks.create, schedules.create, tasks.log'
-  puts '    run iron_worker_ng COMMAND --help to get more information about each command'
+  puts '    run iron_worker COMMAND --help to get more information about each command'
   exit 1
 end
 
@@ -27,7 +27,7 @@ if command == 'codes.create'
   execute_features = []
 
   opts = OptionParser.new do |opts|
-    opts.banner = "usage: iron_worker_ng #{command} [OPTIONS]"
+    opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
     opts.on('-r', '--runtime RUNTIME', runtimes.map { |r| r[:name] }, "#{runtimes_help}") do |v|
       runtime = v
@@ -87,7 +87,7 @@ elsif command == 'tasks.create' || command == 'schedules.create'
   print_id = false
 
   opts = OptionParser.new do |opts|
-    opts.banner = "usage: iron_worker_ng #{command} [OPTIONS]"
+    opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
     opts.on('-n', '--name NAME', 'code name') do |v|
       name = v 
@@ -171,7 +171,7 @@ elsif command == 'tasks.log'
   live = false
 
   opts = OptionParser.new do |opts|
-    opts.banner = "usage: iron_worker_ng #{command} [OPTIONS]"
+    opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
     opts.on('-t --task-id ID', 'task id') do |v|
       task_id = v 

data/lib/iron_worker_ng/api_client.rb

@@ -20,32 +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']
+
+      if (@token.nil? || @project_id.nil?) && ((not options[:yaml_config_file].nil?) || (not options['yaml_config_file'].nil?))
+        load_yaml_config(options[:yaml_config_file] || options['yaml_config_file'])
+      end
+
+      if (@token.nil? || @project_id.nil?) && ((not options[:json_config_file].nil?) || (not options['json_config_file'].nil?))
+        load_json_config(options[:json_config_file] || options['json_config_file'])
+      end
+
+      if @token.nil? || @project_id.nil?
+        load_yaml_config('iron.yml')
+      end
+
+      if @token.nil? || @project_id.nil?
+        load_json_config('iron.json')
+      end
+
+      @token ||= ENV['IRON_TOKEN']
       @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
+        load_yaml_config('~/.iron.yml')
+      end
+
+      if @token.nil? || @project_id.nil?
+        load_json_config('~/.iron.json')
       end
 
       if (not @token) || (not @project_id)
@@ -64,6 +65,24 @@ module IronWorkerNG
       @rest = Rest::Client.new
     end
 
+    def load_yaml_config(config_file)
+      if File.exists?(File.expand_path(config_file))
+        config = YAML.load_file(File.expand_path(config_file))
+
+        @token ||= config['token']
+        @project_id ||= config['project_id']
+      end
+    end
+
+    def load_json_config(config_file)
+      if File.exists?(File.expand_path(config_file))
+        config = JSON.load(File.read(File.expand_path(config_file)))
+
+        @token ||= config['token']
+        @project_id ||= config['project_id']
+      end
+    end
+
     def common_request_hash
       {
         'Content-Type' => 'application/json',

data/lib/iron_worker_ng/client.rb

@@ -105,14 +105,17 @@ module IronWorkerNG
     end
 
     def tasks_wait_for(task_id, options = {})
-      options[:sleep] ||= 5
+      options[:sleep] ||= options['sleep'] || 5
 
       task = tasks_get(task_id)
+
       while task.status == 'queued' || task.status == 'running'
         yield task if block_given?
         sleep options[:sleep]
         task = tasks_get(task_id)
       end
+
+      task
     end
 
     def schedules_list(options = {})

data/lib/iron_worker_ng/code/base.rb

@@ -38,10 +38,6 @@ module IronWorkerNG
         @name = nil
         @features = []
 
-        if File.exists?('Workerfile')
-          eval(File.read('Workerfile'))
-        end
-
         if args.length == 1 && args[0].class == String && File.exists?(args[0])
           merge_exec(args[0])
         elsif args.length == 1 && args[0].class == String
@@ -53,6 +49,14 @@ module IronWorkerNG
           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'])))
+        else
+          if File.exists?('Workerfile')
+            eval(File.read('Workerfile'))
+          end
+        end
+
         unless block.nil?
           instance_eval(&block)
         end

data/lib/iron_worker_ng/code/ruby.rb

@@ -41,7 +41,6 @@ $:.unshift("\#{root}")
 
 require 'json'
 
-@iron_worker_task_id = task_id
 @iron_task_id = task_id
 
 @payload = File.read(payload_file)
@@ -52,10 +51,8 @@ begin
 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
+@iron_token = parsed_payload['token'] || nil
+@iron_project_id = parsed_payload['project_id'] || nil
 @params = parsed_payload['params'] || {}
 
 keys = @params.keys
@@ -67,26 +64,14 @@ def payload
   @payload
 end
 
-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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -111,7 +111,7 @@ dependencies:
 description: New generation ruby client for IronWorker
 email: info@iron.io
 executables:
-- iron_worker_ng
+- iron_worker
 extensions: []
 extra_rdoc_files:
 - LICENSE
@@ -120,15 +120,7 @@ files:
 - LICENSE
 - README.md
 - VERSION
-- bin/iron_worker_ng
-- examples/ruby/hello/hello.rb
-- examples/ruby/hello/hello_worker.rb
-- examples/ruby/master_slave/master_slave.rb
-- examples/ruby/master_slave/master_worker.rb
-- examples/ruby/master_slave/slave_worker.rb
-- examples/ruby/simple/Gemfile
-- examples/ruby/simple/sample_worker.rb
-- examples/ruby/simple/simple.rb
+- bin/iron_worker
 - lib/iron_worker_ng.rb
 - lib/iron_worker_ng/api_client.rb
 - lib/iron_worker_ng/api_client_error.rb
@@ -150,14 +142,6 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
 - lib/iron_worker_ng/logger.rb
 - lib/iron_worker_ng/version.rb
-- test/Gemfile
-- test/Rakefile
-- test/data/dir1/stub
-- test/data/dir2/test
-- test/hello.rb
-- test/helpers.rb
-- test/test_basic.rb
-- test/test_common_features.rb
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
 post_install_message: 
@@ -172,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -114107507
+      hash: -1067507039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/examples/ruby/hello/hello.rb

@@ -1,26 +0,0 @@
-require 'iron_worker_ng'
-
-# to run examples, you must specify iron.io authentication token and project id
-token, project_id = [ ENV['IRON_IO_TOKEN'], ENV['IRON_IO_PROJECT_ID'] ]
-raise("please set $IRON_IO_TOKEN and $IRON_IO_PROJECT_ID " +
-      "environment variables") unless token and project_id
-
-# initializing api object with them
-client = IronWorkerNG::Client.new(:token => token,
-                                  :project_id => project_id)
-
-# create ruby code bundle
-code = IronWorkerNG::Code::Ruby.new
-code.merge_exec(File.dirname(__FILE__) + '/hello_worker.rb')
-
-# upload it to iron.io
-client.codes.create(code)
-
-# create task to run the bundle
-task_id = client.tasks.create('HelloWorker').id
-
-# wait for the task to finish
-client.tasks.wait_for(task_id)
-
-# retriving task log
-log = client.tasks.log(task_id) #> log == "hello\n" -- worker stdout is in log 

data/examples/ruby/hello/hello_worker.rb

@@ -1 +0,0 @@
-puts "hello"

data/examples/ruby/master_slave/master_slave.rb

@@ -1,39 +0,0 @@
-require 'iron_worker_ng'
-
-# to run examples, you must specify iron.io authentication token and project id
-token, project_id = [ ENV['IRON_IO_TOKEN'], ENV['IRON_IO_PROJECT_ID'] ]
-raise("please set $IRON_IO_TOKEN and $IRON_IO_PROJECT_ID " +
-      "environment variables") unless token and project_id
-
-# initializing api object with them
-client = IronWorkerNG::Client.new(:token => token,
-                                  :project_id => project_id)
-
-# create master code bundle
-master = IronWorkerNG::Code::Ruby.new
-master.merge_exec(File.dirname(__FILE__) + '/master_worker.rb')
-master.merge_gem('iron_worker_ng') # we need it to queue slave workers
-
-# create slave code bundle
-slave = IronWorkerNG::Code::Ruby.new
-slave.merge_exec(File.dirname(__FILE__) + '/slave_worker.rb')
-
-# upload both
-client.codes.create(master)
-client.codes.create(slave)
-
-# run master task
-task_id = client.tasks.create('MasterWorker',
-                              { 
-                                :args => [ [1, 2, 3],
-                                           [4, 5, 6],
-                                           [7, 8, 9] ]
-                              }).id
-
-# wait for the task to finish
-client.tasks.wait_for(task_id)
-
-# retriving task log
-log = client.tasks.log(task_id)
-
-#> log.lines.find{ |l| l =~ /Sum =/ } == "Sum = 45\n" -- correct result in log

data/examples/ruby/master_slave/master_worker.rb

@@ -1,22 +0,0 @@
-require 'iron_worker_ng'
-
-# token and project id are available inside worker
-client = IronWorkerNG::Client.new(:token => iron_io_token,
-                                  :project_id => iron_io_project_id)
-
-puts 'Running slave workers...'
-task_ids = []
-params[:args].each do |arg|
-  puts "Queueing slave with arg=#{arg.to_s}"
-  task_ids << client.tasks.create('SlaveWorker', { :arg => arg }).id
-end
-
-puts 'Retriving results from slaves logs'
-results = task_ids.map do |id|
-  client.tasks.wait_for(id)
-  client.tasks.log(id).to_i
-end
-
-puts "Sum = #{ results.inject(:+) }"
-
-puts 'Done'

data/examples/ruby/master_slave/slave_worker.rb

@@ -1 +0,0 @@
-puts params[:arg].inject(:+)

data/examples/ruby/simple/Gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-group :extra do
-  gem 'pry'
-end

data/examples/ruby/simple/sample_worker.rb

@@ -1,3 +0,0 @@
-require 'pry'
-require 'jeweler'
-puts "hello"

data/examples/ruby/simple/simple.rb

@@ -1,66 +0,0 @@
-require 'iron_worker_ng'
-
-# to run examples, you must specify iron.io authentication token and project id
-token, project_id = [ ENV['IRON_IO_TOKEN'], ENV['IRON_IO_PROJECT_ID'] ]
-raise("please set $IRON_IO_TOKEN and $IRON_IO_PROJECT_ID " +
-      "environment variables") unless token and project_id
-
-IronWorkerNG::Logger.logger.level = ::Logger::DEBUG
-
-# initializing api object with them
-client = IronWorkerNG::Client.new(:token => token,
-                                  :project_id => project_id,
-                                  # rest are optinal
-                                  :scheme => 'https',
-                                  :port => 443,
-                                  :api_version => 2,
-                                  :host => 'worker-aws-us-east-1.iron.io')
-
-# creating code bundle
-
-# if not specified, name default to worker name converted from underscore to camel style
-code = IronWorkerNG::Code::Ruby.new
-code.merge_exec('/sample_worker.rb')
-#> code.name == 'SampleWorker'
-
-# still can pass name in constructor
-code = IronWorkerNG::Code::Ruby.new('transmogrify')
-#> code.name == 'transmogrify'
-code.merge_exec(File.dirname(__FILE__) + '/sample_worker.rb')
-
-# once worker merged, following attempts will be ignored
-code.merge_exec('anything')
-#> code.worker.path.end_with? '/worker.rb'
-
-# if worker requires some gems, we 
-
-# we can specify worker dependency on gem
-code.merge_gem('jeweler')
-# or on Gemfile, which is recommended
-code.merge_gemfile(File.dirname(__FILE__) + '/Gemfile',
-                   :default, :extra)
-# all those dependencies will be resolved using bundler gem
-
-# upload code bundle to iron.io
-client.codes_create(code)
-
-# we can retrive code packages list
-codes = client.codes_list
-#> codes.map{|c| c.name}.include?('transmogrify')
-
-code_info = codes.find{|c| c.name == 'transmogrify'}
-# other way to get such info is codes.get:
-same_code_info = client.codes_get(code_info.id)
-#> same_code_info == code_info
-
-# create task to run the bundle
-task_id = client.tasks_create('transmogrify').id
-
-# wait for the task to finish
-client.tasks_wait_for(task_id)
-
-# retriving task log
-log = client.tasks_log(task_id) #> log == "hello\n" -- worker stdout is in log 
-
-# cleanup
-client.codes_delete(code_info.id)

data/test/Gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'iron_worker_ng'
-gem 'typhoeus'
-gem 'pry'

data/test/Rakefile

@@ -1,45 +0,0 @@
-require 'rake/testtask'
-require 'tmpdir'
-
-Dir.chdir(File.dirname(__FILE__) + '/..')
-
-Rake::TestTask.new do |t|
-  examples_tests_dir = Dir.mktmpdir('iw_examples')
-
-  FileUtils::cp_r(Dir.glob('examples/*'), examples_tests_dir)
-
-  Dir.glob('examples/**/**.rb').each do |path|
-    next unless path =~ %r|examples/(.*)/([^/]+)/\2.rb$|
-
-    dir = $1
-    name = $2
-
-    test_path = examples_tests_dir + "/#{dir}/#{name}/test_example_#{name}.rb"
-
-    File.open(test_path, 'w') do |out|
-      out << "require 'helpers'\n"
-      out << "class #{name.capitalize}Test < Test::Unit::TestCase\n"
-      out << "def test_example\n"
-
-      File.readlines(path).each do |line|
-        line, assert_str = line.chomp.split /#>/
-        out << line << "\n"
-
-        if assert_str
-          cond, desc = assert_str.split /--/
-          out << "assert(" << cond << ", '" <<
-            (desc or "").gsub(/'/, "\\\\'") << "')\n"
-        end
-      end
-
-      out << "end\nend\n"
-    end
-  end
-
-  t.libs << "lib" << "test" << examples_tests_dir
-  files = FileList['test/**/**.rb',
-                   examples_tests_dir + '/**/test_*.rb']
-  t.test_files = files.keep_if{ |f| f =~ Regexp.new(ENV['TESTP'] || '') }
-
-  t.verbose = true
-end

data/test/data/dir2/test

@@ -1 +0,0 @@
-test

data/test/hello.rb

@@ -1 +0,0 @@
-puts "hello"

data/test/helpers.rb

@@ -1,46 +0,0 @@
-require 'test/unit'
-require 'tempfile'
-
-require './lib/iron_worker_ng.rb'
-
-def code_bundle(name,&block)
-  code = IronWorkerNG::Code::Ruby.new(name)
-
-  class << code
-    def worker_code(str)
-      tmpdir = Dir.tmpdir + '/' + Digest::MD5.hexdigest(str)
-      Dir.mkdir tmpdir unless Dir.exist? tmpdir
-
-      tmpfname = tmpdir + '/worker.rb'
-      File.open(tmpfname, "w") { |f| f << str }
-
-      puts "created #{tmpfname}"
-      merge_worker(tmpfname)
-    end
-  end
-
-  code.instance_eval(&block)
-
-  code
-end
-
-def inspect_zip(code)
-  zip_file = code.create_zip
-  yield Zip::ZipFile.open(zip_file)
-  File.unlink zip_file
-end
-
-class IWNGTest < Test::Unit::TestCase
-  attr_accessor :client
-
-  def setup
-    IronWorkerNG::Logger.logger.level = ::Logger::DEBUG
-
-    token, project_id = [ ENV['IRON_IO_TOKEN'], ENV['IRON_IO_PROJECT_ID'] ]
-    raise("please set $IRON_IO_TOKEN and $IRON_IO_PROJECT_ID " +
-          "environment variables") unless token and project_id
-
-    @client = IronWorkerNG::Client.new(:token => token,
-                                       :project_id => project_id )
-  end
-end

data/test/test_basic.rb

@@ -1,13 +0,0 @@
-require 'helpers'
-
-class BasicTest < IWNGTest
-  def _test_basic
-    code = IronWorkerNG::Code::Ruby.new('test_basic')
-    code.merge_worker(File.dirname(__FILE__) + '/hello.rb')
-    client.codes_create(code)
-    task_id = client.tasks_create('test_basic').id
-    client.tasks_wait_for(task_id)
-    log = client.tasks_log(task_id)
-    assert_equal( "hello\n", log, "worker stdout is in log" )
-  end
-end

data/test/test_common_features.rb

@@ -1,86 +0,0 @@
-require 'helpers'
-require 'zip/zip'
-
-class CommonFeaturesTest < IWNGTest
-
-  def test_merge_file
-    code = code_bundle('test') do
-      merge_file('test', 'test/data/dir2')
-      merge_worker('test/hello.rb')
-    end
-
-    inspect_zip(code) do |zip|
-      assert zip.find_entry('test/data/dir2/test')
-    end
-  end
-
-  def test_merge_file_no_dest
-    code = code_bundle('test') do
-      merge_file('Gemfile')
-      merge_worker('test/hello.rb')
-    end
-
-    inspect_zip(code) do |zip|
-      assert zip.find_entry('Gemfile')
-    end
-  end
-
-  def test_merge_dir_check
-    assert_raise RuntimeError, "should check if merged dir exists" do
-      code_bundle('test') do
-        merge_dir('dir2', 'test/data')
-      end
-    end
-  end
-
-  def test_merge_dir
-    code = code_bundle('test') do
-      merge_dir('test/data/dir2', 'test/data')
-      merge_worker('test/hello.rb')
-    end
-
-    inspect_zip(code) do |zip|
-      assert zip.find_entry('test/data/dir2/test')
-    end
-  end
-
-  def test_merge_dir_no_dest
-    code = code_bundle('test') do
-      merge_dir('test')
-      merge_worker('test/hello.rb')
-    end
-
-    inspect_zip(code) do |zip|
-      assert zip.find_entry('test/hello.rb')
-    end
-  end
-
-  def test_symlinks
-    File.unlink 'test/data/dir1/dir2' if
-      File.symlink? 'test/data/dir1/dir2'
-
-    Dir.chdir('test/data/dir1') do
-      File.symlink('../dir2', 'dir2')
-    end
-
-    code = code_bundle 'test_symlinks' do
-      merge_dir('test/data/dir1', 'test/data')
-      merge_dir('test/data/dir2', 'test/data')
-      worker_code 'puts File.read("test/data/dir1/dir2/test")'
-    end
-
-    inspect_zip(code) do |zip|
-      assert_equal '../dir2', zip.read('test/data/dir1/dir2')
-    end
-
-    client.codes_create(code)
-    task_id = client.tasks_create('test_symlinks').id
-    client.tasks_wait_for(task_id)
-    log = client.tasks_log(task_id)
-
-    assert_equal "test", log
-
-    File.unlink 'test/data/dir1/dir2'
-  end
-
-end