mortar 0.9.2 → 0.9.3

data/lib/monkey_patch/bundler/bundler.rb

@@ -0,0 +1,14 @@
+# This is a monkey patch
+#
+# we need a method to reset the global configuration of Bundler. If bundler is already loaded,
+# in the case that mortar is run itself through bundler, then we need to reset to allow us to properly
+# install the bundle in the correct location.
+module Bundler
+  class << self
+    def nuke_configuration
+      [:@bundle_path, :@settings].each { |var|
+        self.instance_variable_set var, nil
+      }
+    end
+  end
+end

data/lib/mortar/plugin.rb

@@ -33,22 +33,31 @@ module Mortar
     end
     
     def self.without_bundler_env 
+      # 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")
       ENV.delete("RUBYOPT")
+
+      # Use monkey patched method to remove existing bundler configuration.
+      Bundler.nuke_configuration
+
       yield
     ensure
       ENV.replace(original_env.to_hash)
     end
 
-    def self.install_bundle
+    # Internal: Ensures bundler is installed, if it isn't it'll raise an error
+    def self.ensure_bundler_installed
       # TODO: Deal with the bundler as a runtime dependency issue
       # before moving these require statements to the top.
       begin
         require 'bundler/cli'
         require 'bundler/friendly_errors'
+        require 'monkey_patch/bundler/bundler'
       rescue LoadError => e 
         raise <<-ERROR
 Unable to install this plugin. Make sure you have bundler installed:
@@ -57,19 +66,36 @@ $ gem install bundler
 
 ERROR
       end
+    end
+
+    def self.install_bundle
 
       out = StringIO.new
       $stdout = out
       begin
-        bundle_def = Bundler.definition({})
-        Bundler.ui = Bundler::UI::Shell.new({})
-        Bundler.ui.level = "silent"
+        # WARNING! These 4 lines are a monkey patch.
         Bundler.settings[:path] = "bundle"
+        Bundler.settings[:disable_shared_gems] = '1'
+        Bundler.bundle_path = nil
+        Bundler.send(:configure_gem_home_and_path)
+
+        bundle_def = Bundler.definition({})
+
+        if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.3.0")
+          Bundler.ui = Bundler::UI::Shell.new(Thor::Base.shell.new)
+        else
+          Bundler.ui = Bundler::UI::Shell.new({})
+          Bundler.ui.level = "silent"
+        end
+
         Bundler::Installer.install(Bundler.root, bundle_def, {
           :standalone => [],
+          :disabled_shared_gems => '1'
         })
         result = true
       rescue StandardError => e
+        puts e.message
+        puts e.backtrace
         out.write e.message
         result = false
       end
@@ -143,20 +169,25 @@ ERROR
     end
 
     def install_dependencies
-      Dir.chdir(path) do
-        Mortar::Plugin.without_bundler_env do
-          ENV["BUNDLE_GEMFILE"] = File.expand_path("Gemfile", path)
-          if File.exists? ENV["BUNDLE_GEMFILE"]
-            unless Mortar::Plugin.install_bundle 
-              FileUtils.rm_rf path
-              raise Mortar::Plugin::ErrorInstallingDependencies, <<-ERROR
-Unable to install dependencies for #{name}.
-Error logs stored to #{Plugin.directory}/plugin_install.log
-Refer to the documentation for this plugin for help.
-ERROR
+      begin
+        Dir.chdir(path) do
+          Mortar::Plugin.without_bundler_env do
+            ENV["BUNDLE_GEMFILE"] = File.expand_path("Gemfile", path)
+            if File.exists? ENV["BUNDLE_GEMFILE"]
+              unless Mortar::Plugin.install_bundle 
+                FileUtils.rm_rf path
+                raise Mortar::Plugin::ErrorInstallingDependencies, <<-ERROR
+  Unable to install dependencies for #{name}.
+  Error logs stored to #{Plugin.directory}/plugin_install.log
+  Refer to the documentation for this plugin for help.
+  ERROR
+              end
             end
           end
         end
+      rescue StandardError => e
+        FileUtils.rm_rf path
+        raise e
       end
     end
 

data/lib/mortar/version.rb

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

data/spec/mortar/plugin_spec.rb

@@ -143,6 +143,16 @@ EOS
           lambda { Plugin.new(plugin_folder).install }.should raise_error Mortar::Plugin::ErrorInstallingDependencies 
           File.exists?("#{Plugin.directory}/plugin_install.log").should be_true
         end
+
+        it "should clean plugin if bundler isn't installed" do
+          mock(Plugin).ensure_bundler_installed { raise "Bundler not installed! Whoops!" }
+          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 
+          File.exist?("#{@sandbox}/mortar_plugin").should be_false
+        end
       end
 
       describe "when there are plugin load errors" do

metadata

@@ -1,164 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mortar
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 2
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-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: 1
-        segments: 
-        - 0
-        - 6
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.6.3
   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: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   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: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.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:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 15
-        version: "0.15"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   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
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.4.2
   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.4.2
+- !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
 - css/illustrate.css
@@ -168,6 +171,7 @@ files:
 - js/jquery.transit.js
 - js/mortar-table.js
 - js/zero_clipboard.js
+- lib/monkey_patch/bundler/bundler.rb
 - lib/mortar.rb
 - lib/mortar/auth.rb
 - lib/mortar/cli.rb
@@ -264,38 +268,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.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
-