nimbu 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2618df82f9784a6cca7aea7964f2fdb868495909c85a9e7310d50d77d2d2d70
-  data.tar.gz: 895cb9e94e5d80ac5feba8cba950f4eda96a88cb424669f6a5ec44ed55e4e0f1
+  metadata.gz: c258adca42192cb79c6dfdf1e8ff0b83ea64c204be2fecf91c30f0450ea26b2d
+  data.tar.gz: a8f018a41f46a3d77dfd11bd71fc8d195c6644c55a38c9d00956506530e4f328
 SHA512:
-  metadata.gz: bfd2dcbb1198e4ebc8c5a80acf5c13f45807e00a30152f55f9468ab238bf4b0b1d9fb42449203fd1c3c59d46ac21d26a48f8b0e87cfc3529fcf00e117e852823
-  data.tar.gz: 9a8bc78a3997b4f94116ec088ae36cb885aa75191381783b7b98a06370416109a35bd219b7d0530aa76a0a46b9baf79fa553843d0e4aaca625d554e0dc81ddf3
+  metadata.gz: 3a21d79911c4e7ba0c0f53d81b5ff997b18407e8bf13316d993053fed5bf27a2c957cb89a7facb80844c3e1709d2b7db2b649dadac538856385b213a360370df
+  data.tar.gz: d9b783cc35d575446b35723605152baf61150462ad26ee5c6aac047bf52e462739c8a028bcf577a8652ba620553c77f8ea85a4c66baf9dcd7587f21203017af9

data/lib/nimbu/auth.rb

@@ -2,6 +2,7 @@
 require "yaml"
 require "nimbu"
 require "nimbu/helpers"
+require 'term/ansicolor'
 
 class Nimbu::Auth
   class << self
@@ -297,5 +298,14 @@ class Nimbu::Auth
       60.times { print "#"}
       print "\n"
     end
+
+    def invalid_access!
+      puts invalid_access_message.bold.red
+    end
+
+    def invalid_access_message
+      "Error! You do not have access to #{Nimbu::Auth.site}.#{Nimbu::Auth.admin_host}! " +
+               "Please check your site id or request access to your site owner."
+    end
   end
 end

data/lib/nimbu/command/sites.rb

@@ -17,8 +17,6 @@ class Nimbu::Command::Sites < Nimbu::Command::Base
       end
     else
       display "You don't have access to any Nimbu sites."
-      display ""
-      display "Visit http://nimbu.io, start your 30-day trial and discover our amazing platform!"
     end
   end
 

data/lib/nimbu/command/themes.rb

@@ -21,6 +21,8 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
     end
     puts ""
     puts "Currently this directory is configured for '#{Nimbu::Auth.theme.red.bold}'"
+  rescue ::Nimbu::Error::Forbidden
+    Nimbu::Auth.invalid_access!
   end
 
   # themes:list
@@ -63,6 +65,8 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         display " - #{a["folder"]}/#{a["name"]}"
       end
     end
+  rescue ::Nimbu::Error::Forbidden
+    Nimbu::Auth.invalid_access!
   end
 
   # themes
@@ -81,6 +85,8 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
     display "\nShowing differences between local and server\nlayouts, templates, snippets and assets for '#{theme.green.bold}':"
     json = nimbu.themes(:subdomain => Nimbu::Auth.site).get(theme)
     check_differences(json, theme, "layouts", "templates", "snippets")
+  rescue ::Nimbu::Error::Forbidden
+    Nimbu::Auth.invalid_access!
   end
 
   # themes:push
@@ -227,7 +233,8 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         print " (ok)\n"
       end
     end
-
+  rescue ::Nimbu::Error::Forbidden
+    Nimbu::Auth.invalid_access!
   end
 
   private

data/lib/nimbu/server/base.rb

@@ -110,8 +110,11 @@ module Nimbu
             headers encoded_headers
           end
           body Base64.decode64(results["body"])
+        rescue ::Nimbu::Error::Forbidden
+          Nimbu::Auth.invalid_access!
+          Nimbu::Auth.invalid_access_message
         rescue Exception => error
-          puts error if Nimbu.debug
+          puts error.message if Nimbu.debug
           puts "Error! #{error.http_body if error.respond_to?(:http_body)}"
           error.http_body
         end

data/lib/nimbu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nimbu
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Zenjoy BVBA