mortar 0.9.8 → 0.9.10

data/lib/mortar/command/plugins.rb

@@ -1,4 +1,7 @@
+require 'excon'
+
 require "mortar/command/base"
+require "mortar/helpers"
 
 module Mortar::Command
 
@@ -43,6 +46,7 @@ module Mortar::Command
 
       action("Installing #{plugin.name}") do
         begin
+          record_usage("plugin_install", plugin.name)
           plugin.install
           Mortar::Plugin.load_plugin(plugin.name)
         rescue StandardError => e
@@ -66,6 +70,7 @@ module Mortar::Command
 
       action("Uninstalling #{plugin.name}") do
         begin
+          record_usage("plugin_uninstall", plugin.name)
           plugin.uninstall
         rescue Mortar::Plugin::ErrorPluginNotFound => e
           error e.message
@@ -96,6 +101,7 @@ module Mortar::Command
       plugins.each do |plugin|
         action("Updating #{plugin}") do
           begin
+            record_usage("plugin_update", plugin)
             Mortar::Plugin.new(plugin).update
           rescue Mortar::Plugin::ErrorUpdatingSymlinkPlugin
             status "skipped symlink"
@@ -107,5 +113,22 @@ module Mortar::Command
       end
     end
 
+
+    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}
+      query = {'plugin_name' => plugin_name}
+      begin
+        response = Excon.get(url, :headers => headers, :query => query)
+      rescue
+        #Don't block plugin if usage fails
+      end
+
+    end
+
   end
 end

data/lib/mortar/local/pig.rb

@@ -305,6 +305,8 @@ class Mortar::Local::Pig
     opts['python.home'] = jython_directory
     opts['python.path'] = "#{local_install_directory}/../controlscripts/lib:#{local_install_directory}/../vendor/controlscripts/lib"
     opts['python.cachedir'] = jython_cache_directory
+    opts['java.security.krb5.realm'] = ''
+    opts['java.security.krb5.kdc'] = ''
     return opts
   end
 

data/lib/mortar/plugin.rb

@@ -33,10 +33,11 @@ module Mortar
     end
     
     def self.without_bundler_env 
+      original_env = ENV.to_hash
+      
       # Raises error on failure
       Mortar::Plugin.ensure_bundler_installed
 
-      original_env = ENV.to_hash
       ENV.delete("BUNDLE_GEMFILE")
       ENV.delete("BUNDLE_PATH")
       ENV.delete("BUNDLE_BIN_PATH")

data/lib/mortar/version.rb

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

data/spec/mortar/plugin_spec.rb

@@ -145,12 +145,13 @@ EOS
         end
 
         it "should clean plugin if bundler isn't installed" do
-          mock(Plugin).ensure_bundler_installed { raise "Bundler not installed! Whoops!" }
+          class BundlerNotInstalledError < StandardError; end
+          mock(Plugin).ensure_bundler_installed { raise BundlerNotInstalledError }
           plugin_folder = "/tmp/mortar_plugin"
           FileUtils.mkdir_p(plugin_folder)
           File.open(plugin_folder + '/Gemfile', 'w') { |f| f.write "# dummy content" }
           `cd #{plugin_folder} && git init && echo 'test' > README && git add . && git commit -m 'my plugin'`
-          lambda { Plugin.new(plugin_folder).install }.should raise_error StandardError 
+          lambda { Plugin.new(plugin_folder).install }.should raise_error BundlerNotInstalledError 
           File.exist?("#{@sandbox}/mortar_plugin").should be_false
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-02 00:00:00 Z
+date: 2013-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.