mortar 0.15.15 → 0.15.16

data/lib/mortar/command/version.rb

@@ -45,15 +45,15 @@ class Mortar::Command::Version < Mortar::Command::Base
   # -v, --version   VERSION_NUMBER    # specify which version to upgrade to
   def upgrade
     validate_arguments!
+      version_argument = ""
       if installed_with_omnibus?
-        version_number = ''
         if options[:version] 
-          version_number = " -v " + options[:version]
+          version_argument = "MORTAR_VERSION=" + options[:version] +" "
         end
         shell_url = ENV.fetch("MORTAR_INSTALL", "http://install.mortardata.com")
         dir = "/opt/mortar/installer"
         begin
-          cmd = "echo 'Upgrading will prompt for your sudo password.\n' && sudo mkdir -p #{dir} && sudo curl -sS -L -o #{dir}/install.sh #{shell_url} && sudo bash #{dir}/install.sh#{version_number}"
+          cmd = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{shell_url}\" #{version_argument}bash -c \"$(curl -sSL #{shell_url})\""
           Kernel.system cmd
         ensure
         end

data/lib/mortar/helpers.rb

@@ -51,7 +51,7 @@ module Mortar
     end
     
     def installed_with_omnibus?
-      File.exists?('/opt/mortar/version-manifest.txt')    
+      File.exists?('/opt/mortar/install/version-manifest.txt')    
     end
 
     def write_to_file(str_data, path, mkdir_p=true)

data/lib/mortar/version.rb

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

data/spec/mortar/command/version_spec.rb

@@ -25,9 +25,9 @@ module Mortar::Command
     end
     
     base_url  = "http://install.mortardata.com"
-    base_version = "0.15.1"
+    base_version = ""
     tmp_dir_dumm = "/opt/mortar/installer"
-    curl_command = "echo 'Upgrading will prompt for your sudo password.\n' && 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"
+    curl_command = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{base_url}\" bash -c \"$(curl -sSL #{base_url})\""
 
     context("version in prod") do
       mortar_install_env = ENV['MORTAR_INSTALL']
@@ -48,7 +48,7 @@ module Mortar::Command
       
       it "makes curl request for different versions when requested" do
         mortar_version = "0.15.1"
-        curl_command_with_version = curl_command +  " -v " + mortar_version
+        curl_command_with_version = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{base_url}\" MORTAR_VERSION=#{mortar_version} bash -c \"$(curl -sSL #{base_url})\""
         mock(Kernel).system( curl_command_with_version)
         mock(Kernel).system( curl_command_with_version)
         any_instance_of(Mortar::Command::Version) do |base|
@@ -62,8 +62,9 @@ module Mortar::Command
     end
 
     context("version dev") do
-      dev_url = "dev_url.com"
-      dev_curl =  "echo 'Upgrading will prompt for your sudo password.\n' && 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" 
+      dev_url = "install.m0rtardata.com"
+      base_version = "0.15.1"
+      dev_curl = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{dev_url}\" bash -c \"$(curl -sSL #{dev_url})\""
       before(:each) do
         ENV['MORTAR_INSTALL'] = dev_url
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.15
+  version: 0.15.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc