nimbu 0.11.9 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea744b90abeb08a41b2b3e1b9e5dbf71e2cc608bcf245cafbf528b351676fcd8
-  data.tar.gz: e12d6a2a32d6b64c28a713accdcbbd5d9d077286bb09daf68b2a772689ba85a0
+  metadata.gz: 89810923de0892b2e89ec5a67e73b09504b6b5e3ca55feb3796e687d0aeaac9d
+  data.tar.gz: 234965e37cfe0a548d6d4af6f2f45b5de88ffe4364fb07b1620565d7a200e1e1
 SHA512:
-  metadata.gz: 98f3aafe810fd60838c04a0ddb60138ee4ed3d864fce6db48fdbeb8aed6ad1bb2c06ee4443812636d1f7f7ffe6cb76a14365bc15442ed783c7d3df34a06a8a15
-  data.tar.gz: 328c8393b654b1539578a45f3cb52ab6eb1d938fe1beb557a696053a42891617eeda0a1ac7ecf6545ff92eace5c1eaa6e834d40f7242b3cec49113c71302d20f
+  metadata.gz: e3f047d1f0971d7931984e5081b156029b531d01c02151d0df83ee32a957e2b893c8c6c7f8db23d0866427d39c051e2de54e5c763d29968d569d9109dba6d3d7
+  data.tar.gz: 7b97b0d9371a70579bee1c89f9a6664ef24989ab2317ffae5095c5e349e708dfe5e6b598aa21a2230349ed07f8df42bc81b62dce2f02d3bf9d7815813754ed90

data/lib/nimbu.rb

@@ -1,6 +1,4 @@
-# -*- encoding : utf-8 -*-
-require "nimbu/version"
-require "nimbu-api"
+require 'nimbu-api'
 
 module Nimbu
   def self.debug=(value)

data/lib/nimbu/auth.rb

@@ -1,26 +1,24 @@
-# -*- encoding : utf-8 -*-
-require "yaml"
-require "nimbu"
-require "nimbu/helpers"
+require 'yaml'
+require 'nimbu'
+require 'nimbu/helpers'
 require 'term/ansicolor'
+require 'netrc'
 
 class Nimbu::Auth
   class << self
-
     include Nimbu::Helpers
-    attr_accessor :credentials
-    attr_accessor :configuration
+    attr_accessor :credentials, :configuration
 
     def simulator_id
       return @simulator_id if defined? @simulator_id
 
-      ranges = [('a'..'z'),('A'..'Z'),(0..9)].map{|i| i.to_a}.flatten
-      @simulator_id ||= (1..40).map{ ranges[rand(ranges.length)]  }.join
+      ranges = [('a'..'z'), ('A'..'Z'), (0..9)].map { |i| i.to_a }.flatten
+      @simulator_id ||= (1..40).map { ranges[rand(ranges.length)] }.join
     end
 
     def client
       @client ||= begin
-        Nimbu::Client.new(:oauth_token => token, :endpoint => host, :user_agent => self.user_agent, :auto_pagination => true)
+        Nimbu::Client.new(oauth_token: token, endpoint: host, user_agent: user_agent, auto_pagination: true)
       end
     end
 
@@ -47,15 +45,19 @@ class Nimbu::Auth
     end
 
     def host
-      ENV['NIMBU_HOST'] || "https://api.nimbu.io"
+      ENV['NIMBU_HOST'] || 'https://api.nimbu.io'
     end
 
     def default_host
-      "https://api.nimbu.io"
+      'https://api.nimbu.io'
     end
 
     def admin_host
-      @admin_host ||= host.gsub(/https?\:\/\/api\./,'')
+      @admin_host ||= host.gsub(%r{https?://api\.}, '')
+    end
+
+    def api_host
+      @api_host ||= host.gsub(%r{https?://}, '')
     end
 
     def site
@@ -67,11 +69,11 @@ class Nimbu::Auth
     end
 
     def get_nimbu_site
-      get_configuration["site"]
+      get_configuration['site']
     end
 
     def get_nimbu_theme
-      get_configuration["theme"] || "default-theme"
+      get_configuration['theme'] || 'default-theme'
     end
 
     def get_configuration
@@ -94,192 +96,205 @@ class Nimbu::Auth
     end
 
     def ask_for_configuration
-
       subdomain = nil
       sites = client.sites.list
 
-      unless sites.respond_to?(:any?) && sites.any?
-        display "You don't have access to any Nimbu sites you can edit yet..."
-        display ""
-        display "Please visit http://nimbu.io, start your 30-day trial and discover our amazing platform!"
-        exit(1)
-      else
+      if sites.respond_to?(:any?) && sites.any?
         print_separator
         display "\nLet's first setup the configuration for this directory..."
         display "\nYou have access to following sites:\n"
-        sites.each_with_index do |site,i|
-          display " #{i+1}) #{site.name.white.bold} => http://#{site.domain}"
+        sites.each_with_index do |site, i|
+          display " #{i + 1}) #{site.name.white.bold} => http://#{site.domain}"
         end
         site_number = 0
         retry_site = false
         while site_number < 1 || site_number > sites.length
-          unless retry_site
-            print "\nOn which site would you like to work? "
-          else
+          if retry_site
             print "\nPlease enter the number of your site (between 1-#{sites.length}): "
+          else
+            print "\nOn which site would you like to work? "
           end
           site_number_string = ask
-          site_number = site_number_string.to_i rescue 0
+          site_number = begin
+            site_number_string.to_i
+          rescue StandardError
+            0
+          end
           retry_site = true
         end
-        puts ""
-        site = sites[site_number-1]
+        puts ''
+        site = sites[site_number - 1]
         display "Site chosen => #{site.name.white.bold} (http://#{site.domain})"
         subdomain = site.subdomain
         @site = subdomain
+      else
+        display "You don't have access to any Nimbu sites you can edit yet..."
+        exit(1)
       end
 
-      themes = client.themes(:subdomain => subdomain).list
+      themes = client.themes(subdomain: subdomain).list
       current_theme = if themes.length > 1
-        theme_number = 0
-        retry_theme = false
-        while theme_number < 1 || theme_number > themes.length
-          unless retry_theme
-            print "\nOn which theme would you like to work in this directory? "
-          else
-            print "\nPlease enter the number of your theme (between 1-#{themes.length}): "
-          end
-          theme_number_string = ask
-          theme_number = theme_number_string.to_i rescue 0
-          retry_theme = true
-        end
-        puts ""
-        display "Theme chosen => #{themes[theme_number-1].name}"
-        themes[theme_number-1]
-      else
-        themes.first
-      end
+                        theme_number = 0
+                        retry_theme = false
+                        while theme_number < 1 || theme_number > themes.length
+                          if retry_theme
+                            print "\nPlease enter the number of your theme (between 1-#{themes.length}): "
+                          else
+                            print "\nOn which theme would you like to work in this directory? "
+                          end
+                          theme_number_string = ask
+                          theme_number = begin
+                            theme_number_string.to_i
+                          rescue StandardError
+                            0
+                          end
+                          retry_theme = true
+                        end
+                        puts ''
+                        display "Theme chosen => #{themes[theme_number - 1].name}"
+                        themes[theme_number - 1]
+                      else
+                        themes.first
+                      end
       @theme = current_theme.short
       print_separator
 
-      { "site" => subdomain, "theme" => current_theme.short }
+      { 'site' => subdomain, 'theme' => current_theme.short }
     end
 
     def read_configuration
-      existing_config = YAML::load(File.open( configuration_file )) if File.exists?(configuration_file)
-      if existing_config && ! existing_config["site"].nil?
-        existing_config
-      else
-        nil
-      end
+      existing_config = YAML.load(File.open(configuration_file)) if File.exist?(configuration_file)
+      existing_config if existing_config && !existing_config['site'].nil?
     end
 
     def write_configuration
       FileUtils.mkdir_p(File.dirname(configuration_file))
-      File.open(configuration_file, 'w') {|credentials| credentials.puts(YAML.dump(self.configuration))}
-      FileUtils.chmod(0700, File.dirname(configuration_file))
-      FileUtils.chmod(0600, configuration_file)
+      File.open(configuration_file, 'w') { |credentials| credentials.puts(YAML.dump(configuration)) }
+      FileUtils.chmod(0o700, File.dirname(configuration_file))
+      FileUtils.chmod(0o600, configuration_file)
     end
 
     def reauthorize
       @credentials = ask_for_and_save_credentials
     end
 
-    def token    # :nodoc:
+    def token # :nodoc:
       ENV['NIMBU_API_KEY'] || get_credentials
     end
 
-    def credentials_file
-      if host == default_host
-        "#{home_directory}/.nimbu/credentials"
-      else
-        "#{home_directory}/.nimbu/credentials.#{CGI.escape(host.gsub(/https?\:\/\//,''))}"
-      end
-    end
-
-    def get_credentials    # :nodoc:
+    def get_credentials # :nodoc:
       @credentials ||= (read_credentials || ask_for_and_save_credentials)
+      @credentials[:token]
     end
 
     def delete_credentials
-      FileUtils.rm_f(credentials_file)
-      @client, @credentials = nil, nil
+      n = Netrc.read
+      n.delete(api_host)
+      n.save
+      @client = nil
+      @credentials = nil
     end
 
     def read_credentials
-      credentials = File.read(credentials_file).force_encoding('UTF-8') if File.exists?(credentials_file)
-      if credentials && credentials =~ /^(bearer|oauth2|token) ([\w]+)$/i
-        $2
-      else
-        nil
-      end
+      n = Netrc.read
+      user, token = n[api_host]
+      { user: user, token: token } if user && token
     end
 
     def write_credentials
-      FileUtils.mkdir_p(File.dirname(credentials_file))
-      File.open(credentials_file, 'w') {|credentials| credentials.print("token #{self.credentials}")}
-      FileUtils.chmod(0700, File.dirname(credentials_file))
-      FileUtils.chmod(0600, credentials_file)
+      n = Netrc.read
+      n[api_host] = @credentials[:user], @credentials[:token]
+      n.save
     end
 
     def echo_off
       with_tty do
-        system "stty -echo"
+        system 'stty -echo'
       end
     end
 
     def echo_on
       with_tty do
-        system "stty echo"
+        system 'stty echo'
       end
     end
 
-    def ask_for_credentials
-      print "Login: "
-      user = ask
+    def ask_for_credentials(user = nil, password = nil, two_factor_code = nil)
+      unless user
+        print 'Login: '
+        user = ask
+      end
 
-      print "Password: "
-      password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+      unless password
+        print 'Password: '
+        password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+      end
 
       begin
+        request_headers = {}
+        request_headers['X-Nimbu-Two-Factor'] = two_factor_code.to_s.strip unless two_factor_code.nil?
+
         basic_client = Nimbu::Client.new(
-          :basic_auth => "#{user}:#{password}",
-          :endpoint => host,
-          :user_agent => self.user_agent
+          basic_auth: "#{user}:#{password}",
+          endpoint: host,
+          user_agent: user_agent,
+          headers: request_headers
         )
-        basic_client.authenticate.token
+        { user: user, token: basic_client.authenticate.token }
       rescue Exception => e
         if e.respond_to?(:http_status_code) && e.http_status_code == 401
-          display " => could not login... please check your username and/or password!\n\n"
+          if e.message =~ /two factor authentication/
+            print '2FA Token: '
+            two_factor_code = ask
+            ask_for_credentials(user, password, two_factor_code)
+          else
+            display " => could not login... please check your username and/or password!\n\n"
+            nil
+          end
         else
           display " => hmmmm... an error occurred: #{e}. \n\n\nIf this continues to occur, please report \nthe error at https://github.com/nimbu/nimbu/issues.\n\n"
+          nil
         end
-        nil
       end
     end
 
     def ask_for_password_on_windows
-      require "Win32API"
+      require 'Win32API'
       char = nil
       password = ''
 
-      while char = Win32API.new("msvcrt", "_getch", [ ], "L").Call do
-        break if char == 10 || char == 13 # received carriage return or newline
-        if char == 127 || char == 8 # backspace and delete
+      while char = Win32API.new('msvcrt', '_getch', [], 'L').Call
+        break if [10, 13].include?(char) # received carriage return or newline
+
+        if [10, 13, 10, 13, 127, 8].include?(char) # backspace and delete
           password.slice!(-1, 1)
         else
           # windows might throw a -1 at us so make sure to handle RangeError
-          (password << char.chr) rescue RangeError
+          begin
+            (password << char.chr)
+          rescue StandardError
+            RangeError
+          end
         end
       end
       puts
-      return password
+      password
     end
 
     def ask_for_password
       echo_off
-      trap("INT") do
+      trap('INT') do
         echo_on
         exit
       end
       password = ask
       puts
       echo_on
-      return password
+      password
     end
 
     def ask_for_and_save_credentials
-      display "Please authenticate with Nimbu.io:"
+      display "Please authenticate with #{admin_host}:"
       begin
         @credentials = ask_for_credentials
         write_credentials
@@ -299,7 +314,7 @@ class Nimbu::Auth
 
     def print_separator
       print "\n"
-      60.times { print "#"}
+      60.times { print '#' }
       print "\n"
     end
 
@@ -309,7 +324,7 @@ class Nimbu::Auth
 
     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."
+        'Please check your site id or request access to your site owner.'
     end
   end
 end

data/lib/nimbu/command.rb

@@ -1,8 +1,7 @@
-# -*- encoding : utf-8 -*-
 require 'nimbu/helpers'
 require 'nimbu/version'
 require 'term/ansicolor'
-require "optparse"
+require 'optparse'
 
 class String
   include Term::ANSIColor
@@ -10,12 +9,12 @@ end
 
 module Nimbu
   module Command
-    class CommandFailed  < RuntimeError; end
+    class CommandFailed < RuntimeError; end
 
     extend Nimbu::Helpers
 
     def self.load
-      Dir[File.join(File.dirname(__FILE__), "command", "*.rb")].each do |file|
+      Dir[File.join(File.dirname(__FILE__), 'command', '*.rb')].sort.each do |file|
         require file
       end
     end
@@ -29,7 +28,7 @@ module Nimbu
     end
 
     def self.files
-      @@files ||= Hash.new {|hash,key| hash[key] = File.readlines(key).map {|line| line.strip}}
+      @@files ||= Hash.new { |hash, key| hash[key] = File.readlines(key).map { |line| line.strip } }
     end
 
     def self.namespaces
@@ -65,7 +64,7 @@ module Nimbu
     end
 
     def self.global_option(name, *args, &blk)
-      global_options << { :name => name.to_s, :args => args.sort.reverse, :proc => blk }
+      global_options << { name: name.to_s, args: args.sort.reverse, proc: blk }
     end
 
     def self.warnings
@@ -73,15 +72,13 @@ module Nimbu
     end
 
     def self.display_warnings
-      unless warnings.empty?
-        $stderr.puts(warnings.map {|warning| " !    #{warning}"}.join("\n"))
-      end
+      warn(warnings.map { |warning| " !    #{warning}" }.join("\n")) unless warnings.empty?
     end
 
-    global_option :help,    "--help", "-h"
-    global_option :debug,  "--debug"
+    global_option :help, '--help', '-h'
+    global_option :debug, '--debug'
 
-    def self.prepare_run(cmd, args=[])
+    def self.prepare_run(cmd, args = [])
       command = parse(cmd)
 
       if args.include?('-h') || args.include?('--help')
@@ -90,13 +87,14 @@ module Nimbu
         command = parse(cmd)
       end
 
-      if cmd == '--version'
+      if ['--version', '-v'].include?(cmd)
         cmd = 'version'
         command = parse(cmd)
       end
 
       @current_command = cmd
-      @anonymized_args, @normalized_args = [], []
+      @anonymized_args = []
+      @normalized_args = []
 
       opts = {}
       invalid_options = []
@@ -105,25 +103,25 @@ module Nimbu
         parser.base.long.delete('version')
         (global_options + (command && command[:options] || [])).each do |option|
           parser.on(*option[:args]) do |value|
-            if option[:proc]
-              option[:proc].call(value)
-            end
+            option[:proc].call(value) if option[:proc]
             opts[option[:name].gsub('-', '_').to_sym] = value
-            ARGV.join(' ') =~ /(#{option[:args].map {|arg| arg.split(' ', 2).first}.join('|')})/
-            @anonymized_args << "#{$1} _"
+            ARGV.join(' ') =~ /(#{option[:args].map { |arg| arg.split(' ', 2).first }.join('|')})/
+            @anonymized_args << "#{Regexp.last_match(1)} _"
             @normalized_args << "#{option[:args].last.split(' ', 2).first} _"
           end
         end
       end
 
+      parser.version = Nimbu::VERSION
+
       begin
         parser.order!(args) do |nonopt|
           invalid_options << nonopt
           @anonymized_args << '!'
           @normalized_args << '!'
         end
-      rescue OptionParser::InvalidOption => ex
-        invalid_options << ex.args.first
+      rescue OptionParser::InvalidOption => e
+        invalid_options << e.args.first
         @anonymized_args << '!'
         @normalized_args << '!'
         retry
@@ -135,52 +133,54 @@ module Nimbu
       @current_options = opts
       @invalid_arguments = invalid_options
 
-      if opts[:debug]
-        Nimbu.debug = true
-      end
+      Nimbu.debug = true if opts[:debug]
 
       @anonymous_command = [ARGV.first, *@anonymized_args].join(' ')
       begin
         usage_directory = "#{home_directory}/.nimbu/usage"
         FileUtils.mkdir_p(usage_directory)
         usage_file = usage_directory << "/#{Nimbu::VERSION}"
-        usage = if File.exists?(usage_file)
-          json_decode(File.read(usage_file).force_encoding('UTF-8'))
-        else
-          {}
-        end
+        usage = if File.exist?(usage_file)
+                  json_decode(File.read(usage_file).force_encoding('UTF-8'))
+                else
+                  {}
+                end
         usage[@anonymous_command] ||= 0
         usage[@anonymous_command] += 1
         File.write(usage_file, json_encode(usage) + "\n")
-      rescue
+      rescue StandardError
         # usage writing is not important, allow failures
       end
 
       if command
         command_instance = command[:klass].new(args.dup, opts.dup)
 
-        if !@normalized_args.include?('--app _') && (implied_app = command_instance.app rescue nil)
+        if !@normalized_args.include?('--app _') && (implied_app = begin
+          command_instance.app
+        rescue StandardError
+          nil
+        end)
           @normalized_args << '--app _'
         end
-        @normalized_command = [ARGV.first, @normalized_args.sort_by {|arg| arg.gsub('-', '')}].join(' ')
+        @normalized_command = [ARGV.first, @normalized_args.sort_by { |arg| arg.gsub('-', '') }].join(' ')
 
-        [ command_instance, command[:method] ]
+        [command_instance, command[:method]]
       else
         error([
           "`#{cmd}` is not a Nimbu command.",
           suggestion(cmd, commands.keys + command_aliases.keys),
-          "See `Nimbu help` for a list of available commands."
+          'See `Nimbu help` for a list of available commands.'
         ].compact.join("\n"))
       end
     end
 
-    def self.run(cmd, arguments=[])
+    def self.run(cmd, arguments = [])
       begin
         object, method = prepare_run(cmd, arguments.dup)
         object.send(method)
-      rescue Interrupt, StandardError, SystemExit => error
+      rescue Interrupt, StandardError, SystemExit => e
         # load likely error classes, as they may not be loaded yet due to defered loads
-        raise(error)
+        raise(e)
       end
     # rescue Nimbu::API::Errors::Unauthorized, RestClient::Unauthorized
     #   puts "Authentication failure"
@@ -219,10 +219,10 @@ module Nimbu
     rescue CommandFailed => e
       error e.message
     rescue OptionParser::ParseError
-      commands[cmd] ? run("help", [cmd]) : run("help")
+      commands[cmd] ? run('help', [cmd]) : run('help')
     rescue Excon::Errors::SocketError => e
       if e.message == 'getaddrinfo: nodename nor servname provided, or not known (SocketError)'
-        error("Unable to connect to Nimbu API, please check internet connectivity and try again.")
+        error('Unable to connect to Nimbu API, please check internet connectivity and try again.')
       else
         raise(e)
       end
@@ -234,25 +234,30 @@ module Nimbu
       commands[cmd] || commands[command_aliases[cmd]]
     end
 
-    def self.extract_error(body, options={})
+    def self.extract_error(body, _options = {})
       default_error = block_given? ? yield : "Internal server error.\nRun 'nimbu status' to check for known platform issues."
       parse_error_xml(body) || parse_error_json(body) || parse_error_plain(body) || default_error
     end
 
     def self.parse_error_xml(body)
-      xml_errors = REXML::Document.new(body).elements.to_a("//errors/error")
-      msg = xml_errors.map { |a| a.text }.join(" / ")
+      xml_errors = REXML::Document.new(body).elements.to_a('//errors/error')
+      msg = xml_errors.map { |a| a.text }.join(' / ')
       return msg unless msg.empty?
     rescue Exception
     end
 
     def self.parse_error_json(body)
-      json = json_decode(body.to_s) rescue false
+      json = begin
+        json_decode(body.to_s)
+      rescue StandardError
+        false
+      end
       json ? json['error'] : nil
     end
 
     def self.parse_error_plain(body)
-      return unless body.respond_to?(:headers) && body.headers[:content_type].to_s.include?("text/plain")
+      return unless body.respond_to?(:headers) && body.headers[:content_type].to_s.include?('text/plain')
+
       body.to_s
     end
   end

data/lib/nimbu/command/server.rb

@@ -1,8 +1,5 @@
 # -*- encoding : utf-8 -*-
 require "nimbu/command/base"
-require "nimbu/server/base"
-require 'term/ansicolor'
-require 'thin'
 
 # running a local server to speed up designing Nimbu themes
 #
@@ -22,6 +19,13 @@ class Nimbu::Command::Server < Nimbu::Command::Base
   # --nocookies              # disable session refresh cookie check
   #
   def index
+    require 'rubygems'
+    require "nimbu/server/base"
+    require 'term/ansicolor'
+    require 'thin'
+    require 'filewatcher'
+    require 'pathname'
+
     # Check if config file is present?
     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."
@@ -243,10 +247,6 @@ class Nimbu::Command::Server < Nimbu::Command::Base
   end
 end
 
-require 'rubygems'
-require 'filewatcher'
-require 'pathname'
-
 class HamlWatcher
   class << self
     include Term::ANSIColor

data/lib/nimbu/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Nimbu
-  VERSION = '0.11.9'
+  VERSION = '0.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.12.0
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement