iron_worker_ng 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20b9ca4a077f85f1563aec6717c34c6cea05c73
-  data.tar.gz: 76087c46464e1a34801836c610cccd4b992a8e48
+  metadata.gz: 85db46574b1c476ce867a7ca7a911fc82214e8a5
+  data.tar.gz: 51df9666082d05c5c52792661002ee1989e9cf03
 SHA512:
-  metadata.gz: 22cf54ee8a8860a336d8f538935ea08ad691717971f75c125008f4c9823cf88afe83861aa9fe4fad2fb1b0056dfecb21efde564f7ba1ccde60d28b1f701aa3e8
-  data.tar.gz: 4bb3824f9ee9cbe790808127090f966bed1c90e4bae5829366f0ab3552de09cc32e79731fcfe7d20137b7e54fed1eb021aad248378f8e9d488c7f93c1a4e82b8
+  metadata.gz: 4e4fa53b7adb5072f254a7d0ed107cfc91ac9ebae29180bec6d9d9ec8474115d30760dcaea1a596492c853e5ea14c3f586c793a5b6b4118f7b34c362378a5294
+  data.tar.gz: db9e43bf9d46b5c482f0b671b162747c49d198ae195c943f04f3383acb79468ed022277d816e357559b9d953670af4037d4ea1c4767f3549c56fd83ddd66da3b

data/README.md

@@ -411,6 +411,32 @@ for as many tasks as you want.
 client.tasks.create('MyWorker', {:client => 'Joe'})
 ```
 
+# Stacks
+Stack is a docker image based on ubuntu + some custom software(ruby/python/mono/java...)
+You can use different stacks to launch your tasks.
+To get list of available stacks you could do:
+
+```ruby
+client.stacks_list
+```
+
+or using cli
+
+```sh
+iron_worker stacks
+```
+
+And to specify stack add following line in your .worker file
+
+```ruby
+# define the runtime language, this can be ruby, java, node, php, go, etc.
+runtime 'binary'
+stack 'java-1.7'
+exec 'java.sh'
+```
+
+
+
 # The Rest of the IronWorker API
 
 ## IronWorker::Client

data/bin/iron_worker

@@ -41,7 +41,7 @@ if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')
   exit 0
 end
 
-commands = ['upload', 'patch', 'queue', 'retry', 'schedule', 'log', 'run', 'install', 'webhook', 'info']
+commands = ['upload', 'patch', 'queue', 'retry', 'schedule', 'log', 'run', 'install', 'webhook', 'info', 'stacks']
 
 if $*.size == 0 || (not commands.include?($*[0]))
   puts 'usage: iron_worker COMMAND [OPTIONS]'
@@ -445,4 +445,7 @@ elsif command == 'info'
 
     @cli.info_schedule($*[0], params, options)
   end
-end
+
+elsif command == 'stacks'
+  @cli.stacks_list
+end

data/lib/iron_worker_ng/api_client.rb

@@ -30,6 +30,10 @@ module IronWorkerNG
       super + @api_version.to_s + '/'
     end
 
+    def stacks_list
+      parse_response(get("stacks"))
+    end
+
     def codes_list(options = {})
       parse_response(get("projects/#{@project_id}/codes", options))
     end

data/lib/iron_worker_ng/cli.rb

@@ -64,6 +64,12 @@ module IronWorkerNG
       @client
     end
 
+    def stacks_list
+      client
+      log_group "List of available stacks"
+      print client.stacks_list
+    end
+
     def upload(name, params, options)
       client
 

data/lib/iron_worker_ng/client.rb

@@ -53,6 +53,11 @@ module IronWorkerNG
       end
     end
 
+    def stacks_list
+      @api.stacks_list
+    end
+
+
     def codes_list(options = {})
       IronCore::Logger.debug 'IronWorkerNG', "Calling codes.list with options='#{options.to_s}'"
 

data/lib/iron_worker_ng/code/base.rb

@@ -24,6 +24,7 @@ module IronWorkerNG
       attr_accessor :zip_package
 
       attr_accessor :use_local_iron_worker_ng
+      attr_accessor :fix_params
 
       undef exec
       undef gem
@@ -216,7 +217,7 @@ module IronWorkerNG
       def runtime_bundle(container, local = false)
       end
 
-      def runtime_run_code(local = false)
+      def runtime_run_code(local, params)
         ''
       end
 
@@ -226,6 +227,12 @@ module IronWorkerNG
         end
 
         if local || ((not remote_build_command) && (not full_remote_build))
+          params = "\"$@\""
+
+          if @fix_params
+            params="-`echo \"$@\" | sed \"s/ -/ --/g\"`"
+          end
+
           container.get_output_stream(@dest_dir + '__runner__.sh') do |runner|
             runner.write <<RUNNER
 #!/bin/sh
@@ -252,7 +259,7 @@ export PATH
 
 #{container.runner_additions}
 
-#{runtime_run_code(local)}
+#{runtime_run_code(local, params)}
 RUNNER
           end
 

data/lib/iron_worker_ng/code/runtime/binary.rb

@@ -4,11 +4,11 @@ module IronWorkerNG
       module Binary
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
 chmod +x #{File.basename(@exec.path)}
 
-#{File.basename(@exec.path)} "$@"
+#{File.basename(@exec.path)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/go.rb

@@ -4,9 +4,9 @@ module IronWorkerNG
       module Go
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-go run #{File.basename(@exec.path)} "$@"
+go run #{File.basename(@exec.path)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/java.rb

@@ -7,7 +7,7 @@ module IronWorkerNG
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
         include IronWorkerNG::Feature::Java::MergeJar::InstanceMethods
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           classpath_array = []
 
           classpath_array << @exec.path
@@ -23,7 +23,7 @@ module IronWorkerNG
           IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
 
           <<RUN_CODE
-java -cp #{classpath} #{@exec.arg(:class, 0).nil? ? "-jar #{File.basename(@exec.path)}" : @exec.arg(:class, 0)} "$@"
+java -cp #{classpath} #{@exec.arg(:class, 0).nil? ? "-jar #{File.basename(@exec.path)}" : @exec.arg(:class, 0)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/mono.rb

@@ -4,9 +4,9 @@ module IronWorkerNG
       module Mono
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-mono #{File.basename(@exec.path)} "$@"
+mono #{File.basename(@exec.path)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/node.rb

@@ -36,9 +36,9 @@ NODE_RUNNER
           end
         end
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-node #{File.basename(@exec.path)} "$@"
+node #{File.basename(@exec.path)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/perl.rb

@@ -4,9 +4,9 @@ module IronWorkerNG
       module Perl
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-perl #{File.basename(@exec.path)} "$@"
+perl #{File.basename(@exec.path)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/php.rb

@@ -62,9 +62,9 @@ PHP_RUNNER
           end
         end
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-TERM=dumb php __runner__.php "$@"
+TERM=dumb php __runner__.php #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/python.rb

@@ -8,9 +8,9 @@ module IronWorkerNG
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
         include IronWorkerNG::Feature::Python::MergePipDependency::InstanceMethods
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-PATH=`pwd`/__pips__/__bin__:$PATH PYTHONPATH=`pwd`/__pips__ python -u #{File.basename(@exec.path)} "$@"
+PATH=`pwd`/__pips__/__bin__:$PATH PYTHONPATH=`pwd`/__pips__ python -u #{File.basename(@exec.path)} #{params}
 RUN_CODE
         end
       end

data/lib/iron_worker_ng/code/runtime/ruby.rb

@@ -116,9 +116,9 @@ RUBY_RUNNER
           end
         end
 
-        def runtime_run_code(local = false)
+        def runtime_run_code(local, params)
           <<RUN_CODE
-ruby __runner__.rb "$@"
+ruby __runner__.rb #{params}
 RUN_CODE
         end
 

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.3.0'
+  VERSION = '1.4.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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -175,48 +175,48 @@ extra_rdoc_files: []
 files:
 - lib/3rdparty/hashie/indifferent_access.rb
 - lib/3rdparty/hashie/merge_initializer.rb
-- lib/iron_worker_ng/fetcher.rb
-- lib/iron_worker_ng/compat.rb
+- lib/iron_worker_ng/api_client.rb
+- lib/iron_worker_ng/cli.rb
 - lib/iron_worker_ng/client.rb
-- lib/iron_worker_ng/version.rb
-- lib/iron_worker_ng/code/python.rb
-- lib/iron_worker_ng/code/ruby.rb
-- lib/iron_worker_ng/code/mono.rb
-- lib/iron_worker_ng/code/node.rb
 - lib/iron_worker_ng/code/base.rb
+- lib/iron_worker_ng/code/binary.rb
+- lib/iron_worker_ng/code/builder.rb
+- lib/iron_worker_ng/code/container/base.rb
+- lib/iron_worker_ng/code/container/dir.rb
+- lib/iron_worker_ng/code/container/zip.rb
+- lib/iron_worker_ng/code/go.rb
 - lib/iron_worker_ng/code/java.rb
-- lib/iron_worker_ng/code/runtime/python.rb
-- lib/iron_worker_ng/code/runtime/ruby.rb
+- lib/iron_worker_ng/code/mono.rb
+- lib/iron_worker_ng/code/node.rb
+- lib/iron_worker_ng/code/perl.rb
+- lib/iron_worker_ng/code/php.rb
+- lib/iron_worker_ng/code/python.rb
+- lib/iron_worker_ng/code/ruby.rb
+- lib/iron_worker_ng/code/runtime/binary.rb
+- lib/iron_worker_ng/code/runtime/go.rb
+- lib/iron_worker_ng/code/runtime/java.rb
 - lib/iron_worker_ng/code/runtime/mono.rb
 - lib/iron_worker_ng/code/runtime/node.rb
-- lib/iron_worker_ng/code/runtime/java.rb
 - lib/iron_worker_ng/code/runtime/perl.rb
-- lib/iron_worker_ng/code/runtime/binary.rb
 - lib/iron_worker_ng/code/runtime/php.rb
-- lib/iron_worker_ng/code/runtime/go.rb
-- lib/iron_worker_ng/code/perl.rb
-- lib/iron_worker_ng/code/builder.rb
-- lib/iron_worker_ng/code/binary.rb
-- lib/iron_worker_ng/code/container/zip.rb
-- lib/iron_worker_ng/code/container/dir.rb
-- lib/iron_worker_ng/code/container/base.rb
-- lib/iron_worker_ng/code/php.rb
-- lib/iron_worker_ng/code/go.rb
+- lib/iron_worker_ng/code/runtime/python.rb
+- lib/iron_worker_ng/code/runtime/ruby.rb
+- lib/iron_worker_ng/compat.rb
 - lib/iron_worker_ng/feature/base.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
+- lib/iron_worker_ng/feature/common/merge_file.rb
+- lib/iron_worker_ng/feature/common/merge_zip.rb
+- lib/iron_worker_ng/feature/common/set_env.rb
+- lib/iron_worker_ng/feature/java/merge_jar.rb
 - lib/iron_worker_ng/feature/python/merge_pip.rb
 - lib/iron_worker_ng/feature/python/merge_pip_dependency.rb
-- lib/iron_worker_ng/feature/java/merge_jar.rb
-- lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
+- lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - 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
-- lib/iron_worker_ng/cli.rb
-- lib/iron_worker_ng/api_client.rb
+- lib/iron_worker_ng/fetcher.rb
+- lib/iron_worker_ng/version.rb
 - lib/iron_worker_ng.rb
 - README.md
 - LICENSE