mortar 0.15.49 → 0.15.50

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3fd8cdb616c43fe18904c333a342b11076b1230c244df84aeb968aa7a6a5a6a8
4
- data.tar.gz: cf0eb6a2814402a6caeb587fc8f5d0b18dfa852d04fb9cc9d002e73b040b6913
3
+ metadata.gz: 15a8ee5564bbe5faf702b582def600ab3badd60c3b9f6a087cbc5c40b94f5024
4
+ data.tar.gz: 0bdd5f921ed0aa097f0dece050ab08e015f3b39f44bd9c9a772051dbe773b51c
5
5
  SHA512:
6
- metadata.gz: bca8c047afe6949494a63dc86c712a80ffcd6720b6b16c899cb7757753abdffe433017ff53fd4f63b9191bf769f99e3df019ce79eddde6b4a63b10bb6c0d66ad
7
- data.tar.gz: 143fdc79e1896179d9310b597bb6d522c915da04142c37b43b847c28b415ca00312b54e03a0d70b3ea21d2639ab11c907cd0c59c45b5c140fe73ee5443ae6bfd
6
+ metadata.gz: 05d20d721c5f66913bb300f665fc84fd8c25fd7d57a6c25897bbe05992ad7ab5339c1f6d869d5008d2e993c97fde19ffb28a0a792643a2be626f448d4d32f89f
7
+ data.tar.gz: 2b5ec37db2ab094c3faa80e4bfc2fe260ff3d7fb540ee1a7ad0fc6c5fc145f1c3b8d45c8fc7b35c83dc9455cdc86b4edae1bea1f42842ed7b6ed4e9788f1c2b9
data/lib/mortar/auth.rb CHANGED
@@ -47,7 +47,6 @@ class Mortar::Auth
47
47
  end
48
48
 
49
49
  def login
50
- delete_credentials
51
50
  get_credentials
52
51
  end
53
52
 
@@ -175,7 +174,7 @@ class Mortar::Auth
175
174
 
176
175
  def ask_for_credentials
177
176
  puts
178
- puts "Enter your Mortar credentials."
177
+ puts "Enter your Mortar credentials (#{host})."
179
178
 
180
179
  print "Email: "
181
180
  user = ask
@@ -315,7 +314,6 @@ class Mortar::Auth
315
314
  protected
316
315
 
317
316
  def default_params
318
- verify_ssl = ENV['MORTAR_SSL_VERIFY'] != 'disable' && full_host =~ %r|^https://mdog.datadoghq.com|
319
317
  uri = URI(full_host)
320
318
  {
321
319
  :headers => {
@@ -324,7 +322,7 @@ class Mortar::Auth
324
322
  :host => uri.host,
325
323
  :port => uri.port.to_s,
326
324
  :scheme => uri.scheme,
327
- :ssl_verify_peer => verify_ssl
325
+ :ssl_verify_peer => true
328
326
  }
329
327
  end
330
328
  end
@@ -39,7 +39,11 @@ module Mortar
39
39
  end
40
40
 
41
41
  def default_host
42
- "mdog.datadoghq.com"
42
+ if File.exists?("#{ENV['HOME']}/.mortar/current_ctx")
43
+ File.read("#{ENV['HOME']}/.mortar/current_ctx").strip
44
+ else
45
+ "mortar.us1.staging.dog"
46
+ end
43
47
  end
44
48
 
45
49
  def host
@@ -16,5 +16,5 @@
16
16
 
17
17
  module Mortar
18
18
  # see http://semver.org/
19
- VERSION = "0.15.49"
19
+ VERSION = "0.15.50"
20
20
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mortar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.49
4
+ version: 0.15.50
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mortar Data
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-03 00:00:00.000000000 Z
11
+ date: 2019-04-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rdoc