Merge pull request #1 from fastlane/master

merge
gcstang · Sep 28, 2016 · 998b82f · 998b82f
2 parents 95d82ec + e49768a
commit 998b82f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/credentials_manager/lib/credentials_manager/account_manager.rb b/credentials_manager/lib/credentials_manager/account_manager.rb
@@ -78,12 +78,14 @@ def ask_for_login
       puts "-------------------------------------------------------------------------------------".green
 
       if @user.to_s.length == 0
+        raise "Missing username, and running in non-interactive shell" if $stdout.isatty == false
         @user = ask("Username: ") while @user.to_s.length == 0
         # we return here, as only the username was asked for now, we'll get called for the pw again anyway
         return
       end
 
       while @password.to_s.length == 0
+        raise "Missing password for user #{@user}, and running in non-interactive shell" if $stdout.isatty == false
         @password = ask("Password (for #{@user}): ") { |q| q.echo = "*" }
       end
 

diff --git a/spaceship/lib/spaceship/client.rb b/spaceship/lib/spaceship/client.rb
@@ -113,11 +113,15 @@ def initialize
         c.use :cookie_jar, jar: @cookie
         c.adapter Faraday.default_adapter
 
-        if ENV['DEBUG']
+        if ENV['SPACESHIP_DEBUG']
           # for debugging only
           # This enables tracking of networking requests using Charles Web Proxy
           c.proxy "https://127.0.0.1:8888"
         end
+
+        if ENV["DEBUG"]
+          puts "To run _spaceship_ through a local proxy, use SPACESHIP_DEBUG"
+        end
       end
     end
 

diff --git a/supply/lib/supply/client.rb b/supply/lib/supply/client.rb
@@ -20,7 +20,7 @@ class Client
     # @!group Login
     #####################################################
 
-    # instanciate a client given the supplied configuration
+    # instantiate a client given the supplied configuration
     def self.make_from_config
       unless Supply.config[:json_key] || (Supply.config[:key] && Supply.config[:issuer])
         UI.user_error! "Missing auth credentials: You must specify either 'json_key' or 'key' and 'issuer'"