mortar 0.3.2 → 0.3.3

data/README.md

@@ -1,36 +1,31 @@
-# Mortar CLI
+# Mortar Development Framework
 
-The Mortar CLI lets you run Hadoop jobs on the Mortar service.
+Mortar is a platform as a service for Hadoop. With Mortar, you can run jobs on Hadoop using Apache Pig and Python without any special training.
 
-# Setup
-
-## Ruby
-
-First, install [rvm](https://rvm.io/rvm/install/).
+The Mortar Development Framework lets you develop Mortar Hadoop jobs directly on your local computer without installing any Hadoop libraries.  Lots more info can be found on the [Mortar help site](http://help.mortardata.com).  
 
-        curl -kL https://get.rvm.io | bash -s stable
-        
-Afterward, add the line recommended by rvm to your bash initialization file.
-
-Then, switch to the directory where you've cloned mortar.  If you don't have the right version of Ruby installed, you will be prompted to upgrade via rvm.
+# Setup
 
 ## Dependencies
 
-Install required gems:
+* [Git](http://git-scm.com/downloads) 1.7.7 or later
+* [Ruby](http://www.ruby-lang.org/en/downloads/) 1.8.7 or later
+* [Gem](https://rubygems.org/pages/download) (included with Ruby 1.9.2+)
+
+## Installation
 
-        bundle install
+    gem install mortar
 
-# Running
+# Development
 
-You can run the command line through bundle:
+To develop on the gem, install the bundle, and then use bundle exec to run mortar:
 
-        bundle exec mortar <command> <args>
-        
-        # example
-        bundle exec mortar help
+    gem install bundler
+    bundle install
+    bundle exec mortar <command> <args>
 
-# Testing
+# Tests
 
-To run the tests, do:
+You can run all the RSpec tests with rake:
 
-        rake spec
+    rake spec

data/lib/mortar/command.rb

@@ -124,6 +124,7 @@ module Mortar
     global_option :help,    "--help", "-h"
     global_option :remote,  "--remote REMOTE"
     global_option :polling_interval, "--polling_interval SECONDS", "-p"
+    global_option :no_browser, "--no_browser"
 
     def self.prepare_run(cmd, args=[])
       command = parse(cmd)

data/lib/mortar/command/base.rb

@@ -310,6 +310,10 @@ protected
     (options[:polling_interval] || 2.0).to_f
   end
 
+  def no_browser?
+    (options[:no_browser])
+  end
+
 end
 
 module Mortar::Command

data/lib/mortar/command/illustrate.rb

@@ -29,6 +29,7 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
   #
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
   # -f, --param-file PARAMFILE  # Load pig parameter values from a file.
+  # --no_browser                # Don't open the illustrate results automatically in the browser.
   #
   # Examples:
   #  
@@ -84,9 +85,12 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
     when Mortar::API::Illustrate::STATUS_SUCCESS
       web_result_url = illustrate_result['web_result_url']
       display("Results available at #{web_result_url}")
-      action("Opening web browser to show results") do
-        require "launchy"
-        Launchy.open(web_result_url).join
+
+      unless no_browser?
+        action("Opening web browser to show results") do
+          require "launchy"
+          Launchy.open(web_result_url).join
+        end
       end
     else
       raise RuntimeError, "Unknown illustrate status: #{illustrate_result['status_code']} for illustrate_id: #{illustrate_id}"

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/mortar/command/illustrate_spec.rb

@@ -93,6 +93,32 @@ Starting illustrate... done
 
 Results available at https://api.mortardata.com/illustrates/c571a8c7f76a4fd4a67c103d753e2dd5
 Opening web browser to show results... done
+STDOUT
+        end
+      end
+
+      it "requests and reports on a successful illustrate without a browser" do
+        with_git_initialized_project do |p|
+          # stub api requests
+          illustrate_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          illustrate_url = "https://api.mortardata.com/illustrates/#{illustrate_id}"
+          parameters = ["name"=>"key", "value"=>"value" ]
+          
+          # These don't test the validity of the error message, it only tests that the CLI can handle a message returned from the server
+          mock(Mortar::Auth.api).post_illustrate("myproject", "my_script", "my_alias", is_a(String), :parameters => parameters) {Excon::Response.new(:body => {"illustrate_id" => illustrate_id})}
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_QUEUED,           "status_description" => "Pending"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_SUCCESS,          "status_description" => "Succeeded", "web_result_url" => illustrate_url})).ordered
+                    
+          write_file(File.join(p.pigscripts_path, "my_script.pig"))
+          stderr, stdout = execute("illustrate my_script my_alias --polling_interval 0.05 -p key=value --no_browser", p, @git)
+          stdout.should == <<-STDOUT
+Taking code snapshot... done
+Sending code snapshot to Mortar... done
+Starting illustrate... done
+
+\r\e[0KStatus: Pending... /\r\e[0KStatus: Succeeded  
+
+Results available at https://api.mortardata.com/illustrates/c571a8c7f76a4fd4a67c103d753e2dd5
 STDOUT
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-25 00:00:00 Z
+date: 2012-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mortar-api-ruby