skylight 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f628a6b5a3ed23626781369f5cab3b4adfbbb3c0
-  data.tar.gz: 8c623387c32d39fdde9bbbd482039be124fa92c5
+  metadata.gz: 83dd7c6f5a27d456efd3e03bfc08303fea5f1085
+  data.tar.gz: c7bfa08ec18f46a18b43ae6e2d7e4d568f54d6b1
 SHA512:
-  metadata.gz: '0915a87d423f154fe620d05a090574bc40c1ae10ad511a564a07b1917c54f1d0d94af969e5e858e915387c51ce2126616e3dfcea17aaac7cb58b3bd5e693b958'
-  data.tar.gz: a12c534ac052171b7f37b5f62f3aee67f3a230fa6a5925fdd545653489904c7469ea45c90190fdc409f973e24f2308ca1bf7d8ef1f534219a812edbed6941bc9
+  metadata.gz: 5b2faf2103731fc3549aa34da956454461703fff11e05d18de2be546b9adab1f0011b96782894d0aea709b03aa1070a5e27421dc8800c92b2f9a5914cdac418b
+  data.tar.gz: 585d6d962d8473fdf99d5fcc2a97fa97732d9a691e92ffb3e51c4219bdf75fa834f4d7eaefdb96ec9d3a1109616a3e744fd4cb9765829808a7dee8b9a1327482

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.1 (May 17, 2017)
+
+* [IMPROVEMENT] Better suggestions in `skylight doctor`.
+
 ## 1.3.0 (May 17, 2017)
 
 * [FEATURE] Add normalizer for couch_potato. (Thanks @cobot)

data/lib/skylight/cli.rb

@@ -56,7 +56,7 @@ you should set the `SKYLIGHT_AUTHENTICATION` variable to:
 
         OUT
       rescue Api::CreateFailed => e
-        say "Could not create the application", :red
+        say "Could not create the application. Please run `skylight doctor` for diagnostics.", :red
         say e.to_s, :yellow
       rescue Interrupt
       end

data/lib/skylight/cli/doctor.rb

@@ -13,11 +13,17 @@ module Skylight
           if req.success?
             say "OK", :green
           else
+            encountered_error!
             if req.exception.is_a?(Util::HTTP::StartError) && req.exception.original.is_a?(OpenSSL::SSL::SSLError)
               say "Failed to verify SSL certificate.", :red
               if Util::SSL.ca_cert_file?
                 say "Certificates located at #{Util::SSL.ca_cert_file_or_default} may be out of date.", :yellow
-                say "Please update your local certificates or try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your environment.", :yellow
+                if is_mac? && has_rvm?
+                  say "Please update your certificates with RVM by running `rvm osx-ssl-certs update all`.", :yellow
+                  say "Alternatively, try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your environment.", :yellow
+                else
+                  say "Please update your local certificates or try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your environment.", :yellow
+                end
               end
             else
               say "Unable to reach Skylight servers.", :red
@@ -34,8 +40,9 @@ module Skylight
           if is_rails?
             say "Rails application detected", :green
           else
-            say "No Rails application detected", :red
-            abort "Currently `skylight doctor` only works with Rails applications"
+            say "No Rails application detected", :yellow
+            say "Additional `skylight doctor` checks only work with Rails applications.", :yellow
+            done!
           end
         end
 
@@ -49,6 +56,8 @@ module Skylight
           if Skylight.native?
             say "Native agent installed", :green
           else
+            encountered_error!
+
             say "Unable to load native extension", :yellow
 
             indent do
@@ -62,7 +71,7 @@ module Skylight
               end
             end
 
-            abort
+            done!
           end
         end
 
@@ -77,12 +86,15 @@ module Skylight
             config.validate!
             say "Configuration is valid", :green
           rescue ConfigError => e
+            encountered_error!
+
             say "Configuration is invalid", :red
             indent do
               say e.message, :red
               say "This may occur if you are configuring with ENV variables and didn't set them in this shell."
             end
-            abort
+
+            done!
           end
         end
 
@@ -111,8 +123,11 @@ module Skylight
           if started
             say "Successfully started", :green
           else
+            encountered_error!
+
             say "Failed to start", :red
-            abort
+
+            done!
           end
 
           say "Waiting for daemon... "
@@ -134,6 +149,8 @@ module Skylight
           if daemon_running
             say "Success", :green
           else
+            encountered_error!
+
             say "Failed", :red
           end
         end
@@ -141,8 +158,8 @@ module Skylight
         say "\n"
       end
 
-      def status
-        say "All checks passed!", :green
+      def wrap_up
+        done!
       end
 
       private
@@ -163,6 +180,42 @@ module Skylight
             super
           end
         end
+
+        def is_mac?
+          Util::Platform::OS == 'darwin'
+        end
+
+        # NOTE: This check won't work correctly on Windows
+        def has_rvm?
+          if @has_rvm.nil?
+            @has_rvm = system("which rvm > /dev/null");
+          end
+          @has_rvm
+        end
+
+        def encountered_error!
+          @has_errors = true
+        end
+
+        def has_errors?
+          @has_errors
+        end
+
+        def done!
+          shell.padding = 0
+          say "\n\n"
+
+          if has_errors?
+            say "Skylight Doctor found some errors. Please review the output above.", :red
+            say "If you have any further questions, please contact support@skylight.io.", :yellow
+            exit 1
+          else
+            say "All checks passed!", :green
+            say "If you're still having trouble, please contact support@skylight.io.", :yellow
+            exit 0
+          end
+        end
+
     end
   end
-end
+end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport