nimbu 0.11.5 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ed668ba5555b406e463acca34c685068e0bffcd3ced2e9c7d664bbe033f389
-  data.tar.gz: aeec3bf728680aabc02728e260a496f8023f2400098e5239983edba6eafaddcb
+  metadata.gz: ea744b90abeb08a41b2b3e1b9e5dbf71e2cc608bcf245cafbf528b351676fcd8
+  data.tar.gz: e12d6a2a32d6b64c28a713accdcbbd5d9d077286bb09daf68b2a772689ba85a0
 SHA512:
-  metadata.gz: 1c069a1df54eec572537f2ea040476c68204bd8f82dde1a4ae4175f33b4a750996fb1919a62aa5fb502a6cda093d746261ed2502fd7a664e6414260150d869c6
-  data.tar.gz: 88f0fb8c99bdefc20994dae6ba28a7f23d25c0feb6d0eb3fe7f9620e90bc0145eae6eb98310f57d38746982369b5d98cc6e9e5caeab7747f17c5aec3f89703a4
+  metadata.gz: 98f3aafe810fd60838c04a0ddb60138ee4ed3d864fce6db48fdbeb8aed6ad1bb2c06ee4443812636d1f7f7ffe6cb76a14365bc15442ed783c7d3df34a06a8a15
+  data.tar.gz: 328c8393b654b1539578a45f3cb52ab6eb1d938fe1beb557a696053a42891617eeda0a1ac7ecf6545ff92eace5c1eaa6e834d40f7242b3cec49113c71302d20f

data/lib/nimbu/auth.rb

@@ -37,6 +37,10 @@ class Nimbu::Auth
       delete_credentials
     end
 
+    def whoami
+      client.users.me
+    end
+
     # just a stub; will raise if not authenticated
     def check
       client.sites.list
@@ -172,7 +176,7 @@ class Nimbu::Auth
     end
 
     def token    # :nodoc:
-      get_credentials
+      ENV['NIMBU_API_KEY'] || get_credentials
     end
 
     def credentials_file

data/lib/nimbu/command/auth.rb

@@ -45,6 +45,17 @@ class Nimbu::Command::Auth < Nimbu::Command::Base
 
   alias_command "logout", "auth:logout"
 
+  # auth:whoami
+  #
+  # check the identity linked to your token
+  #
+  def whoami
+    results = Nimbu::Auth.whoami
+    display " => Logged in as: #{results[:name]} (#{results[:email]})"
+  end
+  alias_command "whoami", "auth:whoami"
+
+
   # auth:token
   #
   # display your api token
@@ -54,4 +65,3 @@ class Nimbu::Command::Auth < Nimbu::Command::Base
   end
 
 end
-

data/lib/nimbu/command/server.rb

@@ -23,8 +23,10 @@ class Nimbu::Command::Server < Nimbu::Command::Base
   #
   def index
     # Check if config file is present?
-    if !Nimbu::Auth.read_configuration || !Nimbu::Auth.read_credentials
-      print red(bold("ERROR")), ": this directory does not seem to contain any Nimbu theme or your credentials are not set. \n ==> Run \"", bold { "nimbu init"}, "\" to initialize this directory."
+    if !Nimbu::Auth.read_configuration
+      print red(bold("ERROR")), ": this directory does not seem to contain any Nimbu theme configuration. \n ==> Run \"", bold { "nimbu init"}, "\" to initialize this directory."
+    elsif Nimbu::Auth.token.nil?
+      print red(bold("ERROR")), ": it seems you are not authenticated. \n ==> Run \"", bold { "nimbu login"}, "\" to initialize a session."
     else
       @with_haml    = options[:haml]
       @with_compass = options[:compass] || options[:c]
@@ -242,7 +244,8 @@ class Nimbu::Command::Server < Nimbu::Command::Base
 end
 
 require 'rubygems'
-require 'fssm'
+require 'filewatcher'
+require 'pathname'
 
 class HamlWatcher
   class << self
@@ -250,19 +253,25 @@ class HamlWatcher
 
     def watch
       refresh
+      current_dir = File.join(Dir.pwd, 'haml/')
       puts ">>> Haml is polling for changes. Press Ctrl-C to Stop."
-      FSSM.monitor('haml', '**/*.haml') do
-        update do |base, relative|
-          puts ">>> Change detected to: #{relative}"
-          HamlWatcher.compile(relative)
-        end
-        delete do |base, relative|
-          puts ">>> File deleted: #{relative}"
-          HamlWatcher.remove(relative)
-        end
-        create do |base, relative|
-          puts ">>> File created: #{relative}"
-          HamlWatcher.compile(relative)
+      Filewatcher.new('haml/**/*.haml', every: true).watch do |filename, event|
+        begin
+          relative = filename.to_s.gsub(current_dir, '')
+
+          case event.to_s
+          when 'updated'
+            puts ">>> Change detected to: #{relative}"
+            HamlWatcher.compile(relative)
+          when 'deleted'
+            puts ">>> File deleted: #{relative}"
+            HamlWatcher.remove(relative)
+          when 'created'
+            puts ">>> File created: #{relative}"
+            HamlWatcher.compile(relative)
+          end
+        rescue => e
+          puts "#{e.inspect}"
         end
       end
     end

data/lib/nimbu/version.rb

@@ -1,4 +1,5 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
 module Nimbu
-  VERSION = "0.11.5"
+  VERSION = '0.11.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.9
 platform: ruby
 authors:
 - Zenjoy BVBA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fssm
+  name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -310,7 +310,7 @@ files:
 homepage: https://www.nimbu.io
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -325,8 +325,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Client library and CLI to design websites on the Nimbu platform.
 test_files: []