iron_worker_ng 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/iron_worker_ng

@@ -182,9 +182,9 @@ elsif command == 'tasks.log'
       task_id = v 
     end
 
-    #opts.on('--live', 'live log session') do |v|
-    #  live = true
-    #end
+    opts.on('--live', 'live log session') do |v|
+      live = true
+    end
   end
 
   begin
@@ -200,6 +200,7 @@ elsif command == 'tasks.log'
   end
 
   log = ''
+
   if live
     begin
       log = client.tasks.log(task_id)
@@ -212,10 +213,8 @@ elsif command == 'tasks.log'
   print log
 
   if live
-    status = client.tasks.get(task_id).status
-
-    while status == 'queued' || status == 'running'
-      if status == 'running'
+    client.tasks.wait_for(task_id) do |task|
+      if task.status == 'running'
         begin
           next_log = client.tasks.log(task_id)
           print next_log[log.length .. - 1]
@@ -223,10 +222,6 @@ elsif command == 'tasks.log'
         rescue IronWorkerNG::APIClientError
         end
       end
-
-      sleep 1
-   
-      status = client.tasks.get(task_id).status
     end
 
     begin

data/lib/iron_worker_ng/api_client.rb

@@ -113,6 +113,10 @@ module IronWorkerNG
       parse_response(post("projects/#{@project_id}/tasks/#{id}/cancel"))
     end
 
+    def tasks_cancel_all(code_id)
+      parse_response(post("projects/#{@project_id}/codes/#{code_id}/cancel_all"))
+    end
+
     def tasks_log(id)
       parse_response(get("projects/#{@project_id}/tasks/#{id}/log"), false)
     end

data/lib/iron_worker_ng/client.rb

@@ -34,6 +34,14 @@ module IronWorkerNG
       end
     end
 
+    def codes_list(params = {})
+      @api.codes_list(params)['codes'].map { |c| OpenStruct.new(c) }
+    end
+
+    def codes_get(code_id)
+      OpenStruct.new(@api.codes_get(code_id))
+    end
+
     def codes_create(code)
       zip_file = code.create_zip
       @api.codes_create(code.name, zip_file, code.runtime, code.runner)
@@ -42,6 +50,28 @@ module IronWorkerNG
       true
     end
 
+    def codes_delete(code_id)
+      @api.codes_delete(code_id)
+
+      true
+    end
+
+    def codes_revisions(code_id, params = {})
+      @api.codes_revisions(code_id, params)['revisions'].map { |c| OpenStruct.new(c) }
+    end
+
+    def codes_download(code_id, params = {})
+      @api.codes_download(code_id, params)
+    end
+
+    def tasks_get(task_id)
+      OpenStruct.new(@api.tasks_get(task_id))
+    end
+
+    def tasks_list(params = {})
+      @api.tasks_list(params)['tasks'].map { |t| OpenStruct.new(t) }
+    end
+
     def tasks_get(task_id)
       OpenStruct.new(@api.tasks_get(task_id))
     end
@@ -52,14 +82,57 @@ module IronWorkerNG
       OpenStruct.new(res['tasks'][0])
     end
 
+    def tasks_cancel(task_id)
+      @api.tasks_cancel(task_id)
+
+      true
+    end
+
+    def tasks_cancel_all(code_id)
+      @api.tasks_cancel_all(code_id)
+
+      true
+    end
+
     def tasks_log(task_id)
       @api.tasks_log(task_id)
     end
 
+    def tasks_set_progress(task_id, params = {})
+      @api.tasks_set_progress(task_id, params)
+
+      true
+    end
+
+    def tasks_wait_for(task_id, params = {})
+      params[:sleep] ||= 5
+
+      task = tasks_get(task_id)
+      while task.status == 'queued' || task.status == 'running'
+        yield task if block_given?
+        sleep params[:sleep]
+        task = tasks_get(task_id)
+      end
+    end
+
+    def schedules_list(params = {})
+      @api.schedules_list(params)['schedules'].map { |s| OpenStruct.new(s) }
+    end
+
+    def schedules_get(schedule_id)
+      OpenStruct.new(@api.schedules_get(schedule_id))
+    end
+
     def schedules_create(code_name, params = {}, options = {})
       res = @api.schedules_create(code_name, {:project_id => @api.project_id, :token => @api.token, :params => params}.to_json, options)
 
       OpenStruct.new(res['schedules'][0])
     end
+
+    def schedules_cancel(schedule_id)
+      @api.schedules_cancel(schedule_id)
+
+      true
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &83479100 !ruby/object:Gem::Requirement
+  requirement: &71964750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83479100
+  version_requirements: *71964750
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &83478800 !ruby/object:Gem::Requirement
+  requirement: &71964290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83478800
+  version_requirements: *71964290
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &83302470 !ruby/object:Gem::Requirement
+  requirement: &71963650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83302470
+  version_requirements: *71963650
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &83301960 !ruby/object:Gem::Requirement
+  requirement: &72040590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83301960
+  version_requirements: *72040590
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &83301580 !ruby/object:Gem::Requirement
+  requirement: &72039740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *83301580
+  version_requirements: *72039740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &83301220 !ruby/object:Gem::Requirement
+  requirement: &72039180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *83301220
+  version_requirements: *72039180
 description: New generation ruby client for IronWorker
 email: info@iron.io
 executables:
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -801788643
+      hash: 498540403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: