mortar 0.15.2 → 0.15.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGY5ZmJiNTI3MmViNmRiNTkzZDA2YmViYWVkZDNhMGE3ZDQzYmYyYg==
+  data.tar.gz: !binary |-
+    NmExMDVmODVkODQ2NzUxMWUyZTAzZTA1YzkzN2QyZjM2ZWRhZTUwZg==
+SHA512:
+  metadata.gz: !binary |-
+    NjJmZGMwOWZkMjVkMmJkODIwZjJkZmU2OTIzMWY4ZmFiNGExNzJlN2YxOGE5
+    ZmQ2YmQ1MzlhMGFlZWY2Y2QxMjMxYWFlYjdhYmJhOGRkYzFlMjFkMzVmNmJj
+    MmE0NmQ4NTYyODkxMWEwOTY2YWI5M2ZlMWIyZTYxOTBlZDBmN2U=
+  data.tar.gz: !binary |-
+    OTQ4NjFmN2QyMGZiNjZhODQ2OWVmMDlmZWM4OTgyNzVhODc2Mjk5N2ViNWVk
+    OGUxMzNmNWFhMGM4MTgyMWRhZDViZWZkNzVlNjZjYTlhNmQzY2Q5ZjdiMTVh
+    MDIzZWEyMDhjY2VlMDNlYjNhYzk0NjcxNzNkN2VmNWIwMzE1YTY=

data/lib/mortar/command/version.rb

@@ -45,7 +45,6 @@ class Mortar::Command::Version < Mortar::Command::Base
   # -v, --version   VERSION_NUMBER    # specify which version to upgrade to
   def upgrade
     validate_arguments!
-    if running_on_a_mac? 
       if installed_with_omnibus?
         version_number = ''
         if options[:version] 
@@ -61,9 +60,6 @@ class Mortar::Command::Version < Mortar::Command::Base
       else
         error("mortar upgrade is only for installations not conducted with ruby gem.  Please upgrade by running 'gem install mortar'.")
       end
-    else
-      error("mortar upgrade is currently only supported for OSX.")
-    end
   end
 
   alias_command "upgrade", "version:upgrade"

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 Mortar::Helpers.installed_with_omnibus? and Mortar::Helpers.running_on_a_mac? 
+        if Mortar::Helpers.installed_with_omnibus? 
           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.15.2"
+  VERSION = "0.15.3"
 end

data/spec/mortar/auth_spec.rb

@@ -30,7 +30,6 @@ module Mortar
       
       @cli = Mortar::Auth
       stub(@cli).display
-      stub(@cli).running_on_a_mac? {false}
       @cli.credentials = nil
 
       FakeFS.activate!

data/spec/mortar/command/version_spec.rb

@@ -25,7 +25,7 @@ module Mortar::Command
     end
     
     base_url  = "http://install.mortardata.com"
-    base_version = "1.0"
+    base_version = "0.15.1"
     tmp_dir_dumm = "/opt/mortar/installer"
     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"
 
@@ -42,21 +42,18 @@ module Mortar::Command
         mock(Kernel).system (curl_command)
         any_instance_of(Mortar::Command::Version) do |base|
           mock(base).installed_with_omnibus? {true}
-          mock(base).running_on_a_mac? {true} 
           execute("version:upgrade");
         end
       end
       
       it "makes curl request for different versions when requested" do
-        mortar_version = "1.0"
+        mortar_version = "0.15.1"
         curl_command_with_version = curl_command +  " -v " + mortar_version
         mock(Kernel).system( curl_command_with_version)
         mock(Kernel).system( curl_command_with_version)
         any_instance_of(Mortar::Command::Version) do |base|
           mock(base).installed_with_omnibus? {true}
           mock(base).installed_with_omnibus? {true}
-          mock(base).running_on_a_mac? {true} 
-          mock(base).running_on_a_mac? {true} 
           execute( "upgrade -v #{mortar_version}");
           execute( "version:upgrade --version #{mortar_version}");
         end
@@ -76,26 +73,14 @@ module Mortar::Command
         
         any_instance_of(Mortar::Command::Version) do |base|
           mock(base).installed_with_omnibus? {true}
-          mock(base).running_on_a_mac? {true} 
           execute("upgrade");
         end
       end
     end
 
-    context("version not Mac OSX") do
-      it "throws error when not on mac" do
+    context("not installed via omnibus") do
+      it "throws an error when running on an install not done via omnibus" do
         any_instance_of(Mortar::Command::Version) do |base|
-          mock(base).running_on_a_mac? {false} 
-          stderr, stdout = execute("version:upgrade");
-          stderr.should == <<-STDERR
- !    mortar upgrade is currently only supported for OSX.
-STDERR
-        end
-      end
-
-      it "throws an error when running on a mac but installed with ruby gem" do
-        any_instance_of(Mortar::Command::Version) do |base|
-          mock(base).running_on_a_mac? {true}
           mock(base).installed_with_omnibus? {false}
           stderr, stdout = execute("version:upgrade");
           stderr.should == <<-STDERR
@@ -105,6 +90,5 @@ STDERR
       end
     end
   end
-    
 end
 

data/spec/mortar/updater_spec.rb

@@ -89,12 +89,10 @@ module Mortar
         end
         capture_stdout do
           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(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,196 +1,176 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mortar
-version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
-  segments: 
-  - 0
-  - 15
-  - 2
-  version: 0.15.2
+version: !ruby/object:Gem::Version
+  version: 0.15.3
 platform: ruby
-authors: 
+authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-03-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 4
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mortar-api-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: mortar-api-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: netrc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: parseconfig
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 28
-        version: "0.28"
+      - !ruby/object:Gem::Version
+        version: '0.28'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.28'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: gem-release
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    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
@@ -319,38 +299,25 @@ files:
 - spec/support/display_message_matcher.rb
 homepage: http://mortardata.com/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library and CLI to interact with the Mortar service.
 test_files: []
-