MuranoCLI 3.1.0 → 3.2.0.beta.1

data/lib/MrMurano/commands.rb

@@ -32,6 +32,7 @@ require 'MrMurano/commands/show'
 require 'MrMurano/commands/solution'
 require 'MrMurano/commands/status'
 require 'MrMurano/commands/sync'
+require 'MrMurano/commands/token'
 require 'MrMurano/commands/tsdb'
 require 'MrMurano/commands/usage'
 

data/lib/MrMurano/http.rb

@@ -13,26 +13,25 @@ require 'uri'
 # 2017-06-07: [lb] getting "execution expired (Net::OpenTimeout)" on http.start.
 # Suggestions online say to load the pure-Ruby DNS implementation, resolv.rb.
 require 'resolv-replace'
+
 require 'MrMurano/progress'
+require 'MrMurano/verbosing'
 
 module MrMurano
   module Http
-    def token
-      return @token if defined?(@token) && !@token.to_s.empty?
-      acc = MrMurano::Account.instance
-      @token = acc.token
-      #raise 'Not logged in!' if @token.nil?
-      ensure_token! @token
-      # MAYBE: Check that ADC is enabled on the business. If not, tell
-      #   user to run Murano 2.x. See adc_compat_check for comments.
-      #acc.adc_compat_check
-      @token
+    include Verbose
+
+    def host
+      $cfg['net.host'].to_s
     end
 
-    def ensure_token!(tok)
-      return unless tok.nil?
-      error 'Not logged in!'
-      exit 1
+    def user
+      $cfg['user.name'].to_s
+    end
+
+    # Default endpoint unless Class overrides it.
+    def endpoint(path)
+      URI($cfg['net.protocol'] + '://' + host + '/api:1/' + path.to_s)
     end
 
     def json_opts
@@ -78,11 +77,6 @@ module MrMurano
       end
     end
 
-    # Default endpoint unless Class overrides it.
-    def endpoint(path)
-      URI($cfg['net.protocol'] + '://' + $cfg['net.host'] + '/api:1/' + path.to_s)
-    end
-
     def http
       uri = URI($cfg['net.protocol'] + '://' + $cfg['net.host'])
       if !defined?(@http) || @http.nil?
@@ -109,10 +103,6 @@ module MrMurano
 
     def add_headers(request)
       request.content_type = 'application/json'
-      # 2017-08-14: MrMurano::Account overrides the token method, and
-      # it doesn't exit if no token, and then we end up here.
-      ensure_token! token
-      request['Authorization'] = 'token ' + token unless token.to_s.empty?
       request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
       request
     end
@@ -152,7 +142,6 @@ module MrMurano
       else
         resp += (jsn || 'nil')
       end
-      # assuming verbosing was included.
       error resp
     end
 

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.1.0'
+  VERSION = '3.2.0.beta.1'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/lib/MrMurano.rb

@@ -25,6 +25,7 @@ require 'MrMurano/Account'
 require 'MrMurano/Business'
 require 'MrMurano/Exchange'
 require 'MrMurano/Exchange-Element'
+require 'MrMurano/HttpAuthed'
 require 'MrMurano/Passwords'
 
 require 'MrMurano/Content'

data/spec/Account_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe MrMurano::Account, 'token' do
     $project = MrMurano::ProjectFile.new
     $project.load
 
-    @acc = MrMurano::Account.instance
+    @acc = MrMurano::Account.new
   end
 
   after(:example) do
@@ -69,7 +69,7 @@ RSpec.describe MrMurano::Account, 'token' do
       expect(@acc).to receive(:error).once
       expect($terminal).to receive(:ask).once.and_return('dog')
       expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io', 'bob', 'dog')
-      expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io', 'bob/twofactor', nil)
+      expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io', 'bob/token', nil)
       # 2017-07-31: login_info may exit unless the command okays prompting for the password.
       #   (If we don't set this, login_info exits, which we'd want to
       #   catch with
@@ -112,16 +112,16 @@ RSpec.describe MrMurano::Account, 'token' do
     end
 
     it 'uses existing token' do
-      @acc.token_reset('quxx')
+      @acc.token_reset
       ret = @acc.token
-      expect(ret).to eq('quxx')
+      expect(ret).to eq('')
     end
 
     it 'uses existing token, even with new instance' do
-      @acc.token_reset('quxx')
-      acc = MrMurano::Account.instance
+      @acc.token_reset
+      acc = MrMurano::Account.new
       ret = acc.token
-      expect(ret).to eq('quxx')
+      expect(ret).to eq('')
     end
   end
 end
@@ -137,7 +137,7 @@ RSpec.describe MrMurano::Account do
     $cfg['business.id'] = 'XYZxyz'
     $cfg['product.id'] = 'XYZ'
 
-    @acc = MrMurano::Account.instance
+    @acc = MrMurano::Account.new
     allow(@acc).to receive(:token).and_return('TTTTTTTTTT')
   end
   after(:example) do

data/spec/Http_spec.rb

@@ -43,7 +43,6 @@ RSpec.describe MrMurano::Http do
     end
 
     it 'gets one' do
-      #expect(@acc).to receive(:adc_compat_check)
       expect(@acc).to receive(:token).and_return('ABCDEFG')
       ret = @tst.token
       expect(ret).to eq('ABCDEFG')

data/spec/cmd_token_spec.rb

@@ -0,0 +1,56 @@
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
+# frozen_string_literal: true
+
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
+
+require 'fileutils'
+require 'open3'
+
+require 'cmd_common'
+require 'MrMurano/Config'
+require 'MrMurano/commands/token'
+
+RSpec.describe 'murano token', :cmd, :needs_password, :nondeterministic do
+  include_context 'CI_CMD'
+
+  context 'without project' do
+    it 'help' do
+      cmd_verify_help('token')
+    end
+  end
+
+  context 'with project' do
+    #before(:example) { project_up }
+    #after(:example) { project_down }
+
+    def expect_token_host_user_table(stdout, stderr, num_cols: nil)
+      expect(stderr).to eq('')
+      lines = stdout.lines
+      # FIXME/2017-08-29: Is this too much detail??
+      #   What about running test once, dumping output to file,
+      #   and expecting same output next time?
+      # Outline of table. n columns. '+-----+-----+---...----+\n'
+      expect(lines[0]).to match(/^(\+-+){#{num_cols}}\+$/)
+      # Header.
+      expect(lines[1]).to match(/^\| Host/)
+      # Separator.
+      expect(lines[2]).to match(/^(\+-+){#{num_cols}}\+$/)
+      # Content. Starts with elementId.
+      (3..(lines.length - 2)).to_a.each do |line|
+        expect(lines[line]).to match(/^\| [0-9a-f]+ \| /)
+      end
+      expect(lines[-1]).to match(/^(\+-+){#{num_cols}}\+$/)
+    end
+
+    context 'list' do
+      it 'as table' do
+        stdout, stderr = murano_command_run('token list')
+        # 2 columns: elementId, name, status, description.
+        expect_token_host_user_table(stdout, stderr, num_cols: 2)
+      end
+    end
+  end
+end
+

data/spec/fixtures/websocket/README.rst

@@ -57,8 +57,8 @@ need to disable the token mechanism.
 
 Add this to ``lib/MrMurano/Account.rb``::
 
-    def token_fetch
-      @token = 'XXX'
+    def token_fetch_biz
+      @token_biz = 'XXX'
       return
 
 =========================

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0.beta.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -478,6 +478,7 @@ files:
 - docs/develop.rst
 - lib/MrMurano.rb
 - lib/MrMurano/Account.rb
+- lib/MrMurano/AccountBase.rb
 - lib/MrMurano/Business.rb
 - lib/MrMurano/Commander-Entry.rb
 - lib/MrMurano/Config-Migrate.rb
@@ -486,6 +487,7 @@ files:
 - lib/MrMurano/Exchange-Element.rb
 - lib/MrMurano/Exchange.rb
 - lib/MrMurano/Gateway.rb
+- lib/MrMurano/HttpAuthed.rb
 - lib/MrMurano/Keystore.rb
 - lib/MrMurano/Logs.rb
 - lib/MrMurano/Mock.rb
@@ -537,6 +539,7 @@ files:
 - lib/MrMurano/commands/status.rb
 - lib/MrMurano/commands/sync.rb
 - lib/MrMurano/commands/timeseries.rb
+- lib/MrMurano/commands/token.rb
 - lib/MrMurano/commands/tsdb.rb
 - lib/MrMurano/commands/usage.rb
 - lib/MrMurano/hash.rb
@@ -602,6 +605,7 @@ files:
 - spec/cmd_syncdown_application_spec.rb
 - spec/cmd_syncdown_both_spec.rb
 - spec/cmd_syncup_spec.rb
+- spec/cmd_token_spec.rb
 - spec/cmd_usage_spec.rb
 - spec/fixtures/.mrmuranorc
 - spec/fixtures/ProjectFiles/invalid.yaml
@@ -661,9 +665,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.4