mortar 0.15.34 → 0.15.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb704f9777ead4b5d30e637fb29c2cd5a26c9db5
-  data.tar.gz: 9f9a43b74563afc9e65496e6e7c68d26c9f267db
+  metadata.gz: f1af4bac377a7a95eefec47faae9b406272ef148
+  data.tar.gz: 8d608eb27fdaff84f95c40b5f3cfc95cf66ccd1c
 SHA512:
-  metadata.gz: dcae6766059d62a1a003b63d1c7b8d79a8c1dcad06e6a4392584901fd164dc353484bf959be88098d57c64133664ed779d3f87caf3de185adc734563d45b3b18
-  data.tar.gz: 7f779a2568eccce1cf0fe5bb9679a8fbc38d2d13bdbbddce002d3a57657072e468ebe0f139ae258c49895777cfc76f0e6baf2c1d0df4a00c8c33c87460ce7f7f
+  metadata.gz: b0de0a07fb008803c5e9cb3a29f1f7e12be45071273cf406d68b1b82904d83020eec692611c9e0285be6014b15f8cf2c5790b9458ea5701844469f05207a8eb7
+  data.tar.gz: ee45681c4d2f0fc5bef2e22607ef1e29dbc37360edcf40e96bd9cabb56b9d2124ae69fe0e27f53ea559d47ea87dd32837c74f54140f9cd38f2ecbb5a66567067

data/lib/mortar/auth.rb

@@ -28,7 +28,7 @@ class Mortar::Auth
     include Mortar::Helpers
 
     attr_accessor :credentials
-    
+
     def api
       @api ||= begin
         require("mortar-api-ruby")
@@ -50,11 +50,11 @@ class Mortar::Auth
       delete_credentials
       get_credentials
     end
-    
+
     def logout
       delete_credentials
     end
-    
+
     def check
       @mortar_user = api.get_user.body
       #Need to ensure user has a github_username
@@ -67,7 +67,7 @@ class Mortar::Auth
         end
       end
     end
-  
+
     def reauthorize
       @credentials = ask_for_and_save_credentials
     end
@@ -267,7 +267,7 @@ class Mortar::Auth
           user_result = api.get_user().body
         end
 
-        redisplay("Setting github username: %s" % 
+        redisplay("Setting github username: %s" %
           [is_finished ? " Done!" : spinner(ticks)],
           is_finished) # only display newline on last message
         if is_finished
@@ -283,7 +283,7 @@ class Mortar::Auth
         output_with_bang error_message
         raise Mortar::CLI::Errors::InvalidGithubUsername.new
       when Mortar::API::Task::STATUS_SUCCESS
-        display "Successfully set github username." 
+        display "Successfully set github username."
 
         if user_result['github_team_state'] == 'pending'
           display pending_github_team_state_message(user_result['github_accept_invite_url'])
@@ -294,7 +294,7 @@ class Mortar::Auth
       end
     end
 
-    
+
     def retry_login?
       @login_attempts ||= 0
       @login_attempts += 1
@@ -310,12 +310,11 @@ class Mortar::Auth
     def polling_interval
       (2.0).to_f
     end
-    
+
 
     protected
 
     def default_params
-      full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
       verify_ssl = ENV['MORTAR_SSL_VERIFY'] != 'disable' && full_host =~ %r|^https://mdog.datadoghq.com|
       uri = URI(full_host)
       {

data/lib/mortar/command/plugins.rb

@@ -7,6 +7,7 @@ module Mortar::Command
 
   # manage plugins to the mortar gem
   class Plugins < Base
+    include Mortar::Helpers
 
     # plugins
     #
@@ -123,7 +124,6 @@ module Mortar::Command
     private
 
     def record_usage(usage_type, plugin_name)
-      full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
       url = full_host + "/usage/#{usage_type}"
 
       headers = {'User-Agent' => Mortar::USER_AGENT}

data/lib/mortar/helpers.rb

@@ -39,19 +39,23 @@ module Mortar
     end
 
     def default_host
-      "mortardata.com"
+      "mdog.datadoghq.com"
     end
-    
+
     def host
       ENV['MORTAR_HOST'] || default_host
     end
 
+    def full_host
+      (host =~ /^http/) ? host : "https://#{host}"
+    end
+
     def test_name
       ENV['MORTAR_TEST_NAME']
     end
-    
+
     def installed_with_omnibus?
-      File.exists?('/opt/mortar/install/version-manifest.txt')    
+      File.exists?('/opt/mortar/install/version-manifest.txt')
     end
 
     def write_to_file(str_data, path, mkdir_p=true)
@@ -63,20 +67,20 @@ module Mortar
 
     def download_to_file(url, path, mkdir_p=true)
       content_length = 0
-      
+
       set_content_length = lambda do |l|
         content_length = l
       end
       set_progress = lambda do |p|
         redisplay("Downloading #{path}: #{p.to_i} of #{content_length.to_i}")
       end
-      
+
       open(url,
         :content_length_proc => set_content_length,
         :progress_proc => set_progress) do |f|
           write_to_file(f.read, path, mkdir_p)
       end
-      
+
     end
 
     def display(msg="", new_line=true)

data/lib/mortar/local/jython.rb

@@ -15,9 +15,11 @@
 #
 
 require "mortar/local/installutil"
+require "mortar/helpers"
 
 class Mortar::Local::Jython
   include Mortar::Local::InstallUtil
+  include Mortar::Helpers
 
   JYTHON_VERSION = '2.5.2'
   JYTHON_JAR_NAME = 'jython_installer-' + JYTHON_VERSION + '.jar'
@@ -63,8 +65,7 @@ class Mortar::Local::Jython
   end
 
   def jython_jar_url
-    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
     default_url = full_host + "/" + JYTHON_JAR_DEFAULT_URL_PATH
     ENV.fetch('JYTHON_JAR_URL', default_url)
   end
-end
+end

data/lib/mortar/local/pig.rb

@@ -23,6 +23,7 @@ require "mortar/local/params"
 class Mortar::Local::Pig
   include Mortar::Local::InstallUtil
   include Mortar::Local::Params
+  include Mortar::Helpers
 
   PIG_LOG_FORMAT = "humanreadable"
   LIB_TGZ_NAME = "lib-common.tar.gz"
@@ -55,7 +56,7 @@ class Mortar::Local::Pig
   def initialize
     @temp_file_objects = []
 
-    @resource_locations = { 
+    @resource_locations = {
       "illustrate_template" => File.expand_path("../../templates/report/illustrate-report.html", __FILE__),
       "illustrate_css" => File.expand_path("../../../../css/illustrate.css", __FILE__),
       "jquery" => File.expand_path("../../../../js/jquery-1.7.1.min.js", __FILE__),
@@ -91,13 +92,11 @@ class Mortar::Local::Pig
   end
 
   def pig_archive_url(pig_version)
-    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
     default_url = full_host + "/" + pig_version.tgz_default_url_path
     ENV.fetch('PIG_DISTRO_URL', default_url)
   end
 
   def lib_archive_url
-    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
     default_url = full_host + "/" + PIG_COMMON_LIB_URL_PATH
     ENV.fetch('COMMON_LIB_DISTRO_URL', default_url)
   end
@@ -282,7 +281,7 @@ 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
@@ -425,5 +424,5 @@ class Mortar::Local::Pig
     warn "[DEPRECATION] Please call automatic_parameters instead"
     automatic_parameters
   end
-  
+
 end

data/lib/mortar/local/python.rb

@@ -14,12 +14,14 @@
 # limitations under the License.
 #
 
+require "mortar/helpers"
 require "mortar/local/installutil"
 require "mortar/local/params"
 
 class Mortar::Local::Python
   include Mortar::Local::InstallUtil
   include Mortar::Local::Params
+  include Mortar::Helpers
 
   PYTHON_OSX_TGZ_NAME = "mortar-python-osx.tgz"
   PYTHON_OSX_TGZ_DEFAULT_URL_PATH = "resource/python_osx"
@@ -164,7 +166,6 @@ class Mortar::Local::Python
   end
 
   def python_archive_url
-    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
     default_url = full_host + "/" + PYTHON_OSX_TGZ_DEFAULT_URL_PATH
     return ENV.fetch('PYTHON_DISTRO_URL', default_url)
   end
@@ -235,7 +236,6 @@ class Mortar::Local::Python
   end
 
   def mortar_package_url(package)
-    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
     default_url = full_host + "/" + PYPI_URL_PATH
     "#{ENV.fetch('MORTAR_PACKAGE_URL', default_url)}/#{package}"
   end
@@ -324,7 +324,7 @@ class Mortar::Local::Python
   end
 
   def run_stillson_luigi_client_cfg_expansion(luigi_script, project_config_parameters)
-    # combine automatic mortar parameters with 
+    # combine automatic mortar parameters with
     # parameters provided in the project config
     auto_params = automatic_parameters()
     parameters = merge_parameters(auto_params, project_config_parameters)

data/lib/mortar/local/sqoop.rb

@@ -21,6 +21,7 @@ require "mortar/local/installutil"
 
 class Mortar::Local::Sqoop
   include Mortar::Local::InstallUtil
+  include Mortar::Helpers
 
   def install_or_update
     @command = "#{local_install_directory}/python/bin/python"
@@ -37,7 +38,6 @@ class Mortar::Local::Sqoop
   end
 
   def sqoop_url
-    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
     default_url = full_host + "/" + "resource/sqoop"
     return ENV.fetch('SQOOP_DISTRO_URL', default_url)
   end

data/lib/mortar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.34
+  version: 0.15.35
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -365,8 +365,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
+has_rdoc: