reivt 1.2.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae5c5f405627f9d7d175bf6be7d940d9300b2ba
-  data.tar.gz: 5c93c98de732387002aee42c224c450423e4dde7
+  metadata.gz: 4055671ea0bb1c2eae15270474dc80013937d6d8
+  data.tar.gz: b2063e141f8db3d72326bd6c390eecb9ed06e510
 SHA512:
-  metadata.gz: 9b170b789f0793de91cb7768b7812a60908bc3f6b985f016e088a3f773287d8ee1e1d39e32ba7ca010941287c5daaa4f5cae92de1834f61ecdaa280fff3990f1
-  data.tar.gz: ba19d8876a83553f9d38e0f444e0d2a476fa602ad6498610c7a4faecb65adeb52dab8ca2e26f1c10a1087c7a45eb29e919f7282ace2947b5a4fa9e4788d46f85
+  metadata.gz: b9cf6dce3702c4409fbf6f8c6dc1fa468dea013bb29ea29ad278e69bc8ea6de92775c2f796fafd1a9cde986f918010d90d180e6cd270c9135350a0698f9f4cf0
+  data.tar.gz: 6966e27b24a42a4560c03526ca87b6c5553da460c3f2ebf39495150134d0a63ede47802b7573ceb33d7867da9a3b51dda0ea50930e65040c1faf26a6ae2ad385

data/exe/revit

@@ -2,4 +2,4 @@
 
 require 'reivt'
 
-Revit::CLI.start(ARGV)
+Reivt::CLI.start(ARGV)

data/lib/reivt/api.rb

@@ -1,6 +1,8 @@
 require 'graphql/client'
 require 'graphql/client/http'
 
+require 'pp'
+
 # An extension of our main module Reivt
 #
 # @author [brwnrclse]
@@ -41,18 +43,15 @@ module Reivt
     # @return [Array] A list containing the data and error object from the req
     #
     def self.retrieve(api_response)
-      errors = api_response.errors.messages
+      errors = api_response.errors
       data = api_response.data
 
-      if errors.key?(:data)
-        raise Reivt::GraphQLDataException, errors[:data].join(', ')
-      end
-
-      if data.errors.any?
-        raise Reivt::GraphQLDataException, data.errors[:data].join(', ')
+      if data.nil?
+        msg = errors.details[:data].map { |error| error['message'] }
+        raise Reivt::GraphQLDataException, msg.join(",\n")
+      else
+        data
       end
-
-      data
     end
   end
 end

data/lib/reivt/cli.rb

@@ -29,7 +29,7 @@ module Reivt
                                desc: 'A list of files to add to the rev'
     method_option :title, type: :string, aliases: '-t', lazy_default: '',
                           desc: 'A title for the rev'
-    desc 'create PATH', 'Make a new rev object from the parameters'
+    desc 'create PATH', 'Make a new rev and populate with documents'
     long_desc <<-LONGDESC
       `Initiates a flow for creating a new rev. To bypass the prompts users can use the provided flags.
       If using git the title, description and files will be retrieved from git via the git repo name, latest commit msg and latest commit file list respectively.
@@ -44,7 +44,7 @@ module Reivt
       doc_ids = Set.new
       paths = path.split
       paths += options[:list_files] if options[:list_files]
-      rev_id = ''
+      rev_id = nil
       spinner = TTY::Spinner.new('[:spinner] :msg', format: :bouncing_ball)
 
       spinner.update(msg: 'Creating a rev...')
@@ -92,20 +92,27 @@ module Reivt
       end
       spinner.success(Paint['docs uploaded to api', :green])
 
-      puts "\nLogin at #{Paint['wver.vaemoi.co/', :green]} to start your rev!\n"
+      Reivt::LOGGER.info(
+        "Login at #{Paint['wver.vaemoi.co/', :green]} to start your rev!"
+      )
     rescue Errno::ECONNRESET, Errno::EINVAL, EOFError, Net::HTTPBadResponse,
            Net::HTTPHeaderSyntaxError, Net::OpenTimeout, Net::ProtocolError,
            Reivt::BaemptyException, Reivt::GraphQLDataException,
            Reivt::GraphQLValidationException => e
 
       Reivt::DEVLOGGER.error(e.message)
-      spinner.error(e.message)
+      Reivt::LOGGER.error(e.message)
 
-      doc_ids.each do |id|
-        RevAPI.delete_doc(id)
+      unless doc_ids.empty?
+        doc_ids.each do |id|
+          RevAPI.delete_doc(id)
+        end
       end
 
-      RevAPI.delete_rev(rev_id)
+      unless rev_id.nil?
+        RevAPI.delete_rev(rev_id) unless rev_id.nil?
+      end
+      Reivt::LOGGER.info('Done!')
     end
 
     desc 'login', 'Get an auth token for accessing the rev api'
@@ -118,10 +125,10 @@ module Reivt
       `rev login -u brwnrclse`
     LONGDESC
     def login
-      puts "Login here for your token:\n\n"
-      puts "#{Paint[Auth.auth_code_url, :green]}\n\n"
+      Reivt::LOGGER.info('Login here for your token:')
+      Reivt::LOGGER.info(Paint[Auth.auth_code_url, :green])
 
-      auth_code = Thor::Shell::Basic.new.ask('Enter your auth code => ')
+      auth_code = Thor::Shell::Basic.new.ask("\nEnter your auth code => ")
       spinner = TTY::Spinner.new('[:spinner] :msg', format: :bouncing_ball)
 
       spinner.update(msg: 'Logging in')
@@ -150,7 +157,7 @@ module Reivt
                Reivt::GraphQLValidationException => e
 
           Reivt::DEVLOGGER.error(e.message)
-          spinner.error(Paint[e.message, :red])
+          Reivt::DEVLOGGER.error(e.message)
         end
       end
     end

data/lib/reivt/version.rb

@@ -1,3 +1,3 @@
 module Reivt
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/lib/reivt.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'logger'
+require 'paint'
 require 'pstore'
 
 # The cli tool for rev. Revit process paths passed to it in order to create new
@@ -18,9 +19,18 @@ module Reivt
   FileUtils.mkdir_p("#{Dir.home}/.reivt")
 
   REIVT_STORE = PStore.new("#{Dir.home}/.reivt/reivt.pstore")
+  LOGGER = Logger.new(STDOUT)
   DEVLOGGER = Logger.new("#{Dir.home}/.reivt/reivt-dev.log")
 
   DEVLOGGER.datetime_format = '%Y-%m-%d %H:%M:%S '
+  LOGGER.formatter = proc do |severity, _, _, msg|
+    case severity
+    when 'ERROR' then "\n#{Paint[severity, :red]}: #{msg}\n"
+    when 'FATAL' then "\n#{Paint[severity, :red]}L #{msg}\n"
+    else
+      "\n#{msg}\n"
+    end
+  end
 end
 
 require 'reivt/api'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reivt
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.4.0
 platform: ruby
 authors:
 - vaemoi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql-client