mortar 0.14.0 → 0.14.1

data/lib/mortar/command/version.rb

@@ -54,10 +54,9 @@ class Mortar::Command::Version < Mortar::Command::Base
         shell_url = ENV.fetch("MORTAR_INSTALL", "http://install.mortardata.com")
         dir = "/opt/mortar/installer"
         begin
-          cmd = "sudo curl -sS -L -o #{dir}/install.sh #{shell_url} && sudo bash #{dir}/install.sh#{version_number}"
+          cmd = "sudo mkdir -p #{dir} && sudo curl -sS -L -o #{dir}/install.sh #{shell_url} && sudo bash #{dir}/install.sh#{version_number}"
           Kernel.system cmd
         ensure
-          FileUtils.remove_entry_secure dir #removes temporaryily created directory
         end
       else
         error("mortar upgrade is only for installations not conducted with ruby gem.  Please upgrade by running 'gem install mortar'.")

data/lib/mortar/updater.rb

@@ -45,7 +45,7 @@ module Mortar
       newest_version = self.get_newest_version
 
       if compare_versions(newest_version, local_version) > 0
-        if installed_with_omnibus? and running_on_a_mac? 
+        if Mortar::Helpers.installed_with_omnibus? and Mortar::Helpers.running_on_a_mac? 
           Mortar::Helpers.warning("There is a new version of the Mortar development framework available.  Please run 'mortar upgrade' to install the latest version.\n\n")
         else
           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")

data/lib/mortar/version.rb

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

data/spec/mortar/command/version_spec.rb

@@ -27,7 +27,7 @@ module Mortar::Command
     base_url  = "http://install.mortardata.com"
     base_version = "1.0"
     tmp_dir_dumm = "/opt/mortar/installer"
-    curl_command = "sudo curl -sS -L -o #{tmp_dir_dumm}/install.sh #{base_url} && sudo bash #{tmp_dir_dumm}/install.sh"
+    curl_command = "sudo mkdir -p #{tmp_dir_dumm} && sudo curl -sS -L -o #{tmp_dir_dumm}/install.sh #{base_url} && sudo bash #{tmp_dir_dumm}/install.sh"
 
     context("version in prod") do
       mortar_install_env = ENV['MORTAR_INSTALL']
@@ -39,7 +39,6 @@ module Mortar::Command
         ENV['MORTAR_INSTALL'] = mortar_install_env
       end
       it "makes a curl request to download default version" do
-        mock(FileUtils).remove_entry_secure(tmp_dir_dumm)
         mock(Kernel).system (curl_command)
         any_instance_of(Mortar::Command::Version) do |base|
           mock(base).installed_with_omnibus? {true}
@@ -51,8 +50,6 @@ module Mortar::Command
       it "makes curl request for different versions when requested" do
         mortar_version = "1.0"
         curl_command_with_version = curl_command +  " -v " + mortar_version
-        mock(FileUtils).remove_entry_secure(tmp_dir_dumm)
-        mock(FileUtils).remove_entry_secure(tmp_dir_dumm)
         mock(Kernel).system( curl_command_with_version)
         mock(Kernel).system( curl_command_with_version)
         any_instance_of(Mortar::Command::Version) do |base|
@@ -69,7 +66,7 @@ module Mortar::Command
 
     context("version dev") do
       dev_url = "dev_url.com"
-      dev_curl =  "sudo curl -sS -L -o #{tmp_dir_dumm}/install.sh #{dev_url} && sudo bash #{tmp_dir_dumm}/install.sh" 
+      dev_curl =  "sudo mkdir -p #{tmp_dir_dumm} && sudo curl -sS -L -o #{tmp_dir_dumm}/install.sh #{dev_url} && sudo bash #{tmp_dir_dumm}/install.sh" 
       before(:each) do
         ENV['MORTAR_INSTALL'] = dev_url
       end
@@ -77,7 +74,6 @@ module Mortar::Command
       it "makes a curl request to download default version on dev" do
         mock(Kernel).system(dev_curl)
         
-        mock(FileUtils).remove_entry_secure(tmp_dir_dumm)
         any_instance_of(Mortar::Command::Version) do |base|
           mock(base).installed_with_omnibus? {true}
           mock(base).running_on_a_mac? {true} 

data/spec/mortar/updater_spec.rb

@@ -19,6 +19,7 @@
 
 require "spec_helper"
 require "mortar/updater"
+require "mortar/helpers"
 require "excon"
 
 module Mortar
@@ -87,13 +88,13 @@ module Mortar
           Mortar::VERSION = "1.0.0"
         end
         capture_stdout do
-          stub(Updater).installed_with_omnibus?{false}
-          stub(Updater).running_on_a_mac?{false}
+          stub(Mortar::Helpers).installed_with_omnibus?{false}
+          stub(Mortar::Helpers).running_on_a_mac?{false}
           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"
         capture_stdout do
-          mock(Updater).installed_with_omnibus?{true}
-          mock(Updater).running_on_a_mac?{true}
+          mock(Mortar::Helpers).installed_with_omnibus?{true}
+          mock(Mortar::Helpers).running_on_a_mac?{true}
           Updater.update_check
         end.should == "WARNING: There is a new version of the Mortar development framework available.  Please run 'mortar upgrade' to install the latest version.\n\n"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease: 
 platform: ruby
 authors: