mortar 0.15.42 → 0.15.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mortar/command/version.rb +4 -21
  3. data/lib/mortar/updater.rb +1 -5
  4. data/lib/mortar/version.rb +1 -1
  5. data/spec/mortar/command/version_spec.rb +1 -57
  6. data/spec/mortar/updater_spec.rb +0 -5
  7. metadata +31 -32
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5815937a5530dd3e8b96d8942f3aea63b625c974
4
- data.tar.gz: 7acbc7e050642172e9b789090181d581b336be79
3
+ metadata.gz: 1ff4d687d125de2935d53cfb7574dc44b5f762ec
4
+ data.tar.gz: 184ce0eee7620f7fd53b35ea3e9ac921535117a7
5
5
  SHA512:
6
- metadata.gz: 42cacf49fca6bdcf2e3461557cd012e7abd6cdd91c1d5c0badf3de761c1fbb780b427177636423296bf5918248077e02ac5e85831a2e660245691136e8f5bf30
7
- data.tar.gz: 293b07bf6bc182fbbba4ddfc69d3e20a94d39861a9a92d2a43cafbd24b8c23227aa62d72d6f89ed3324d96103699577ea2d2ca54fec24639e6861ac167193b6d
6
+ metadata.gz: 8d0712c21b88082a049277c79f040dc3e9f4a7214e008ad255bfbbb945b0c85f6c64bdd555124851ccd9114a04eddd414a39473c045418eeb31b0a720f038326
7
+ data.tar.gz: 6c528df7e3b87b5577a860254e3c2bed6c6580fb3f17f418ea22387059c17c41fe54f3babb4618a5d78161438750346c824ed69576c0ee1d9323fcac0d87b0bb
data/lib/mortar/command/version.rb CHANGED
@@ -37,31 +37,14 @@ class Mortar::Command::Version < Mortar::Command::Base
37
37
  display(Mortar::USER_AGENT)
38
38
  end
39
39
 
40
- # upgrade [OPTIONAL_VERSION_NUMBER]
41
- # version:upgrade [OPTIONAL_VERSION_NUMBER]
40
+ # upgrade
42
41
  #
43
- # Upgrade the Mortar development framework
42
+ # DEPRECATED - Please upgrade the Mortar development framework using 'gem install mortar'.
44
43
  #
45
- # -v, --version VERSION_NUMBER # specify which version to upgrade to
46
44
  def upgrade
47
- validate_arguments!
48
- version_argument = ""
49
- if installed_with_omnibus?
50
- if options[:version]
51
- version_argument = "MORTAR_VERSION=" + options[:version] +" "
52
- end
53
- shell_url = ENV.fetch("MORTAR_INSTALL", "http://install.mortardata.com")
54
- dir = "/opt/mortar/installer"
55
- begin
56
- cmd = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{shell_url}\" #{version_argument}bash -c \"$(curl -sSL #{shell_url})\""
57
- Kernel.system cmd
58
- ensure
59
- end
60
- else
61
- error("mortar upgrade is only for installations not conducted with ruby gem. Please upgrade by running 'gem install mortar'.")
62
- end
45
+ error("Please upgrade by running 'gem install mortar'.")
63
46
  end
64
-
47
+
65
48
  alias_command "upgrade", "version:upgrade"
66
49
 
67
50
  end
data/lib/mortar/updater.rb CHANGED
@@ -49,11 +49,7 @@ module Mortar
49
49
  newest_version = self.get_newest_version
50
50
 
51
51
  if compare_versions(newest_version, local_version) > 0
52
- if Mortar::Helpers.installed_with_omnibus?
53
- 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")
54
- else
55
- 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")
56
- end
52
+ 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")
57
53
  end
58
54
  end
59
55
  end
data/lib/mortar/version.rb CHANGED
@@ -16,5 +16,5 @@
16
16
 
17
17
  module Mortar
18
18
  # see http://semver.org/
19
- VERSION = "0.15.42"
19
+ VERSION = "0.15.43"
20
20
  end
data/spec/mortar/command/version_spec.rb CHANGED
@@ -24,68 +24,12 @@ module Mortar::Command
24
24
 
25
25
  end
26
26
 
27
- base_url = "http://install.mortardata.com"
28
- base_version = ""
29
- tmp_dir_dumm = "/opt/mortar/installer"
30
- curl_command = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{base_url}\" bash -c \"$(curl -sSL #{base_url})\""
31
-
32
- context("version in prod") do
33
- mortar_install_env = ENV['MORTAR_INSTALL']
34
- before(:each) do
35
- ENV['MORTAR_INSTALL'] = nil
36
- end
37
-
38
- after(:all) do
39
- ENV['MORTAR_INSTALL'] = mortar_install_env
40
- end
41
- it "makes a curl request to download default version" do
42
- mock(Kernel).system (curl_command)
43
- any_instance_of(Mortar::Command::Version) do |base|
44
- mock(base).installed_with_omnibus? {true}
45
- execute("version:upgrade");
46
- end
47
- end
48
-
49
- it "makes curl request for different versions when requested" do
50
- mortar_version = "0.15.1"
51
- 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})\""
52
- mock(Kernel).system( curl_command_with_version)
53
- mock(Kernel).system( curl_command_with_version)
54
- any_instance_of(Mortar::Command::Version) do |base|
55
- mock(base).installed_with_omnibus? {true}
56
- mock(base).installed_with_omnibus? {true}
57
- execute( "upgrade -v #{mortar_version}");
58
- execute( "version:upgrade --version #{mortar_version}");
59
- end
60
- end
61
-
62
- end
63
-
64
- context("version dev") do
65
- dev_url = "install.m0rtardata.com"
66
- base_version = "0.15.1"
67
- dev_curl = "echo 'Upgrading will prompt for your sudo password.\n' && MORTAR_URL=\"#{dev_url}\" bash -c \"$(curl -sSL #{dev_url})\""
68
- before(:each) do
69
- ENV['MORTAR_INSTALL'] = dev_url
70
- end
71
-
72
- it "makes a curl request to download default version on dev" do
73
- mock(Kernel).system(dev_curl)
74
-
75
- any_instance_of(Mortar::Command::Version) do |base|
76
- mock(base).installed_with_omnibus? {true}
77
- execute("upgrade");
78
- end
79
- end
80
- end
81
-
82
27
  context("not installed via omnibus") do
83
28
  it "throws an error when running on an install not done via omnibus" do
84
29
  any_instance_of(Mortar::Command::Version) do |base|
85
- mock(base).installed_with_omnibus? {false}
86
30
  stderr, stdout = execute("version:upgrade");
87
31
  stderr.should == <<-STDERR
88
- ! mortar upgrade is only for installations not conducted with ruby gem. Please upgrade by running 'gem install mortar'.
32
+ ! Please upgrade by running 'gem install mortar'.
89
33
  STDERR
90
34
  end
91
35
  end
data/spec/mortar/updater_spec.rb CHANGED
@@ -88,13 +88,8 @@ module Mortar
88
88
  Mortar::VERSION = "1.0.0"
89
89
  end
90
90
  capture_stdout do
91
- stub(Mortar::Helpers).installed_with_omnibus?{false}
92
91
  Updater.update_check
93
92
  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"
94
- capture_stdout do
95
- mock(Mortar::Helpers).installed_with_omnibus?{true}
96
- Updater.update_check
97
- 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"
98
93
 
99
94
  end
100
95
  end
metadata CHANGED
@@ -1,195 +1,195 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mortar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.42
4
+ version: 0.15.43
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mortar Data
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-05-31 00:00:00.000000000 Z
11
+ date: 2016-06-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rdoc
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mortar-api-ruby
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.8.15
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.8.15
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: netrc
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0.7'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0.7'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: launchy
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: '2.1'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
68
  version: '2.1'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: parseconfig
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: 1.0.2
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: 1.0.2
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: aws-sdk
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ~>
95
95
  - !ruby/object:Gem::Version
96
96
  version: '1.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: nokogiri
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.5.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: 1.5.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: excon
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0.28'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - "~>"
122
+ - - ~>
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0.28'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: fakefs
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ~>
130
130
  - !ruby/object:Gem::Version
131
131
  version: 0.4.2
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ~>
137
137
  - !ruby/object:Gem::Version
138
138
  version: 0.4.2
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: gem-release
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: rake
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - "~>"
157
+ - - ~>
158
158
  - !ruby/object:Gem::Version
159
159
  version: 10.1.1
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - "~>"
164
+ - - ~>
165
165
  - !ruby/object:Gem::Version
166
166
  version: 10.1.1
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: rr
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - "~>"
171
+ - - ~>
172
172
  - !ruby/object:Gem::Version
173
173
  version: 1.1.2
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - "~>"
178
+ - - ~>
179
179
  - !ruby/object:Gem::Version
180
180
  version: 1.1.2
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rspec
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - "~>"
185
+ - - ~>
186
186
  - !ruby/object:Gem::Version
187
187
  version: '2.0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - "~>"
192
+ - - ~>
193
193
  - !ruby/object:Gem::Version
194
194
  version: '2.0'
195
195
  description: Client library and command-line tool to interact with the Mortar service.
@@ -352,19 +352,18 @@ require_paths:
352
352
  - lib
353
353
  required_ruby_version: !ruby/object:Gem::Requirement
354
354
  requirements:
355
- - - ">="
355
+ - - '>='
356
356
  - !ruby/object:Gem::Version
357
357
  version: 1.8.7
358
358
  required_rubygems_version: !ruby/object:Gem::Requirement
359
359
  requirements:
360
- - - ">="
360
+ - - '>='
361
361
  - !ruby/object:Gem::Version
362
362
  version: '0'
363
363
  requirements: []
364
364
  rubyforge_project:
365
- rubygems_version: 2.4.8
365
+ rubygems_version: 2.4.6
366
366
  signing_key:
367
367
  specification_version: 4
368
368
  summary: Client library and CLI to interact with the Mortar service.
369
369
  test_files: []
370
- has_rdoc: