mortar-api-ruby 0.4.1 → 0.5.0

data/lib/mortar/api/clusters.rb

@@ -24,6 +24,15 @@ module Mortar
         :method   => :get,
         :path     => versioned_path("/clusters")
       )
-    end    
+    end 
+    
+      # DELETE /v2/clusters/:cluster_id
+      def stop_cluster(cluster_id)
+        request(
+          :expects => 200,
+          :method  => :delete,
+          :path    => versioned_path("/clusters/#{cluster_id}")
+        )
+      end   
   end
 end

data/lib/mortar/api/jobs.rb

@@ -52,6 +52,7 @@ module Mortar
     # POST /vX/jobs
     def post_job_existing_cluster(project_name, pigscript, git_ref, cluster_id, options={})
       parameters = options[:parameters] || {}
+      notify_on_job_finish = options[:notify_on_job_finish].nil? ? true : options[:notify_on_job_finish]
       request(
         :expects  => 200,
         :method   => :post,
@@ -60,13 +61,15 @@ module Mortar
                                   "pigscript_name" => pigscript,
                                   "git_ref" => git_ref,
                                   "cluster_id" => cluster_id,
-                                  "parameters" => parameters
+                                  "parameters" => parameters,
+                                  "notify_on_job_finish" => notify_on_job_finish
                                   }))
     end
     
     # POST /vX/jobs
     def post_job_new_cluster(project_name, pigscript, git_ref, cluster_size, options={})
       keep_alive = options[:keepalive].nil? ? true : options[:keepalive]
+      notify_on_job_finish = options[:notify_on_job_finish].nil? ? true : options[:notify_on_job_finish]
       parameters = options[:parameters] || {}
       request(
         :expects  => 200,
@@ -77,7 +80,8 @@ module Mortar
                                   "git_ref" => git_ref,
                                   "cluster_size" => cluster_size,
                                   "keep_alive" => keep_alive,
-                                  "parameters" => parameters
+                                  "parameters" => parameters,
+                                  "notify_on_job_finish" => notify_on_job_finish
                                   }))
     end
     

data/lib/mortar/api/version.rb

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

data/spec/mortar/api/clusters_spec.rb

@@ -39,6 +39,15 @@ describe Mortar::API do
       clusters.nil?.should be_false
       clusters.length.should == 2
     end
+    
+    it "stops a running cluster" do
+      cluster_id = "1234abc342221abc"
+      Excon.stub({:method => :delete, :path => "/v2/clusters/#{cluster_id}"}) do |params|
+        {:body => Mortar::API::OkJson.encode({"success" => true}), :status => 200}
+      end
+      response = @api.stop_cluster(cluster_id)
+      response.body["success"].should be_true
+    end
 
   end
 end

data/spec/mortar/api/jobs_spec.rb

@@ -41,7 +41,9 @@ describe Mortar::API do
                                          "pigscript_name" => pigscript_name,
                                          "git_ref" => git_ref,
                                          "cluster_id" => cluster_id,
-                                         "parameters" => parameters})
+                                         "parameters" => parameters,
+                                         "notify_on_job_finish" => true
+})
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end
@@ -60,13 +62,57 @@ describe Mortar::API do
                                          "git_ref" => git_ref,
                                          "cluster_size" => cluster_size,
                                          "keep_alive" => true,
-                                         "parameters" => {}})
+                                         "parameters" => {},
+                                         "notify_on_job_finish" => true
+})
       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.body['job_id'].should == job_id
     end
+
+    it "posts a job for a new cluster, defaulting to notify_on_job_finish of true" do
+      job_id = "7b93e4d3ab034188a0c2be418d3d24ed"
+      project_name = "my_project"
+      pigscript_name = "my_pigscript"
+      git_ref = "e20395b8b06fbf52e86665b0660209673f311d1a"
+      cluster_size = 5
+      body = Mortar::API::OkJson.encode({"project_name" => project_name,
+                                         "pigscript_name" => pigscript_name,
+                                         "git_ref" => git_ref,
+                                         "cluster_size" => cluster_size,
+                                         "keep_alive" => true,
+                                         "parameters" => {},
+                                         "notify_on_job_finish" => true
+})
+      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.body['job_id'].should == job_id
+    end
+
+    it "accepts notify_on_job_finish of false" do
+      job_id = "7b93e4d3ab034188a0c2be418d3d24ed"
+      project_name = "my_project"
+      pigscript_name = "my_pigscript"
+      git_ref = "e20395b8b06fbf52e86665b0660209673f311d1a"
+      cluster_size = 5
+      body = Mortar::API::OkJson.encode({"project_name" => project_name,
+                                         "pigscript_name" => pigscript_name,
+                                         "git_ref" => git_ref,
+                                         "cluster_size" => cluster_size,
+                                         "keep_alive" => false,
+                                         "parameters" => {},
+                                         "notify_on_job_finish" => false
+})
+      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, :keepalive => false, :notify_on_job_finish => false)
+      response.body['job_id'].should == job_id
+    end
     
     it "accepts keep_alive of false" do
       job_id = "7b93e4d3ab034188a0c2be418d3d24ed"
@@ -79,7 +125,9 @@ describe Mortar::API do
                                          "git_ref" => git_ref,
                                          "cluster_size" => cluster_size,
                                          "keep_alive" => false,
-                                         "parameters" => {}})
+                                         "parameters" => {},
+                                         "notify_on_job_finish" => true
+})
       Excon.stub({:method => :post, :path => "/v2/jobs", :body => body}) do |params|
         {:body => Mortar::API::OkJson.encode({'job_id' => job_id}), :status => 200}
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar-api-ruby
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 Z
+date: 2013-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: excon