learn-co 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a0eddf4971b3abd590149c8b88a443f97978be
-  data.tar.gz: 52c4470e260735547775dd206da0f8d09857cf84
+  metadata.gz: 1d4a3f8516ab46be85306ee6bc9a6001d0ef555c
+  data.tar.gz: 3147b7002e603ce89f80ab1882206d38ec1f883c
 SHA512:
-  metadata.gz: ded29eefc0083987059b25666cca7d0dacb0d6e107f88396807b0fa3e946a93172a6f6e659222e046a4af62c957f8f82f8a77001b7eb9276273e11719012fcb4
-  data.tar.gz: 080a7a94b16e347aa3be0d011993c9b78c1415bd22b8542312cd6900c8ff4caf9222ffcb789b0d263ee7686b3babc124e7ff8eb3dfe0bb3873d0d4669a8946fa
+  metadata.gz: bed7b2a89906ca53bc39e0e4e867ebeb105f3791fa2f386eea348ab1caa25b2171ed68848f0ce12c7ec7b4541190849cfe3db06df04f53566cdc913bb724a488
+  data.tar.gz: 55b339b69fc0e6be65189886f611c96344a48bf5c62a6494083ff9a9050a3c9877bd08b81d1cbe0b1ac856ba18d820dcfcca011b176bbdbb369d018d13e47b9c

data/bin/learn

@@ -17,7 +17,16 @@ end
 
 Learn::OptionsSanitizer.new(ARGV).sanitize!
 
-if !(NON_PRE_CONFIG_COMMANDS.include?(ARGV[0]))
+# Legacy: leaving this in just in case we do decide to return to our previously
+#         extra-defensive auth checking
+# if !(NON_PRE_CONFIG_COMMANDS.include?(ARGV[0]))
+  # system('learn-config') unless Learn::InternetConnection.no_internet_connection?
+# end
+
+netrc = LearnConfig::NetrcInteractor.new
+token = netrc.read.password
+
+if token.nil? || token == 'machine'
   system('learn-config') unless Learn::InternetConnection.no_internet_connection?
 end
 
@@ -26,4 +35,3 @@ if INTERNET_REQUIRED_COMMANDS.include?(ARGV[0])
 end
 
 Learn::CLI.start(ARGV)
-

data/lib/learn.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'learn_config'
 
 require 'learn/version'
 require 'learn/internet_connection'

data/lib/learn/internet_connection.rb

@@ -29,7 +29,7 @@ module Learn
       test_connection
     end
 
-    def test_connection
+    def test_connection(retries: 3)
       begin
         Timeout::timeout(5) do
           resp = Net::HTTP.get(STATUS_URI)
@@ -42,13 +42,21 @@ module Learn
           end
         end
       rescue Timeout::Error
-        self.connection = false
-        puts NO_INTERNET_MESSAGE if !silent
-      rescue SocketError => e
-        if e.message.match(/getaddrinfo: nodename nor servname provided/)
+        if retries > 0
+          test_connection(retries: retries - 1)
+        else
           self.connection = false
           puts NO_INTERNET_MESSAGE if !silent
         end
+      rescue SocketError => e
+        if e.message.match(/getaddrinfo: nodename nor servname provided/)
+          if retries > 0
+            test_connection(retries: retries - 1)
+          else
+            self.connection = false
+            puts NO_INTERNET_MESSAGE if !silent
+          end
+        end
       rescue OpenSSL::SSL::SSLError
         self.connection = false
         puts "It looks like your SSL certificates aren't quite right."

data/lib/learn/options_sanitizer.rb

@@ -21,7 +21,7 @@ module Learn
       'next',
       'doctor',
       'new',
-      'status', 
+      'status',
       'lint',
       'hello',
       'save'

data/lib/learn/version.rb

@@ -1,3 +1,3 @@
 module Learn
-  VERSION = '3.2.2'
+  VERSION = '3.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-co
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler