iron_worker_ng 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a65609ffb28dcfb0f237160299433f91e040d02
-  data.tar.gz: 6c54c2f7beee97da91616d3a6efd9d899fcb5443
+  metadata.gz: f20b9ca4a077f85f1563aec6717c34c6cea05c73
+  data.tar.gz: 76087c46464e1a34801836c610cccd4b992a8e48
 SHA512:
-  metadata.gz: 48de0b1aa5ebb1d82defd9f656d0e5caab3d301c719d3cc5baefffdd10595230f5a9b0a3fb145482b6d46d4be149971f58f54cd23f325c8b87592ebbecc06431
-  data.tar.gz: 57a501300c8140d6aae985b59d3bd0591378719cf23832e932ed8e42bbb0d5377c0bd9a19d405b269b6277d5b8ce91ffe53d57322f01ab4cc639009fcb302979
+  metadata.gz: 22cf54ee8a8860a336d8f538935ea08ad691717971f75c125008f4c9823cf88afe83861aa9fe4fad2fb1b0056dfecb21efde564f7ba1ccde60d28b1f701aa3e8
+  data.tar.gz: 4bb3824f9ee9cbe790808127090f966bed1c90e4bae5829366f0ab3552de09cc32e79731fcfe7d20137b7e54fed1eb021aad248378f8e9d488c7f93c1a4e82b8

data/README.md

@@ -72,6 +72,8 @@ Use the `--wait` parameter to queue a task, wait for it to complete and print th
 
     iron_worker queue hello -p "{\"hi\": \"world\"}" --wait
 
+### Queue up a task from code
+
 Most commonly you'll be queuing up tasks from code though, so you can do this:
 
 ```ruby
@@ -82,6 +84,23 @@ client = IronWorkerNG::Client.new
 end
 ```
 
+### Setting Task Priority
+
+You can specify priority of the task using `--priority` parameter:
+
+```ruby
+iron_worker queue hello --priority 0 # default value, lowest priority
+iron_worker queue hello --priority 1 # medium priority
+```
+
+Value of priority parameter means the priority queue to run the task in. Valid values are 0, 1, and 2. 0 is the default.
+
+From code you can set the priority like it done in snippet below:
+
+```ruby
+client.tasks.create("hello", some_params, priority: 2) # highest priority
+```
+
 ## Get task status
 
 When you call `iron_worker queue X`, you'll see the task ID in the output which you can use to get the status.

data/lib/iron_worker_ng/code/base.rb

@@ -8,6 +8,7 @@ require 'iron_worker_ng/feature/common/merge_exec'
 require 'iron_worker_ng/feature/common/merge_file'
 require 'iron_worker_ng/feature/common/merge_dir'
 require 'iron_worker_ng/feature/common/merge_deb'
+require 'iron_worker_ng/feature/common/merge_zip'
 require 'iron_worker_ng/feature/common/set_env'
 
 module IronWorkerNG
@@ -30,6 +31,7 @@ module IronWorkerNG
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDir::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDeb::InstanceMethods
+      include IronWorkerNG::Feature::Common::MergeZip::InstanceMethods
       include IronWorkerNG::Feature::Common::SetEnv::InstanceMethods
 
       def initialize(*args, &block)

data/lib/iron_worker_ng/code/container/zip.rb

@@ -1,6 +1,6 @@
-require 'zip'
+require 'zip/zip'
 
-Zip.continue_on_exists_proc = true
+Zip.options[:continue_on_exists_proc] = true
 
 module IronWorkerNG
   module Code
@@ -10,7 +10,7 @@ module IronWorkerNG
           super
 
           @name = @name + '.zip'
-          @zip = ::Zip::File.open(@name, ::Zip::File::CREATE)
+          @zip = ::Zip::ZipFile.open(@name, ::Zip::ZipFile::CREATE)
         end
 
         def add(dest, src)

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

@@ -0,0 +1,73 @@
+module IronWorkerNG
+  module Feature
+    module Common
+      module MergeZip
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :path
+          attr_reader :dest
+
+          def initialize(code, path, dest)
+            super(code)
+
+            @path = path
+            @dest = dest + (dest.empty? || dest.end_with?('/') ? '' : '/')
+          end
+
+          def bundle(container)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling zip with path='#{@path}' and dest='#{@dest}'"
+
+            if (not @code.full_remote_build) || (not IronWorkerNG::Fetcher.remote?(rebase(@path)))
+              tmp_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'zip')
+
+              ::Dir.mkdir(tmp_dir_name)
+
+              IronWorkerNG::Fetcher.fetch_to_file(rebase(@path)) do |zip|
+                zipf = ::Zip::ZipFile.open(zip)
+                zipf.restore_permissions = true
+
+                zipf.each do |f|
+                  next if zipf.get_entry(f).ftype == :directory
+
+                  FileUtils::mkdir_p(tmp_dir_name + '/' + File.dirname(f.name))
+                  zipf.get_entry(f).extract(tmp_dir_name + '/' + f.name)
+                end
+
+                zipf.each do |f|
+                  next if zipf.get_entry(f).ftype == :directory
+
+                  container_add(container, @dest + f.name, tmp_dir_name + '/' + f.name)
+                end
+              end
+
+              container.commit
+
+              FileUtils.rm_rf(tmp_dir_name)
+            end
+          end
+
+          def build_command
+            if @code.remote_build_command || @code.full_remote_build
+              if @code.full_remote_build && IronWorkerNG::Fetcher.remote?(rebase(@path))
+                "zip '#{rebase(@path)}', '#{@dest}'"
+              else
+                "zip '#{@code.dest_dir}#{@dest}#{File.basename(@path)}', '#{@dest}'"
+              end
+            else
+              nil
+            end
+          end
+        end
+
+        module InstanceMethods
+          def merge_zip(path, dest = '')
+            IronCore::Logger.info 'IronWorkerNG', "Merging zip with path='#{path}' and dest='#{dest}'"
+
+            @features << IronWorkerNG::Feature::Common::MergeZip::Feature.new(self, path, dest)
+          end
+
+          alias :zip :merge_zip
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: iron_cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: go
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: New generation ruby client for IronWorker
@@ -211,6 +211,7 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
 - lib/iron_worker_ng/feature/common/set_env.rb
 - lib/iron_worker_ng/feature/common/merge_file.rb
+- lib/iron_worker_ng/feature/common/merge_zip.rb
 - lib/iron_worker_ng/feature/common/merge_deb.rb
 - lib/iron_worker_ng/feature/common/merge_dir.rb
 - lib/iron_worker_ng/feature/common/merge_exec.rb
@@ -229,12 +230,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []