mortar 0.3.0 → 0.3.1

data/lib/mortar/command.rb

@@ -129,7 +129,7 @@ module Mortar
       command = parse(cmd)
 
 
-      if args.include?('-h') || args.include?('--help')
+      if args.include?('-h') || args.include?('--help') || args.include?('help')
         args.unshift(cmd) unless cmd =~ /^-.*/
         cmd = 'help'
         command = parse('help')
@@ -227,6 +227,8 @@ module Mortar
       error extract_error(e.response.body) {
         e.response.body =~ /^([\w\s]+ not found).?$/ ? $1 : e.message # "Resource not found"
       }
+    rescue Mortar::Git::GitError => e
+      error e.message
     rescue Mortar::Project::ProjectError => e
       error e.message
     rescue Mortar::API::Errors::Timeout

data/lib/mortar/command/auth.rb

@@ -27,14 +27,6 @@ class Mortar::Command::Auth < Mortar::Command::Base
   #
   # log in with your mortar credentials
   #
-  #Example:
-  #
-  # $ mortar auth:login
-  # Enter your Mortar credentials:
-  # Email: email@example.com
-  # Password (typing will be hidden):
-  # Authentication successful.
-  #
   def login
     validate_arguments!
 
@@ -48,11 +40,6 @@ class Mortar::Command::Auth < Mortar::Command::Base
   #
   # clear local authentication credentials
   #
-  #Example:
-  #
-  # $ mortar auth:logout
-  # Local credentials cleared.
-  #
   def logout
     validate_arguments!
 
@@ -66,11 +53,6 @@ class Mortar::Command::Auth < Mortar::Command::Base
   #
   # display your api key
   #
-  #Example:
-  #
-  # $ mortar auth:key
-  # ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCD
-  #
   def key
     validate_arguments!
   
@@ -81,11 +63,6 @@ class Mortar::Command::Auth < Mortar::Command::Base
   #
   # display your mortar email address
   #
-  #Example:
-  #
-  # $ mortar auth:whoami
-  # email@example.com
-  #
   def whoami
     validate_arguments!
 

data/lib/mortar/command/clusters.rb

@@ -24,14 +24,6 @@ class Mortar::Command::Clusters < Mortar::Command::Base
   #
   # Display running and recently terminated clusters.
   #
-  #Examples:
-  #
-  # $ mortar clusters
-  # 
-  #cluster_id                Size (# of Nodes)  Status    Type         Start Timestamp  Elapsed Time
-  #------------------------  -----------------  --------  -----------  ---------------  ------------
-  #5023ca3ce0c222b7caaa546a                  3  Starting  Multi - Job                   
-  #
   def index
     validate_arguments!
     

data/lib/mortar/command/describe.rb

@@ -31,18 +31,9 @@ class Mortar::Command::Describe < Mortar::Command::Base
   # -f, --param-file PARAMFILE  # Load pig parameter values from a file.
   #
   # Examples:
-  #
-  # $ mortar describe generate_regression_model_coefficients songs_sample
-  # 
-  #Taking code snapshot... done
-  #Sending code snapshot to Mortar... done
-  #Starting describe... done
-  #
-  #Status: Success  
-  #
-  #Results available at https://hawk.mortardata.com/describes/2000cf2e421aa909690000af
-  #Opening web browser to show results... done
-  #
+  #     
+  #     Describe the songs_sample relation in the generate_regression_model_coefficients script.
+  #          $ mortar describe generate_regression_model_coefficients songs_sample
   def index
     pigscript_name = shift_argument
     alias_name = shift_argument

data/lib/mortar/command/generate.rb

@@ -28,23 +28,6 @@ class Mortar::Command::Generate < Mortar::Command::Base
   #
   # Generate the files and directory structure necessary for a Mortar project.
   # 
-  #
-  # Examples:
-  #
-  # $ mortar generate:project
-  # 
-  #create  README.md
-  #create  .gitignore
-  #create  Gemfile
-  #create  pigscripts
-  #create  pigscripts/my_new_project.pig
-  #create  macros
-  #create  macros/.gitkeep
-  #create  udfs
-  #create  udfs/python
-  #create  udfs/python/my_new_project.py
-  #   run  bundle install
-  # 
   def _project
     project_name = shift_argument
     unless project_name
@@ -58,18 +41,10 @@ class Mortar::Command::Generate < Mortar::Command::Base
   alias_command "generate:project", "generate:_project"
 
 
-
   # generate:python_udf [UDFNAME]
   #
   # Generate a new python user defined function
   # 
-  #
-  # Examples:
-  #
-  # $ mortar generate:python_udf my_new_udf
-  # 
-  #create  udfs/python/my_new_udf.py
-  # 
   def python_udf
     udf_name = shift_argument
     unless udf_name
@@ -77,7 +52,6 @@ class Mortar::Command::Generate < Mortar::Command::Base
     end
     udf_generator = Mortar::Generators::UDFGenerator.new
     udf_generator.generate_python_udf(udf_name, project, options)
-
   end
 
   # generate:pigscript [SCRIPTNAME]
@@ -86,13 +60,6 @@ class Mortar::Command::Generate < Mortar::Command::Base
   #
   # --skip-udf # Create the pig script without a partnered python udf 
   #
-  # Examples:
-  #
-  # $ mortar generate:pigscript my_new_pigscript
-  # 
-  #create  pigscripts/my_new_pigscript.pig
-  #create  udfs/python/my_new_pigscript.py
-  # 
   def pigscript
     script_name = shift_argument
     unless script_name
@@ -102,20 +69,12 @@ class Mortar::Command::Generate < Mortar::Command::Base
     
     script_generator = Mortar::Generators::PigscriptGenerator.new
     script_generator.generate_pigscript(script_name, project, options)
-
   end
 
   # generate:macro [MACRONAME]
   #
   # Generate a new pig macro.
   #
-  #
-  # Examples:
-  #
-  # $ mortar generate:macro my_new_macro
-  # 
-  #create  macros/my_new_macro.pig
-  # 
   def macro
     macro_name = shift_argument
     unless macro_name
@@ -124,9 +83,6 @@ class Mortar::Command::Generate < Mortar::Command::Base
     
     macro_generator = Mortar::Generators::MacroGenerator.new
     macro_generator.generate_macro(macro_name, project, options)
-
   end
 
-
-  
 end

data/lib/mortar/command/help.rb

@@ -31,17 +31,8 @@ class Mortar::Command::Help < Mortar::Command::Base
   #
   #Examples:
   #
-  # $ mortar help
-  # Usage: mortar COMMAND [command-specific-options]
-  #
-  # Primary help topics, type "mortar help TOPIC" for more details:
-  #
-  #   ...
-  #
-  # Additional topics:
-  #
-  #   ...
-  #
+  #    Get help about mortar illustrate command.
+  #        $ mortar help llustrate
   def index
     if command = args.shift
       help_for_command(command)

data/lib/mortar/command/illustrate.rb

@@ -31,17 +31,9 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
   # -f, --param-file PARAMFILE  # Load pig parameter values from a file.
   #
   # Examples:
-  #
-  # $ mortar illustrate generate_regression_model_coefficients songs_sample
-  # 
-  #Taking code snapshot... done
-  #Sending code snapshot to Mortar... done
-  #Starting illustrate... done
-  #
-  #Status: Success  
-  #
-  #Results available at https://hawk.mortardata.com/illustrates/2000ce2f421aa909680000af
-  #Opening web browser to show results... done
+  #  
+  #     Illustrate the songs_sample relation in the generate_regression_model_coefficients script.
+  #         $ mortar illustrate generate_regression_model_coefficients songs_sample
   def index
     pigscript_name = shift_argument
     alias_name = shift_argument

data/lib/mortar/command/jobs.rb

@@ -33,13 +33,11 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #
   # Examples:
   #
-  # $ mortar jobs -l 2
-  # 
-  #job_id                    script                 status   start_date                           elapsed_time  cluster_size  cluster_id
-  #------------------------  ---------------------  -------  -----------------------------------  ------------  ------------  ------------------------
-  #2000cbbba40a860a6f000000  rollup: mock_expanded  Success  Friday, August 31, 2012, 10:40 AM    2 mins                   3  2000cc3cb0c635b7cbff5aaa
-  #20009deca40a866cd5000000  rollup: mock_expanded  Stopped  Thursday, August 30, 2012,  1:08 PM  < 1 min                  2  2000857ae4b0dd5573da35aa
+  #     List the last 20 jobs:
+  #          $ mortar jobs -l 20
   def index
+    validate_arguments!
+
     options[:limit] ||= '10'
     options[:skip] ||= '0'
     jobs = api.get_jobs(options[:skip], options[:limit]).body['jobs']
@@ -65,20 +63,8 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #
   #Examples:
   #
-  # $ mortar jobs:run --clustersize 3 generate_regression_model_coefficients
-  # 
-  #Taking code snapshot... done
-  #Sending code snapshot to Mortar... done
-  #Requesting job execution... done
-  #job_id: 2000cbbba40a860a6f000000
-  #
-  #Job status can be viewed on the web at:
-  #
-  #https://hawk.mortardata.com/jobs/job_detail?job_id=2000cbbba40a860a6f000000
-  #
-  #Or by running:
-  #
-  #mortar jobs:status 2000cbbba40a860a6f000000
+  #    Run the generate_regression_model_coefficients script on a 3 node cluster.
+  #        $ mortar jobs:run generate_regression_model_coefficients --clustersize 3
   def run
     # arguemnts
     pigscript_name = shift_argument
@@ -98,9 +84,7 @@ class Mortar::Command::Jobs < Mortar::Command::Base
         end
       end
     end
-
-
-        
+ 
     validate_git_based_project!
     pigscript = validate_pigscript!(pigscript_name)
     git_ref = create_and_push_snapshot_branch(git, project)
@@ -137,15 +121,6 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #
   # -p, --poll      # Poll the status of a job
   #
-  #
-  #Examples:
-  #
-  # $ mortar jobs:status 2000cbbba40a860a6f000000
-  #
-  #=== songhotness: generate_regression_model_coefficients (job_id: 2000cbbba40a860a6f000000)
-  #hadoop jobs complete:    0.00 / 1.00
-  #progress:                0%
-  #status:                  Starting Cluster
   def status
     job_id = shift_argument
     unless job_id
@@ -232,11 +207,6 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #
   # Stop a running job.
   #
-  #Examples:
-  #
-  # $ mortar jobs:stop 2000cbbba40a860a6f000000
-  #
-  #Stopping job 2000cbbba40a860a6f000000
   def stop
     job_id = shift_argument
     unless job_id

data/lib/mortar/command/pigscripts.rb

@@ -23,15 +23,6 @@ class Mortar::Command::PigScripts < Mortar::Command::Base
   # pigscripts
   #
   # Display the available set of pigscripts
-  #
-  #Examples:
-  #
-  # $ mortar pigscripts
-  # 
-  #=== pigscripts
-  #hourly_top_searchers
-  #user_engagement
-  #
   def index
     # validation
     validate_arguments!

data/lib/mortar/command/projects.rb

@@ -23,15 +23,6 @@ class Mortar::Command::Projects < Mortar::Command::Base
   # projects
   #
   # Display the available set of projects
-  #
-  #Examples:
-  #
-  # $ mortar projects
-  # 
-  #=== projects
-  #demo
-  #rollup
-  #
   def index
     validate_arguments!
     projects = api.get_projects().body["projects"]
@@ -46,11 +37,6 @@ class Mortar::Command::Projects < Mortar::Command::Base
   # projects:create PROJECT
   #
   # create a mortar project for the current directory with the name PROJECT
-  #
-  #Example:
-  #
-  # $ mortar projects:create my_new_project
-  #
   def create
     name = shift_argument
     unless name
@@ -110,10 +96,6 @@ class Mortar::Command::Projects < Mortar::Command::Base
   #
   # Adds the Mortar remote to the local git project. This is necessary for successfully executing many of the Mortar commands.
   #
-  #Example:
-  #
-  # $ mortar projects:set_remote my_project
-  #
   def set_remote
     project_name = shift_argument
 
@@ -145,10 +127,6 @@ class Mortar::Command::Projects < Mortar::Command::Base
   #
   # clone the mortar project PROJECT into the current directory.
   #
-  #Example:
-  #
-  # $ mortar projects:clone my_new_project
-  #
   def clone
     name = shift_argument
     unless name

data/lib/mortar/command/validate.rb

@@ -33,18 +33,6 @@ class Mortar::Command::Validate < 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.
   #
-  # Examples:
-  #
-  # $ mortar validate generate_regression_model_coefficients
-  # 
-  #Taking code snapshot... done
-  #Sending code snapshot to Mortar... done
-  #Starting validate... done
-  #
-  #Status: Success  
-  #
-  #Your script is valid.
-  #
   def index
     pigscript_name = shift_argument
     unless pigscript_name

data/lib/mortar/command/version.rb

@@ -28,11 +28,6 @@ class Mortar::Command::Version < Mortar::Command::Base
   #
   # show mortar client version
   #
-  #Example:
-  #
-  # $ mortar version
-  # mortar/1.2.3 (x86_64-darwin11.4.2) ruby/1.9.3
-  #
   def index
     validate_arguments!
 

data/lib/mortar/version.rb

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

data/spec/mortar/command/jobs_spec.rb

@@ -28,6 +28,14 @@ module Mortar::Command
     end
         
     context("index") do
+      it "shows help when user adds help argument" do
+        with_git_initialized_project do |p|
+          stderr_dash_h, stdout_dash_h = execute("jobs -h", p, @git) 
+          stderr_help, stdout_help = execute("jobs help", p, @git)
+          stdout_dash_h.should == stdout_help
+          stderr_dash_h.should == stderr_help
+        end
+      end
     end
     
     context("run") do

data/spec/mortar/git_spec.rb

@@ -278,6 +278,7 @@ STASH
       
     end
     
+=begin
     context "clone" do
       it "clones repo successfully" do
         with_no_git_directory do
@@ -288,7 +289,7 @@ STASH
           lambda { @git.git("--version") }.should_not raise_error
         end
       end
-      
     end
+=end
   end
 end

metadata

@@ -1,165 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mortar
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mortar-api-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: netrc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 15
-        - 4
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.15.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.4
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gem-release
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library and command-line tool to interact with the Mortar service.
 email: support@mortardata.com
-executables: 
+executables:
 - mortar
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - bin/mortar
 - lib/mortar.rb
@@ -222,38 +224,26 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
-