mortar 0.7.4 → 0.7.5

data/lib/mortar/command/illustrate.rb

@@ -22,7 +22,7 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
   
   include Mortar::Git
     
-  # illustrate [PIGSCRIPT] [ALIAS]
+  # illustrate PIGSCRIPT [ALIAS]
   #
   # Illustrate the effects and output of a pigscript.
   #
@@ -43,9 +43,8 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
     validate_arguments!
     pigscript = validate_script!(pigscript_name)
           
-    # TODO: When illustrating without alias works, remove the `&& alias_name` to re-enable the feature on CLI
-    unless pigscript_name && alias_name
-      error("Usage: mortar illustrate PIGSCRIPT ALIAS\nMust specify PIGSCRIPT and ALIAS.")
+    unless pigscript_name
+      error("Usage: mortar illustrate PIGSCRIPT [ALIAS]\nMust specify PIGSCRIPT.")
     end
     
     if pigscript.is_a? Mortar::Project::ControlScript

data/lib/mortar/command/local.rb

@@ -54,9 +54,11 @@ class Mortar::Command::Local < Mortar::Command::Base
     ctrl.run(script, pig_parameters)
   end
 
-  # local:illustrate [PIGSCRIPT] [ALIAS]
+  # local:illustrate PIGSCRIPT [ALIAS]
   #
   # Locally illustrate the effects and output of a pigscript.
+  # If an alias is specified, will show data flow from the ancestor LOAD statements to the alias itself.
+  # If no alias is specified, will show data flow through all aliases in the script.
   #
   # -s, --skippruning           # Don't try to reduce the illustrate results to the smallest size possible.
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.
@@ -72,8 +74,8 @@ class Mortar::Command::Local < Mortar::Command::Base
     alias_name = shift_argument
     skip_pruning = options[:skippruning] ||= false
 
-    unless pigscript_name && alias_name
-      error("Usage: mortar local:illustrate PIGSCRIPT ALIAS\nMust specify PIGSCRIPT and ALIAS.")
+    unless pigscript_name
+      error("Usage: mortar local:illustrate PIGSCRIPT [ALIAS]\nMust specify PIGSCRIPT.")
     end
 
     validate_arguments!

data/lib/mortar/local/pig.rb

@@ -213,10 +213,16 @@ class Mortar::Local::Pig
     # Now point us at the script/alias to illustrate
     illustrate_outpath = create_illustrate_output_path()
     cmd += "-script #{pig_script.path} -out #{illustrate_outpath} "
+    
     if skip_pruning
       cmd += " -skipPruning "
     end
-    cmd += " #{pig_alias} '"
+
+    if pig_alias
+      cmd += " #{pig_alias} "
+    end
+
+    cmd += "'"
 
     result = run_pig_command(cmd, [], false)
     if result

data/lib/mortar/version.rb

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

data/spec/mortar/command/illustrate_spec.rb

@@ -29,18 +29,6 @@ module Mortar::Command
     end
         
     context("index") do
-      
-      it "errors when an alias is not provided" do
-        with_git_initialized_project do |p|
-          write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("illustrate my_script", p)
-          stderr.should == <<-STDERR
- !    Usage: mortar illustrate PIGSCRIPT ALIAS
- !    Must specify PIGSCRIPT and ALIAS.
-STDERR
-        end
-      end
-
       it "errors when no remote exists in the project" do
         with_git_initialized_project do |p|
           @git.git('remote rm mortar')
@@ -159,6 +147,40 @@ Starting illustrate... done
 \r\e[0KStatus: Pending... /\r\e[0KStatus: Succeeded  
 
 Results available at https://api.mortardata.com/illustrates/c571a8c7f76a4fd4a67c103d753e2dd5
+STDOUT
+        end
+      end
+
+      it "requests and reports on a successful illustrate without an alias" 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", nil, false, 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_GATEWAY_STARTING, "status_description" => "GATEWAY_STARTING"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_PROGRESS,         "status_description" => "In progress"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_READING_DATA,     "status_description" => "Reading data"})).ordered
+          mock(Mortar::Auth.api).get_illustrate(illustrate_id, :exclude_result => true).returns(Excon::Response.new(:body => {"status_code" => Mortar::API::Illustrate::STATUS_PRUNING_DATA,     "status_description" => "Pruning data"})).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
+          
+          # stub launchy
+          mock(Launchy).open(illustrate_url) {Thread.new {}}
+                    
+          write_file(File.join(p.pigscripts_path, "my_script.pig"))
+          stderr, stdout = execute("illustrate my_script --polling_interval 0.05 -p key=value", 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: GATEWAY_STARTING... -\r\e[0KStatus: In progress... \\\r\e[0KStatus: Reading data... |\r\e[0KStatus: Pruning data... /\r\e[0KStatus: Succeeded  
+
+Results available at https://api.mortardata.com/illustrates/c571a8c7f76a4fd4a67c103d753e2dd5
+Opening web browser to show results... done
 STDOUT
         end
       end

data/spec/mortar/command/local_spec.rb

@@ -23,17 +23,6 @@ module Mortar::Command
   describe Local do
 
     context("illustrate") do
-      it "errors when an alias is not provided" do
-        with_git_initialized_project do |p|
-          write_file(File.join(p.pigscripts_path, "my_script.pig"))
-          stderr, stdout = execute("local:illustrate my_script", p)
-          stderr.should == <<-STDERR
- !    Usage: mortar local:illustrate PIGSCRIPT ALIAS
- !    Must specify PIGSCRIPT and ALIAS.
-STDERR
-        end
-      end
-
       it "errors when the script doesn't exist" do
         with_git_initialized_project do |p|
           write_file(File.join(p.pigscripts_path, "my_other_script.pig"))
@@ -46,7 +35,7 @@ STDERR
         end
       end
 
-      it "calls the illustrate command when envoked correctly" do
+      it "calls the illustrate command when envoked with an alias" do
         with_git_initialized_project do |p|
           script_name = "some_script"
           script_path = File.join(p.pigscripts_path, "#{script_name}.pig")
@@ -61,6 +50,21 @@ STDERR
         end
       end
 
+      it "calls the illustrate command when envoked without an alias" do
+        with_git_initialized_project do |p|
+          script_name = "some_script"
+          script_path = File.join(p.pigscripts_path, "#{script_name}.pig")
+          write_file(script_path)
+          pigscript = Mortar::Project::PigScript.new(script_name, script_path)
+          mock(Mortar::Project::PigScript).new(script_name, script_path).returns(pigscript)
+          any_instance_of(Mortar::Local::Controller) do |u|
+            mock(u).illustrate(pigscript, nil, [], false).returns(nil)
+          end
+          stderr, stdout = execute("local:illustrate #{script_name}", p)
+          stderr.should == ""
+        end
+      end
+
     # illustrate
     end
 

metadata

@@ -1,122 +1,164 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mortar
-version: !ruby/object:Gem::Version
-  version: 0.7.4
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 5
+  version: 0.7.5
 platform: ruby
-authors:
+authors: 
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: mortar-api-ruby
-  requirement: &71949150 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 6
+        - 3
         version: 0.6.3
   type: :runtime
-  prerelease: false
-  version_requirements: *71949150
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: netrc
-  requirement: &71948490 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *71948490
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: launchy
-  requirement: &71983980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *71983980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: excon
-  requirement: &71982970 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 15
+        version: "0.15"
   type: :development
-  prerelease: false
-  version_requirements: *71982970
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &71981360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
   type: :development
-  prerelease: false
-  version_requirements: *71981360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: gem-release
-  requirement: &71980140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *71980140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &71978220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *71978220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rr
-  requirement: &71977800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *71977800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &71977380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *71977380
+  version_requirements: *id009
 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
 - css/illustrate.css
@@ -207,26 +249,38 @@ 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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
+