reivt 1.6.0 → 1.6.1

data/lib/reivt/api.rb

@@ -1,64 +1,64 @@
-require 'graphql/client'
-require 'graphql/client/http'
-
-require 'pp'
-
-# An extension of our main module Reivt
-#
-# @author [brwnrclse]
-#
-module Reivt
-  # Intrface for rev API, connects local changes with our remote.
-  #
-  # @author [brwnrclse]
-  #
-  module RevAPI
-    SCHEMA_PATH = "#{Dir.pwd}/lib/reivt/schema/schema.json".freeze
-    ENDPOINT_URL = 'https://api.graph.cool/simple/v1/revwver'.freeze
-    ENDPOINT = GraphQL::Client::HTTP.new(ENDPOINT_URL) do
-      def headers(_context)
-        auth_token = Reivt::REIVT_STORE.transaction do |store|
-          store.fetch(:auth0_id, nil)
-        end
-
-        { 'Authorization': "Bearer #{auth_token}" }
-      end
-    end
-
-    ID_TOKEN = Reivt::REIVT_STORE.transaction do |store|
-      store.fetch(:user_id, nil)
-    end
-
-    unless File.exist?(SCHEMA_PATH)
-      GraphQL::Client.dump_schema(ENDPOINT, SCHEMA_PATH)
-    end
-
-    SCHEMA = GraphQL::Client.load_schema(SCHEMA_PATH)
-    CLIENT = GraphQL::Client.new(schema: SCHEMA, execute: ENDPOINT)
-
-    # Raise any errors in the response data or simply return the data
-    #
-    # @param api_response [Obj] A nested object containing either data or errors
-    #
-    # @return [Array] A list containing the data and error object from the req
-    #
-    def self.retrieve(api_response)
-      errors = api_response.errors
-      data = api_response.data
-
-      if data.nil?
-        msg = errors.details[:data].map { |error| error['message'] }
-        raise Reivt::GraphQLDataException, msg.join(",\n")
-      else
-        data
-      end
-    end
-  end
-end
-
-require_relative 'api/mutations/document_create.mutation'
-require_relative 'api/mutations/document_delete.mutation'
-require_relative 'api/mutations/rev_create.mutation'
-require_relative 'api/mutations/rev_delete.mutation'
-require_relative 'api/mutations/user_create.mutation'
-require_relative 'api/mutations/user_signin.mutation'
+require 'graphql/client'
+require 'graphql/client/http'
+
+require 'pp'
+
+# An extension of our main module Reivt
+#
+# @author [brwnrclse]
+#
+module Reivt
+  # Intrface for rev API, connects local changes with our remote.
+  #
+  # @author [brwnrclse]
+  #
+  module RevAPI
+    SCHEMA_PATH = "#{Dir.pwd}/lib/reivt/schema/schema.json".freeze
+    ENDPOINT_URL = 'https://api.graph.cool/simple/v1/revwver'.freeze
+    ENDPOINT = GraphQL::Client::HTTP.new(ENDPOINT_URL) do
+      def headers(_context)
+        auth_token = Reivt::REIVT_STORE.transaction do |store|
+          store.fetch(:auth0_id, nil)
+        end
+
+        { 'Authorization': "Bearer #{auth_token}" }
+      end
+    end
+
+    ID_TOKEN = Reivt::REIVT_STORE.transaction do |store|
+      store.fetch(:user_id, nil)
+    end
+
+    unless File.exist?(SCHEMA_PATH)
+      GraphQL::Client.dump_schema(ENDPOINT, SCHEMA_PATH)
+    end
+
+    SCHEMA = GraphQL::Client.load_schema(SCHEMA_PATH)
+    CLIENT = GraphQL::Client.new(schema: SCHEMA, execute: ENDPOINT)
+
+    # Raise any errors in the response data or simply return the data
+    #
+    # @param api_response [Obj] A nested object containing either data or errors
+    #
+    # @return [Array] A list containing the data and error object from the req
+    #
+    def self.retrieve(api_response)
+      errors = api_response.errors
+      data = api_response.data
+
+      if data.nil?
+        msg = errors.details[:data].map { |error| error['message'] }
+        raise Reivt::GraphQLDataException, msg.join(",\n")
+      else
+        data
+      end
+    end
+  end
+end
+
+require_relative 'api/mutations/document_create.mutation'
+require_relative 'api/mutations/document_delete.mutation'
+require_relative 'api/mutations/rev_create.mutation'
+require_relative 'api/mutations/rev_delete.mutation'
+require_relative 'api/mutations/user_create.mutation'
+require_relative 'api/mutations/user_signin.mutation'

data/lib/reivt/auth.rb

@@ -1,96 +1,94 @@
-require 'base64'
-require 'bcrypt'
-require 'digest'
-require 'json'
-require 'net/http'
-require 'sysrandom'
-require 'uri'
-
-# An extension of our main module
-#
-# @author [brwnrclse]
-#
-module Reivt
-  # Convience module for handling our authentication actions and talking to
-  #       Auth0
-  #
-  # @author [brwnrclse]
-  #
-  module Auth
-    AUTH_CALLBACK_URL = 'https://rev.vaemoi.co/login_success'.freeze
-    AUTH_CLIENT_ID = 'Q1fRDQ9u3oN33ok0ciIi9Vww5kV8U8MA'.freeze
-    AUTH0_ID = Reivt::REIVT_STORE.transaction do
-      Reivt::REIVT_STORE.fetch(:auth0_id, nil)
-    end
-    AUTH_STORE_ACCESS_TOKEN = Reivt::REIVT_STORE.transaction do
-      Reivt::REIVT_STORE.fetch(:access_token, nil)
-    end
-    AUTH_URL = 'https://vaemoi.auth0.com'.freeze
-    VERIFIER = Sysrandom.urlsafe_base64(32)
-
-    # Provides the user with a means to obtain an authorization code for
-    #       accessing rev's api by opening a browser to our Auth0 login page
-    #
-    # @return [nil]
-    #
-    def self.auth_code_url
-      verifier_challenge = Sysrandom.urlsafe_base64(
-        Digest::SHA256.new.update(VERIFIER).digest.to_i
-      )
-
-      auth_code_url = AUTH_URL +
-                      '/authorize?response_type=code&scope=openid%20profile' \
-                      '&client_id=' + AUTH_CLIENT_ID +
-                      '&redirect_uri=' + AUTH_CALLBACK_URL +
-                      '&code_challenge=' + verifier_challenge +
-                      '&code_challenge_method=S256'
-
-      auth_code_url
-    end
-
-    # Exchanges the auth code obtained for a token used to access rev's api
-    #
-    # @param auth_code [String] The auth code obtained from logging in
-    #
-    # @return [String] The auth token used for accessing rev's api
-    #
-    def self.auth_token(auth_code)
-      auth_token_uri = URI.parse('https://vaemoi.auth0.com/oauth/token')
-      body = {
-        grant_type: 'authorization_code',
-        client_id: AUTH_CLIENT_ID,
-        code_verifier: VERIFIER,
-        code: auth_code,
-        redirect_uri: AUTH_CALLBACK_URL
-      }
-      http = Net::HTTP.new(auth_token_uri.host, auth_token_uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      req = Net::HTTP::Post.new(auth_token_uri)
-      req.content_type = 'application/json'
-      req.body = body.to_json
-
-      res = http.request(req)
-      token = {}
-      token[:access_token] = JSON.parse(res.body)['access_token']
-      token[:auth0_id] = JSON.parse(res.body)['id_token']
-      token[:expires] = Time.now.to_i + JSON.parse(res.body)['expires'].to_i
-
-      token
-    end
-
-
-    # Checks if user has an auth token - if not, they're most likely not logged in
-    #
-    # @param N/A
-    #
-    # @return true if logged in
-    #
-    def self.logged_in
-      if AUTH_STORE_ACCESS_TOKEN.nil?
-        raise Reivt::LoginException
-      end
-      return true
-    end
-  end
-end
+require 'base64'
+require 'bcrypt'
+require 'digest'
+require 'json'
+require 'net/http'
+require 'sysrandom'
+require 'uri'
+
+# An extension of our main module
+#
+# @author [brwnrclse]
+#
+module Reivt
+  # Convience module for handling our authentication actions and talking to
+  #       Auth0
+  #
+  # @author [brwnrclse]
+  #
+  module Auth
+    AUTH_CALLBACK_URL = 'https://rev.vaemoi.co/login_success'.freeze
+    AUTH_CLIENT_ID = 'Q1fRDQ9u3oN33ok0ciIi9Vww5kV8U8MA'.freeze
+    AUTH0_ID = Reivt::REIVT_STORE.transaction do
+      Reivt::REIVT_STORE.fetch(:auth0_id, nil)
+    end
+    AUTH_STORE_ACCESS_TOKEN = Reivt::REIVT_STORE.transaction do
+      Reivt::REIVT_STORE.fetch(:access_token, nil)
+    end
+    AUTH_URL = 'https://vaemoi.auth0.com'.freeze
+    VERIFIER = Sysrandom.urlsafe_base64(32)
+
+    # Provides the user with a means to obtain an authorization code for
+    #       accessing rev's api by opening a browser to our Auth0 login page
+    #
+    # @return [nil]
+    #
+    def self.auth_code_url
+      verifier_challenge = Sysrandom.urlsafe_base64(
+        Digest::SHA256.new.update(VERIFIER).digest.to_i
+      )
+
+      auth_code_url = AUTH_URL +
+                      '/authorize?response_type=code&scope=openid%20profile' \
+                      '&client_id=' + AUTH_CLIENT_ID +
+                      '&redirect_uri=' + AUTH_CALLBACK_URL +
+                      '&code_challenge=' + verifier_challenge +
+                      '&code_challenge_method=S256'
+
+      auth_code_url
+    end
+
+    # Exchanges the auth code obtained for a token used to access rev's api
+    #
+    # @param auth_code [String] The auth code obtained from logging in
+    #
+    # @return [String] The auth token used for accessing rev's api
+    #
+    def self.auth_token(auth_code)
+      auth_token_uri = URI.parse('https://vaemoi.auth0.com/oauth/token')
+      body = {
+        grant_type: 'authorization_code',
+        client_id: AUTH_CLIENT_ID,
+        code_verifier: VERIFIER,
+        code: auth_code,
+        redirect_uri: AUTH_CALLBACK_URL
+      }
+      http = Net::HTTP.new(auth_token_uri.host, auth_token_uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      req = Net::HTTP::Post.new(auth_token_uri)
+      req.content_type = 'application/json'
+      req.body = body.to_json
+
+      res = http.request(req)
+      token = {}
+      token[:access_token] = JSON.parse(res.body)['access_token']
+      token[:auth0_id] = JSON.parse(res.body)['id_token']
+      token[:expires] = Time.now.to_i + JSON.parse(res.body)['expires'].to_i
+
+      token
+    end
+
+    # Checks if the user has an Authentication token for accessing the API
+    #
+    # @return [Bool] true if token found
+    #                raises an exception otherwise
+    def self.logged_in
+      if AUTH_STORE_ACCESS_TOKEN.nil? || AUTH_STORE_ACCESS_TOKEN.empty?
+        raise Reivt::LoginException
+      end
+
+      true
+    end
+  end
+end

data/lib/reivt/cli.rb

@@ -1,167 +1,167 @@
-# rubocop: disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ClassLength
-require 'paint'
-require 'thor'
-require 'tty-spinner'
-
-#
-# An extension of our main module
-#
-# @author [brwnrclse]
-#
-module Reivt
-  #
-  # Rev's cli
-  #
-  # @author [brwnrclse]
-  #
-  class CLI < Thor
-    namespace :revit
-
-    map %w(--version -v) => :__print_version
-    desc '--version, -v', 'print the version'
-    def __print_version
-      puts VERSION
-    end
-
-    method_option :description, type: :string, aliases: '-d', lazy_default: '',
-                                desc: 'A short summary of the changes'
-    method_option :list_files, type: :array, aliases: '-l',
-                               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 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.
-
-      `revit create ./Bucket/repo` # Create a new rev from the provided path
-      `revit create ./Bucket/repo --title, -t "Test Repo"` # Create a new revo with a title of Test Repo
-      `revit create ./Bucket/repo --description, -d "A test repo."` # Create a new revo with a description of "a test repo"
-      `revit create ./Bucket/repo --list_files, -l ~/Bucket/oneoffs/help.js` # Create a new rev with a list of files, ignoring the current folder
-    LONGDESC
-    def create(path)
-      doc_set = Set.new
-      doc_ids = Set.new
-      paths = path.split
-      paths += options[:list_files] if options[:list_files]
-      rev_id = nil
-      spinner = TTY::Spinner.new('[:spinner] :msg', format: :bouncing_ball)
-
-      Reivt::Auth.logged_in
-
-      spinner.update(msg: 'Creating a rev...')
-      spinner.run do
-        rev_id = RevAPI.create_rev(options[:title], options[:description])
-      end
-      spinner.success(Paint['rev created', :green])
-
-      paths.each do |x|
-        type = File.exist?(x) ? File.ftype(x) : 'other'
-
-        if type == 'file'
-          spinner.update(msg: "#{Paint['Adding', nil, '#e3b505']} #{x}")
-          spinner.run do
-            doc_set.add(Util.doc_from_path(x))
-          end
-          spinner.success(Paint['document created', :green])
-        elsif type == 'directory'
-          spinner.update(msg: "#{Paint['Adding', nil, '#e3b505']} docs from " \
-                         "#{Paint[path, '#2de1fc']}")
-
-          if Dir.entries(x).include?('.git')
-            spinner.run do
-              doc_set.merge(Util.docs_from_repo(x, spinner))
-            end
-            spinner.success(Paint['repo docs created', :green])
-          else
-            spinner.run do
-              doc_set.merge(Util.docs_from_dir(x))
-            end
-            spinner.success(Paint['dir docs created', :green])
-          end
-        else
-          spinner.error("#{Paint['Unsupported file type:']} #{path}")
-        end
-      end
-
-      spinner.update(msg: 'Uploading docs to rev api')
-      spinner.run do
-        doc_set.each do |doc|
-          doc_id = RevAPI.create_doc(doc.blob, doc.content_type, doc.doc_name,
-                                     doc.has_diff, rev_id)
-          doc_ids.add(doc_id)
-        end
-      end
-      spinner.success(Paint['docs uploaded to api', :green])
-
-      Reivt::LOGGER.info(
-        "Login at #{Paint['wver.vaemoi.co/home', :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)
-      Reivt::LOGGER.error(e.message)
-
-      unless doc_ids.empty?
-        doc_ids.each do |id|
-          RevAPI.delete_doc(id)
-        end
-      end
-
-      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'
-    long_desc <<-LONGDESC
-      Sends a request for a valid auth token (jwt) to use for accessing the API.
-      Refresh is handled automatically as along as the user keeps on using rev otherwise it'll expire after about a week.
-
-      `rev login --username brwnrclse`
-
-      `rev login -u brwnrclse`
-    LONGDESC
-    def login
-      Reivt::LOGGER.info('Login here for your token:')
-      Reivt::LOGGER.info(Paint[Auth.auth_code_url, :green])
-
-      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')
-      spinner.run do
-        begin
-          auth_token = Auth.auth_token(auth_code)
-          user_id = RevAPI.signin_user(auth_token[:auth0_id])
-
-          if user_id.nil?
-            spinner.update(msg: 'User not found! Creating...')
-            user_id = RevAPI.create_user(auth_token[:auth0_id])
-            spinner.success(Paint['User created', :green])
-          end
-
-          Reivt::REIVT_STORE.transaction do |store|
-            store[:access_token] = auth_token[:access_token].strip
-            store[:expires] = auth_token[:expires]
-            store[:auth0_id] = auth_token[:auth0_id].strip
-            store[:user_id] = user_id
-          end
-          spinner.success(Paint['Login successful :)', :green])
-        rescue Errno::ECONNRESET, Errno::EINVAL, EOFError,
-               Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-               Net::OpenTimeout, Net::ProtocolError,
-               Reivt::GraphQLDataException,
-               Reivt::GraphQLValidationException => e
-
-          Reivt::DEVLOGGER.error(e.message)
-          Reivt::DEVLOGGER.error(e.message)
-        end
-      end
-    end
-  end
-end
+# rubocop: disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ClassLength
+require 'paint'
+require 'thor'
+require 'tty-spinner'
+
+#
+# An extension of our main module
+#
+# @author [brwnrclse]
+#
+module Reivt
+  #
+  # Rev's cli
+  #
+  # @author [brwnrclse]
+  #
+  class CLI < Thor
+    namespace :revit
+
+    map %w(--version -v) => :__print_version
+    desc '--version, -v', 'print the version'
+    def __print_version
+      puts VERSION
+    end
+
+    method_option :description, type: :string, aliases: '-d', lazy_default: '',
+                                desc: 'A short summary of the changes'
+    method_option :list_files, type: :array, aliases: '-l',
+                               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 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.
+
+      `revit create ./Bucket/repo` # Create a new rev from the provided path
+      `revit create ./Bucket/repo --title, -t "Test Repo"` # Create a new revo with a title of Test Repo
+      `revit create ./Bucket/repo --description, -d "A test repo."` # Create a new revo with a description of "a test repo"
+      `revit create ./Bucket/repo --list_files, -l ~/Bucket/oneoffs/help.js` # Create a new rev with a list of files, ignoring the current folder
+    LONGDESC
+    def create(path)
+      doc_set = Set.new
+      doc_ids = Set.new
+      paths = path.split
+      paths += options[:list_files] if options[:list_files]
+      rev_id = nil
+      spinner = TTY::Spinner.new('[:spinner] :msg', format: :bouncing_ball)
+
+      Reivt::Auth.logged_in
+
+      spinner.update(msg: 'Creating a rev...')
+      spinner.run do
+        rev_id = RevAPI.create_rev(options[:title], options[:description])
+      end
+      spinner.success(Paint['rev created', :green])
+
+      paths.each do |x|
+        type = File.exist?(x) ? File.ftype(x) : 'other'
+
+        if type == 'file'
+          spinner.update(msg: "#{Paint['Adding', nil, '#e3b505']} #{x}")
+          spinner.run do
+            doc_set.add(Util.doc_from_path(x))
+          end
+          spinner.success(Paint['document created', :green])
+        elsif type == 'directory'
+          spinner.update(msg: "#{Paint['Adding', nil, '#e3b505']} docs from " \
+                         "#{Paint[path, '#2de1fc']}")
+
+          if Dir.entries(x).include?('.git')
+            spinner.run do
+              doc_set.merge(Util.docs_from_repo(x, spinner))
+            end
+            spinner.success(Paint['repo docs created', :green])
+          else
+            spinner.run do
+              doc_set.merge(Util.docs_from_dir(x))
+            end
+            spinner.success(Paint['dir docs created', :green])
+          end
+        else
+          spinner.error("#{Paint['Unsupported file type:']} #{path}")
+        end
+      end
+
+      spinner.update(msg: 'Uploading docs to rev api')
+      spinner.run do
+        doc_set.each do |doc|
+          doc_id = RevAPI.create_doc(doc.blob, doc.content_type, doc.doc_name,
+                                     doc.has_diff, rev_id)
+          doc_ids.add(doc_id)
+        end
+      end
+      spinner.success(Paint['docs uploaded to api', :green])
+
+      Reivt::LOGGER.info(
+        "Login at #{Paint['wver.vaemoi.co/home', :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)
+      Reivt::LOGGER.error(e.message)
+
+      unless doc_ids.empty?
+        doc_ids.each do |id|
+          RevAPI.delete_doc(id)
+        end
+      end
+
+      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'
+    long_desc <<-LONGDESC
+      Sends a request for a valid auth token (jwt) to use for accessing the API.
+      Refresh is handled automatically as along as the user keeps on using rev otherwise it'll expire after about a week.
+
+      `rev login --username brwnrclse`
+
+      `rev login -u brwnrclse`
+    LONGDESC
+    def login
+      Reivt::LOGGER.info('Login here for your token:')
+      Reivt::LOGGER.info(Paint[Auth.auth_code_url, :green])
+
+      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')
+      spinner.run do
+        begin
+          auth_token = Auth.auth_token(auth_code)
+          user_id = RevAPI.signin_user(auth_token[:auth0_id])
+
+          if user_id.nil?
+            spinner.update(msg: 'User not found! Creating...')
+            user_id = RevAPI.create_user(auth_token[:auth0_id])
+            spinner.success(Paint['User created', :green])
+          end
+
+          Reivt::REIVT_STORE.transaction do |store|
+            store[:access_token] = auth_token[:access_token].strip
+            store[:expires] = auth_token[:expires]
+            store[:auth0_id] = auth_token[:auth0_id].strip
+            store[:user_id] = user_id
+          end
+          spinner.success(Paint['Login successful :)', :green])
+        rescue Errno::ECONNRESET, Errno::EINVAL, EOFError,
+               Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+               Net::OpenTimeout, Net::ProtocolError,
+               Reivt::GraphQLDataException,
+               Reivt::GraphQLValidationException => e
+
+          Reivt::DEVLOGGER.error(e.message)
+          Reivt::DEVLOGGER.error(e.message)
+        end
+      end
+    end
+  end
+end