mortar-api-ruby 0.8.7 → 0.8.8

data/lib/mortar/api/jobs.rb

@@ -50,11 +50,15 @@ module Mortar
       CLUSTER_TYPE__SINGLE_JOB = 'single_job'
       CLUSTER_TYPE__PERSISTENT = 'persistent'
       CLUSTER_TYPE__PERMANENT = 'permanent'
+
+      JOB_TYPE_ALL   = 'all'
+      JOB_TYPE_PIG   = 'pig'
+      JOB_TYPE_LUIGI = 'luigi'
     end
     
     
     # POST /vX/jobs
-    def post_job_existing_cluster(project_name, script_name, git_ref, cluster_id, options={})
+    def post_pig_job_existing_cluster(project_name, script_name, git_ref, cluster_id, options={})
       parameters = options[:parameters] || {}
       notify_on_job_finish = options[:notify_on_job_finish].nil? ? true : options[:notify_on_job_finish]
       is_control_script = options[:is_control_script] || false
@@ -63,7 +67,8 @@ module Mortar
         "git_ref" => git_ref,
         "cluster_id" => cluster_id,
         "parameters" => parameters,
-        "notify_on_job_finish" => notify_on_job_finish
+        "notify_on_job_finish" => notify_on_job_finish,
+        "job_type" => Jobs::JOB_TYPE_PIG
       }
       
       if is_control_script
@@ -88,9 +93,8 @@ module Mortar
         :body     => json_encode(body))
     end
 
-    
     # POST /vX/jobs
-    def post_job_new_cluster(project_name, script_name, git_ref, cluster_size, options={})
+    def post_pig_job_new_cluster(project_name, script_name, git_ref, cluster_size, options={})
       cluster_type = options[:cluster_type].nil? ? Jobs::CLUSTER_TYPE__PERSISTENT : options[:cluster_type]
       notify_on_job_finish = options[:notify_on_job_finish].nil? ? true : options[:notify_on_job_finish]
       use_spot_instances = options[:use_spot_instances].nil? ? false : options[:use_spot_instances]
@@ -103,6 +107,7 @@ module Mortar
         "cluster_type" => cluster_type,
         "parameters" => parameters,
         "notify_on_job_finish" => notify_on_job_finish,
+        "job_type" => Jobs::JOB_TYPE_PIG,
         "use_spot_instances" => use_spot_instances
       }
       if is_control_script
@@ -127,14 +132,33 @@ module Mortar
         :body     => json_encode(body))
     end
 
+    def post_luigi_job(project_name, luigiscript_name, git_ref, options={})
+      parameters = options[:parameters] || {}
+      body = { "project_name" => project_name,
+        "git_ref" => git_ref,
+        "luigiscript_name" => luigiscript_name,
+        "parameters" => parameters,
+        "job_type" => Jobs::JOB_TYPE_LUIGI
+      }
+      unless options[:project_script_path].nil?
+        body["project_script_path"] = options[:project_script_path]
+      end
+
+      request(
+        :expects  => 200,
+        :method   => :post,
+        :path     => versioned_path("/jobs"),
+        :body     => json_encode(body))
+    end
+
     # GET /vX/jobs
-    def get_jobs(skip, limit)
+    def get_jobs(skip, limit, job_type=Jobs::JOB_TYPE_PIG)
       request(
         :expects  => 200,
         :idempotent => true,
         :method   => :get,
         :path     => versioned_path("/jobs"),
-        :query    => { :skip => skip, :limit => limit }
+        :query    => { job_type => job_type, :skip => skip, :limit => limit }
       )
     end
     
@@ -157,5 +181,18 @@ module Mortar
         :path    => versioned_path("/jobs/#{job_id}")
       )
     end
+
+    # <b>DEPRECATED:</b> Please use <tt>post_pig_job_existing_cluster</tt> instead.
+    def post_job_existing_cluster(project_name, script_name, git_ref, cluster_id, options={})
+      warn "[DEPRECATION] 'post_job_existing_cluster' is deprecated.  Please use 'post_pig_job_existing_cluster' instead."
+      post_pig_job_existing_cluster(project_name, script_name, git_ref, cluster_id, options=options)
+    end
+
+    # <b>DEPRECATED:</b> Please use <tt>post_pig_job_new_cluster</tt> instead.
+    def post_job_new_cluster(project_name, script_name, git_ref, cluster_size, options={})
+      warn "[DEPRECATION] 'post_job_new_cluster' is deprecated.  Please use 'post_pig_job_new_cluster' instead."
+      post_pig_job_new_cluster(project_name, script_name, git_ref, cluster_size, options=options)
+    end
+
   end
 end

data/lib/mortar/api/version.rb

@@ -18,7 +18,7 @@ module Mortar
   class API
     # client version
     # see http://semver.org/
-    VERSION = "0.8.7"
+    VERSION = "0.8.8"
     
     SERVER_API_VERSION = "2"
   end

data/spec/mortar/api/jobs_spec.rb

@@ -30,7 +30,33 @@ describe Mortar::API do
   end
 
   context "jobs" do
-    it "posts a job for an existing cluster" do
+    it "posts a luigi job" do
+      job_id = "7b93e4d3ab034188a0c2be418d3d24ed"
+      project_name = "my_project"
+      pigscript_name = "my_luigiscript"
+      project_script_path = "luigiscripts/"
+      git_ref = "e20395b8b06fbf52e86665b0660209673f311d1a"
+      parameters = {"my-first-param" => 1, "MY-SECOND-PARAM" => "TWO"}
+      body = Mortar::API::OkJson.encode({"project_name" => project_name,
+                                         "git_ref" => git_ref,
+                                         "luigiscript_name" => pigscript_name,
+                                         "parameters" => parameters,
+                                         "job_type" => "luigi",
+                                         "project_script_path" => project_script_path})
+      Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
+        {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
+      end
+
+      response = @api.post_luigi_job(
+        project_name, 
+        pigscript_name, 
+        git_ref, 
+        :parameters => parameters, 
+        :project_script_path => project_script_path)
+      response.body['job_id'].should == job_id
+    end
+
+    it "posts a pig job for an existing cluster" do
       job_id = "7b93e4d3ab034188a0c2be418d3d24ed"
       project_name = "my_project"
       pigscript_name = "my_pigscript"
@@ -43,15 +69,30 @@ describe Mortar::API do
                                          "cluster_id" => cluster_id,
                                          "parameters" => parameters,
                                          "notify_on_job_finish" => true,
+                                         "job_type" => "pig",
                                          "pigscript_name" => pigscript_name,
-                                         "project_script_path" => project_script_path,
-
-})
+                                         "project_script_path" => project_script_path})
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
-      response = @api.post_job_existing_cluster(project_name, pigscript_name, git_ref, cluster_id, :parameters => parameters, :project_script_path => project_script_path)
+
+      response = @api.post_pig_job_existing_cluster(
+        project_name, 
+        pigscript_name, 
+        git_ref, 
+        cluster_id, 
+        :parameters => parameters, 
+        :project_script_path => project_script_path)
       response.body['job_id'].should == job_id
+
+      response_deprecated = @api.post_job_existing_cluster(
+        project_name, 
+        pigscript_name, 
+        git_ref, 
+        cluster_id, 
+        :parameters => parameters, 
+        :project_script_path => project_script_path)
+      response_deprecated.body['job_id'].should == job_id
     end
 
     it "posts a job for a new cluster, defaulting cluster_type to persistent" do
@@ -67,14 +108,17 @@ describe Mortar::API do
                                          "cluster_type" => cluster_type,
                                          "parameters" => {},
                                          "notify_on_job_finish" => true,
+                                         "job_type" => "pig",
                                          "use_spot_instances" => false,
-                                         "pigscript_name" => pigscript_name
-})
+                                         "pigscript_name" => pigscript_name})
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
-      response = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size)
+      response = @api.post_pig_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size)
       response.body['job_id'].should == job_id
+
+      response_deprecated = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size)
+      response_deprecated.body['job_id'].should == job_id
     end
 
     it "posts a job for a new cluster, defaulting to notify_on_job_finish of true" do
@@ -91,6 +135,7 @@ describe Mortar::API do
                                          "cluster_type" => cluster_type,
                                          "parameters" => {},
                                          "notify_on_job_finish" => true,
+                                         "job_type" => "pig",
                                          "use_spot_instances" => false,
                                          "pigscript_name" => pigscript_name,
                                          "project_script_path" => project_script_path,
@@ -98,8 +143,11 @@ describe Mortar::API do
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
-      response = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :project_script_path => project_script_path)
+      response = @api.post_pig_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :project_script_path => project_script_path)
       response.body['job_id'].should == job_id
+
+      response_deprecated = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :project_script_path => project_script_path)
+      response_deprecated.body['job_id'].should == job_id
     end
 
     it "accepts non-default params for notify_on_job_finish and use_spot_instances" do
@@ -116,6 +164,7 @@ describe Mortar::API do
                                          "cluster_type" => cluster_type,
                                          "parameters" => {},
                                          "notify_on_job_finish" => false,
+                                         "job_type" => "pig",
                                          "use_spot_instances" => true,
                                          "pigscript_name" => pigscript_name,
                                          "project_script_path" => project_script_path,
@@ -123,11 +172,16 @@ describe Mortar::API do
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
-      response = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, 
+      response = @api.post_pig_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, 
             :cluster_type => cluster_type, :notify_on_job_finish => false, 
             :use_spot_instances => true,
             :project_script_path => project_script_path)
       response.body['job_id'].should == job_id
+      response_deprecated = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, 
+            :cluster_type => cluster_type, :notify_on_job_finish => false, 
+            :use_spot_instances => true,
+            :project_script_path => project_script_path)
+      response_deprecated.body['job_id'].should == job_id
     end
     
     it "accepts cluster_type of single_job" do
@@ -144,6 +198,7 @@ describe Mortar::API do
                                          "cluster_type" => cluster_type,
                                          "parameters" => {},
                                          "notify_on_job_finish" => true,
+                                         "job_type" => "pig",
                                          "use_spot_instances" => false,
                                          "pigscript_name" => pigscript_name,
                                          "project_script_path" => project_script_path,
@@ -151,8 +206,11 @@ describe Mortar::API do
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
-      response = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :cluster_type => cluster_type, :project_script_path => project_script_path)
+      response = @api.post_pig_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :cluster_type => cluster_type, :project_script_path => project_script_path)
       response.body['job_id'].should == job_id
+
+      response_deprecated = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :cluster_type => cluster_type, :project_script_path => project_script_path)
+      response_deprecated.body['job_id'].should == job_id
     end
 
     it "accepts cluster_type of permanent" do
@@ -169,6 +227,7 @@ describe Mortar::API do
                                          "cluster_type" => cluster_type,
                                          "parameters" => {},
                                          "notify_on_job_finish" => true,
+                                         "job_type" => "pig",
                                          "use_spot_instances" => false,
                                          "pigscript_name" => pigscript_name,
                                          "project_script_path" => project_script_path,
@@ -176,8 +235,11 @@ describe Mortar::API do
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
-      response = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :cluster_type => cluster_type, :project_script_path => project_script_path)
+      response = @api.post_pig_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :cluster_type => cluster_type, :project_script_path => project_script_path)
       response.body['job_id'].should == job_id
+
+      response_deprecated = @api.post_job_new_cluster(project_name, pigscript_name, git_ref, cluster_size, :cluster_type => cluster_type, :project_script_path => project_script_path)
+      response_deprecated.body['job_id'].should == job_id
     end
 
     it "gets a job" do
@@ -199,6 +261,21 @@ describe Mortar::API do
       jobs = response.body["jobs"]
       jobs.nil?.should be_false
       jobs.length.should == 2
+
+      response = @api.get_jobs(0, 10, "all")
+      jobs = response.body["jobs"]
+      jobs.nil?.should be_false
+      jobs.length.should == 2
+
+      response = @api.get_jobs(0, 10, "pig")
+      jobs = response.body["jobs"]
+      jobs.nil?.should be_false
+      jobs.length.should == 2
+
+      response = @api.get_jobs(0, 10, "luigi")
+      jobs = response.body["jobs"]
+      jobs.nil?.should be_false
+      jobs.length.should == 2
     end
 
     it "stops a running job" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar-api-ruby
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-30 00:00:00 Z
+date: 2014-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: excon