mortar 0.3.4 → 0.4.0

data/bin/mortar

@@ -8,6 +8,10 @@ bin_file = Pathname.new(__FILE__).realpath
 # add self to libpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
+#Check for updates
+require "mortar/updater"
+Mortar::Updater.update_check
+
 # start up the CLI
 require "mortar/cli"
 Mortar::CLI.start(*ARGV)

data/lib/mortar/helpers.rb

@@ -352,7 +352,7 @@ module Mortar
       display
     end
 
-    def styled_error(error, message='Mortar client internal error.')
+    def styled_error(error, message='Mortar Development Framework internal error.')
       if Mortar::Helpers.error_with_failure
         display("failed")
         Mortar::Helpers.error_with_failure = false

data/lib/mortar/templates/pigscript/pigscript.pig

@@ -3,8 +3,8 @@
  *
  * Required parameters:
  *
- * -param INPUT_PATH Input path for script data (e.g. s3n://hawk-example-data/tutorial/excite.log.bz2)
- * -param OUTPUT_PATH Output path for script data (e.g. s3n://my-output-bucket/<%= script_name %>)
+ * - INPUT_PATH Input path for script data (e.g. s3n://hawk-example-data/tutorial/excite.log.bz2)
+ * - OUTPUT_PATH Output path for script data (e.g. s3n://my-output-bucket/<%= script_name %>)
  */
 
 <% if not options[:skip_udf] %>
@@ -35,4 +35,4 @@ rmf $OUTPUT_PATH;
 -- store the results
 STORE with_udf_output 
  INTO '$OUTPUT_PATH' 
-USING PigStorage('\t');
+USING PigStorage('\t');

data/lib/mortar/templates/project/README.md

@@ -1,6 +1,6 @@
 # Welcome to Mortar!
 
-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.  You create your project using the Mortar command-line tool, deploy code using the Git revision control system, and Mortar does the rest.
+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.  You create your project using the Mortar Development Framework, deploy code using the Git revision control system, and Mortar does the rest.
 
 # Getting Started
 

data/lib/mortar/updater.rb

@@ -0,0 +1,52 @@
+#
+# Copyright 2012 Mortar Data Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Portions of this code from heroku (https://github.com/heroku/heroku/) Copyright Heroku 2008 - 2012,
+# used under an MIT license (https://github.com/heroku/heroku/blob/master/LICENSE).
+#
+
+require 'mortar/helpers'
+require 'mortar/version'
+
+module Mortar
+  module Updater
+    CONNECT_TIMEOUT = 5
+    READ_TIMEOUT = 5
+
+    def self.get_newest_version
+      begin
+        require "excon"
+        gem_data = Mortar::Helpers.json_decode(Excon.get('http://rubygems.org/api/v1/gems/mortar.json', {:connect_timeout => CONNECT_TIMEOUT, :read_timeout => READ_TIMEOUT}).body)
+        gem_data.default = "0.0.0"
+        gem_data['version']
+      rescue Exception => e
+        '0.0.0'
+      end
+    end
+
+    def self.compare_versions(first_version, second_version)
+      first_version.split('.').map {|part| Integer(part) rescue part} <=> second_version.split('.').map {|part| Integer(part) rescue part}
+    end
+
+    def self.update_check
+      local_version = Mortar::VERSION
+      newest_version = self.get_newest_version
+
+      if compare_versions(newest_version, local_version) > 0
+        Mortar::Helpers.warning("There is a new version of the Mortar development framework available.  Please run 'gem install mortar' to install the latest version.\n\n")
+      end
+    end
+  end
+end

data/lib/mortar/version.rb

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

data/spec/mortar/updater_spec.rb

@@ -0,0 +1,95 @@
+#
+# Copyright 2012 Mortar Data Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Portions of this code from heroku (https://github.com/heroku/heroku/) Copyright Heroku 2008 - 2012,
+# used under an MIT license (https://github.com/heroku/heroku/blob/master/LICENSE).
+#
+
+require "spec_helper"
+require "mortar/updater"
+require "excon"
+
+module Mortar
+  describe Updater do
+    include Mortar::Updater
+    
+    context "compare versions" do
+      it "same versions" do
+        Updater.compare_versions('1.0.0','1.0.0').should == 0
+      end
+
+      it "higher version" do
+        Updater.compare_versions('1.0.0','0.0.0').should > 0
+        Updater.compare_versions('0.1.0','0.0.0').should > 0
+        Updater.compare_versions('0.0.1','0.0.0').should > 0
+      end
+
+      it "lower version" do
+        Updater.compare_versions('1.0.0','2.0.0').should < 0
+        Updater.compare_versions('0.1.0','0.2.0').should < 0
+        Updater.compare_versions('0.0.1','0.0.2').should < 0
+      end
+    end
+
+    context "get ruby version" do
+      it "makes gem call" do
+        Excon.stub({:method => :get, :path => "/api/v1/gems/mortar.json", :connect_timeout => Mortar::Updater::CONNECT_TIMEOUT, :read_timeout => Mortar::Updater::READ_TIMEOUT}) do
+          {:body => Mortar::API::OkJson.encode({"version" => "1.0.0"}), :status => 200}
+        end
+        Updater.get_newest_version.should == "1.0.0"   
+      end
+
+      it "has no version field" do
+        Excon.stub({:method => :get, :path => "/api/v1/gems/mortar.json", :connect_timeout => Mortar::Updater::CONNECT_TIMEOUT, :read_timeout => Mortar::Updater::READ_TIMEOUT}) do
+          {:body => Mortar::API::OkJson.encode({"no_version" => "none"}), :status => 200}
+        end
+        Updater.get_newest_version.should == "0.0.0"
+      end
+
+      it "has an exception" do
+        Excon.stub({:method => :get, :path => "/api/v1/gems/mortar.json", :connect_timeout => Mortar::Updater::CONNECT_TIMEOUT, :read_timeout => Mortar::Updater::READ_TIMEOUT}) do
+          raise Exception
+        end
+        Updater.get_newest_version.should == "0.0.0"
+      end
+    end
+
+    context "update check" do
+      it "displays no message when we have a current version" do
+        Excon.stub({:method => :get, :path => "/api/v1/gems/mortar.json", :connect_timeout => Mortar::Updater::CONNECT_TIMEOUT, :read_timeout => Mortar::Updater::READ_TIMEOUT}) do
+          {:body => Mortar::API::OkJson.encode({"version" => "1.0.0"}), :status => 200}
+        end
+        capture_stderr do
+          Mortar::VERSION = "1.0.0"
+        end
+        capture_stdout do
+          Updater.update_check
+        end.should == ""
+      end
+
+      it "displays message when we have an outdated version" do
+        Excon.stub({:method => :get, :path => "/api/v1/gems/mortar.json", :connect_timeout => Mortar::Updater::CONNECT_TIMEOUT, :read_timeout => Mortar::Updater::READ_TIMEOUT}) do
+          {:body => Mortar::API::OkJson.encode({"version" => "2.0.0"}), :status => 200}
+        end
+        capture_stderr do
+          Mortar::VERSION = "1.0.0"
+        end
+        capture_stdout do
+          Updater.update_check
+        end.should == "WARNING: There is a new version of the Mortar development framework available.  Please run 'gem install mortar' to install the latest version.\n\n"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mortar-api-ruby
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
 - lib/mortar/templates/project/pigscripts/pigscript.pig
 - lib/mortar/templates/project/udfs/python/python_udf.py
 - lib/mortar/templates/udf/python_udf.py
+- lib/mortar/updater.rb
 - lib/mortar/version.rb
 - lib/vendor/mortar/okjson.rb
 - lib/vendor/mortar/uuid.rb
@@ -237,6 +238,7 @@ files:
 - spec/mortar/helpers_spec.rb
 - spec/mortar/project_spec.rb
 - spec/mortar/snapshot_spec.rb
+- spec/mortar/updater_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/display_message_matcher.rb