iron_worker_ng 0.2.2 → 0.2.3

data/README.md

@@ -55,13 +55,15 @@ code.merge_gem 'activerecord'
 
 The IronWorkerNG::Code::Ruby class will help you package your code for upload, but to upload it to the cloud, you'll need to use the `IronWorkerNG::Client` class.
 
-### initialize(name = nil)
+### initialize(*args)
 
-Create new code package with the specified name. If `name` is omitted, a camel-cased version of the worker's file name will be used.
+Create new code package with the specified args.
 
 ```ruby
-code = IronWorkerNG::Code::Ruby.new
-code_with_name = IronWorkerNG::Code::Ruby.new('CoolWorker')
+code_with_name = IronWorkerNG::Code::Ruby.new(:worker => 'cool_worker.rb', :name => 'CoolWorker')
+code_with_guessed_name = IronWorkerNG::Code::Ruby.new(:worker => 'cool_worker.rb')
+code_with_short_form_syntax = IronWorkeNG::Code::Ruby.new('cool_worker.rb')
+code = IronWorkerNG::Code::Ruby.new # will need to use code.merge_worker later
 ```
 
 ### name()
@@ -72,6 +74,14 @@ Return the code package's name.
 puts code.name
 ```
 
+### name=(name)
+
+Sets the code package's name.
+
+```ruby
+code.name = 'CoolWorker'
+```
+
 ### hash_string()
 
 Return the hash string for the code package. If you want to prevent uploading unchanged code packages, you can use it to check if any changes were made. It's very efficient, so it shouldn't cause any performance impact.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/iron_worker_ng/code/base.rb

@@ -8,7 +8,7 @@ require_relative '../feature/common/merge_dir'
 module IronWorkerNG
   module Code
     class Base
-      attr_reader :name
+      attr_accessor :name
       attr_reader :features
 
       @@registered_types = []
@@ -34,9 +34,18 @@ module IronWorkerNG
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDir::InstanceMethods
 
-      def initialize(name = nil, options = {})
-        @name = name
+      def initialize(*args)
+        @name = nil
         @features = []
+
+        if args.length == 1 && args[0].class == String && File.exists?(args[0])
+          merge_worker(args[0])
+        elsif args.length == 1 && args.class == String
+          @name = args[0]
+        elsif args.length == 1 && args.class == Hash
+          @name = args[0][:name]
+          merge_worker(args[0][:worker]) unless args[0][:worker].nil?
+        end
       end
 
       def fixate

data/lib/iron_worker_ng/code/java.rb

@@ -36,7 +36,7 @@ root() {
 
 cd "$(root "$@")"
 
-java -cp #{classpath} #{worker.klass} "$@"
+java -cp #{classpath} #{worker.klass.nil? ? "-jar #{File.basename(worker.path)}" : worker.klass} "$@"
 RUNNER
         end
       end

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

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module IronWorkerNG
   module Feature
     module Common
@@ -7,8 +9,10 @@ module IronWorkerNG
           attr_reader :dest
 
           def initialize(path, dest)
+            raise 'No such directory - ' + path unless Dir.exist? path
             @path = File.expand_path(path)
             @dest = dest
+            @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
           end
 
           def hash_string

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

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module IronWorkerNG
   module Feature
     module Common
@@ -9,6 +11,7 @@ module IronWorkerNG
           def initialize(path, dest)
             @path = File.expand_path(path)
             @dest = dest
+            @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
           end
 
           def hash_string

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

@@ -29,7 +29,7 @@ module IronWorkerNG
         module InstanceMethods
           attr_reader :worker
 
-          def merge_worker(path, klass)
+          def merge_worker(path, klass = nil)
             @worker ||= nil 
 
             unless @worker.nil?
@@ -37,7 +37,11 @@ module IronWorkerNG
               return
             end
 
-            @name ||= klass.split('.')[-1]
+            if klass.nil?
+              @name ||= File.basename(path).gsub(/\.jar$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
+            else
+              @name ||= klass.split('.')[-1]
+            end
 
             @worker = IronWorkerNG::Feature::Java::MergeWorker::Feature.new(path, klass)
 

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

@@ -23,7 +23,7 @@ module IronWorkerNG
             groups = groups.map { |g| g.to_sym }
             groups << :default if groups.length == 0
 
-            IronWorkerNG::Logger.info "Adding ruby gems dependencies from #{groups.join(', ')} group#{groups.size > 1 ? 's' : ''} of #{path}"
+            IronWorkerNG::Logger.info "Adding ruby gems dependencies from #{groups.join(', ')} group#{groups.length > 1 ? 's' : ''} of #{path}"
 
             specs = Bundler::Definition.build(path, path + '.lock', nil).specs_for(groups)
 

data/test/Gemfile

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

data/test/Rakefile

@@ -0,0 +1,45 @@
+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

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

data/test/helpers.rb

@@ -1 +1,46 @@
 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,21 +1,7 @@
-require './lib/iron_worker_ng.rb'
-require 'test/unit'
+require 'helpers'
 
-class BasicTest < 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
-
-  def test_basic
+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)
@@ -24,14 +10,4 @@ class BasicTest < Test::Unit::TestCase
     log = client.tasks_log(task_id)
     assert_equal( "hello\n", log, "worker stdout is in log" )
   end
-
-  def test_30_codes
-    31.times do |i|
-      code = IronWorkerNG::Code::Ruby.new("test_30_codes_code#{i}")
-      code.merge_worker(File.dirname(__FILE__) + '/hello.rb')
-      client.codes_create(code)
-    end
-    assert_equal( 31, client.codes_list.size )
-  end
-
 end

data/test/test_common_features.rb

@@ -0,0 +1,86 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -150,9 +150,14 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_worker.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: 
@@ -167,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 912710063
+      hash: -824880365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: