gazer 0.2.59 → 0.2.60

data/lib/gzr/modules/{space.rb → folder.rb}

@@ -22,7 +22,7 @@
 # frozen_string_literal: true
 
 module Gzr
-  module Space
+  module Folder
     def self.included klass
       require_relative '../modules/user'
       klass.class_eval do
@@ -30,43 +30,43 @@ module Gzr
       end
     end
 
-    def create_space(name, parent_id)
+    def create_folder(name, parent_id)
       data = nil
       begin
         req = {:name => name, :parent_id => parent_id}
-        data = @sdk.create_space(req)
+        data = @sdk.create_folder(req)
       rescue LookerSDK::Error => e
-        say_error "Error creating space(#{JSON.pretty_generate(req)})"
+        say_error "Error creating folder(#{JSON.pretty_generate(req)})"
         say_error e.message
         raise
       end
       data
     end
 
-    def search_spaces(name,fields=nil)
+    def search_folders(name,fields=nil)
       data = nil
       begin
         req = {:name => name}
         req[:fields] = fields if fields
-        data = @sdk.search_spaces(req)
+        data = @sdk.search_folders(req)
       rescue LookerSDK::Error => e
-        say_error "Error querying search_spaces(#{JSON.pretty_generate(req)})"
+        say_error "Error querying search_folders(#{JSON.pretty_generate(req)})"
         say_error e.message
         raise
       end
       data
     end
 
-    def query_space(id,fields=nil)
+    def query_folder(id,fields=nil)
       data = nil
       begin
         req = {}
         req[:fields] = fields if fields 
-        data = @sdk.space(id, req)
+        data = @sdk.folder(id, req)
       rescue LookerSDK::NotFound
         return nil
       rescue LookerSDK::Error => e
-        say_error "Error querying space(#{id},#{JSON.pretty_generate(req)})"
+        say_error "Error querying folder(#{id},#{JSON.pretty_generate(req)})"
         say_error e.message
         raise
       end
@@ -74,83 +74,83 @@ module Gzr
     end
 
     def process_args(args)
-      space_ids = []
+      folder_ids = []
 
       begin
-        user = query_me("home_space_id")
-        space_ids << user.home_space_id
+        user = query_me("home_folder_id")
+        folder_ids << user.home_folder_id
       end unless args && args.length > 0 && !(args[0].nil?)
 
       if args[0] == 'lookml'
-        space_ids << 'lookml'
+        folder_ids << 'lookml'
       elsif args[0] =~ /^[0-9]+$/ then
-        space_ids << args[0].to_i
+        folder_ids << args[0].to_i
       elsif args[0] == "~" then
-        user = query_me("personal_space_id")
-        space_ids << user.personal_space_id
+        user = query_me("personal_folder_id")
+        folder_ids << user.personal_folder_id
       elsif args[0] =~ /^~[0-9]+$/ then
-        user = query_user(args[0].sub('~',''), "personal_space_id")
-        space_ids << user.personal_space_id
+        user = query_user(args[0].sub('~',''), "personal_folder_id")
+        folder_ids << user.personal_folder_id
       elsif args[0] =~ /^~.+@.+$/ then
-        search_results = search_users( { :email=>args[0].sub('~','') },"personal_space_id" )
-        space_ids += search_results.map { |r| r.personal_space_id }
+        search_results = search_users( { :email=>args[0].sub('~','') },"personal_folder_id" )
+        folder_ids += search_results.map { |r| r.personal_folder_id }
       elsif args[0] =~ /^~.+$/ then
         first_name, last_name = args[0].sub('~','').split(' ')
-        search_results = search_users( { :first_name=>first_name, :last_name=>last_name },"personal_space_id" )
-        space_ids += search_results.map { |r| r.personal_space_id }
+        search_results = search_users( { :first_name=>first_name, :last_name=>last_name },"personal_folder_id" )
+        folder_ids += search_results.map { |r| r.personal_folder_id }
       else
-        search_results = search_spaces(args[0],"id")
-        space_ids += search_results.map { |r| r.id }
+        search_results = search_folders(args[0],"id")
+        folder_ids += search_results.map { |r| r.id }
 
-        # The built in Shared space is only availabe by
+        # The built in Shared folder is only availabe by
         # searching for Home. https://github.com/looker/helltool/issues/34994
         if args[0] == 'Shared' then
-          search_results = search_spaces('Home',"id,is_shared_root")
-          space_ids += search_results.select { |r| r.is_shared_root }.map { |r| r.id }
+          search_results = search_folders('Home',"id,is_shared_root")
+          folder_ids += search_results.select { |r| r.is_shared_root }.map { |r| r.id }
         end
       end if args && args.length > 0 && !args[0].nil?
 
-      return space_ids
+      return folder_ids
     end
 
-    def all_spaces(fields=nil)
+    def all_folders(fields=nil)
       data = nil
       begin
         req = {}
         req[:fields] = fields if fields 
-        data = @sdk.all_spaces(req)
+        data = @sdk.all_folders(req)
       rescue LookerSDK::Error => e
-        say_error "Error querying all_spaces(#{JSON.pretty_generate(req)})"
+        say_error "Error querying all_folders(#{JSON.pretty_generate(req)})"
         say_error e.message
         raise
       end
       data
     end
 
-    def query_space_children(space_id, fields=nil)
+    def query_folder_children(folder_id, fields=nil)
       data = nil
       req = {}
       req[:fields] = fields if fields
       begin
-        data = @sdk.space_children(space_id, req)
+        data = @sdk.folder_children(folder_id, req)
       rescue LookerSDK::NotFound
         return nil
       rescue LookerSDK::Error => e
-        say_error "Error querying space_children(#{space_id}, #{JSON.pretty_generate(req)})"
+        say_error "Error querying folder_children(#{folder_id}, #{JSON.pretty_generate(req)})"
         say_error e.message
         raise
       end
       data
     end
 
-    def delete_space(space_id)
+    def delete_folder(folder_id)
       data = nil
       begin
-        data = @sdk.delete_space(space_id)
+        data = @sdk.delete_folder(folder_id)
       rescue LookerSDK::NotFound
         return nil
       rescue LookerSDK::Error => e
-        say_error "Error deleting space #{space_id}"
+        say_error "Error deleting folder #{folder_id}"
         say_error e.message
         raise
       end

data/lib/gzr/modules/look.rb

@@ -35,11 +35,11 @@ module Gzr
       data
     end
 
-    def search_looks_by_slug(slug, space_id=nil)
+    def search_looks_by_slug(slug, folder_id=nil)
       data = []
       begin
         req = { :slug => slug }
-        req[:space_id] = space_id if space_id 
+        req[:folder_id] = folder_id if folder_id 
         data = @sdk.search_looks(req)
         req[:deleted] = true
         data = @sdk.search_looks(req) if data.empty?
@@ -51,11 +51,11 @@ module Gzr
       data
     end
 
-    def search_looks_by_title(title, space_id=nil)
+    def search_looks_by_title(title, folder_id=nil)
       data = []
       begin
         req = { :title => title }
-        req[:space_id] = space_id if space_id 
+        req[:folder_id] = folder_id if folder_id 
         data = @sdk.search_looks(req)
         req[:deleted] = true
         data = @sdk.search_looks(req) if data.empty?
@@ -69,10 +69,11 @@ module Gzr
 
     def create_look(look)
       begin
+        look[:public] = false unless look[:public]
         data = @sdk.create_look(look)
       rescue LookerSDK::Error => e
         say_error "Error creating look(#{JSON.pretty_generate(look)})"
-        say_error e.message
+        say_error e
         raise
       end
       data
@@ -101,16 +102,16 @@ module Gzr
       data
     end
 
-    def upsert_look(user_id, query_id, space_id, source, output: $stdout)
-      # try to find look by slug in target space
-      existing_look = search_looks_by_slug(source[:slug], space_id).fetch(0,nil) if source[:slug]
-      # check for look of same title in target space
-      title_used = search_looks_by_title(source[:title], space_id).fetch(0,nil)
+    def upsert_look(user_id, query_id, folder_id, source, output: $stdout)
+      # try to find look by slug in target folder
+      existing_look = search_looks_by_slug(source[:slug], folder_id).fetch(0,nil) if source[:slug]
+      # check for look of same title in target folder
+      title_used = search_looks_by_title(source[:title], folder_id).fetch(0,nil)
 
-      # If there is no match by slug in target space or no slug given, then we match by title
+      # If there is no match by slug in target folder or no slug given, then we match by title
       existing_look ||= title_used
 
-      # same_title is now a flag indicating that there is already a look in the same space with
+      # same_title is now a flag indicating that there is already a look in the same folder with
       # that title, and it is the one we are updating.
       same_title = (title_used&.fetch(:id,nil) == existing_look&.fetch(:id,nil))
 
@@ -122,17 +123,17 @@ module Gzr
       same_slug = (slug_used&.fetch(:id,nil) == existing_look&.fetch(:id,nil))
 
       if slug_used && !same_slug then
-        say_warning "slug #{slug_used.slug} already used for look #{slug_used.title} in space #{slug_used.space_id}", output: output
+        say_warning "slug #{slug_used.slug} already used for look #{slug_used.title} in folder #{slug_used.folder_id}", output: output
         say_warning("That look is in the 'Trash' but not fully deleted yet", output: output) if slug_used.deleted
         say_warning "look will be imported with new slug", output: output
       end
 
       if existing_look then
         if title_used && !same_title then
-          raise Gzr::CLI::Error, "Look #{source[:title]} already exists in space #{space_id}\nDelete it before trying to upate another Look to have that title."
+          raise Gzr::CLI::Error, "Look #{source[:title]} already exists in folder #{folder_id}\nDelete it before trying to upate another Look to have that title."
         end
-        raise Gzr::CLI::Error, "Look #{existing_look[:title]} with slug #{existing_look[:slug]} already exists in space #{space_id}\nUse --force if you want to overwrite it" unless @options[:force]
-        say_ok "Modifying existing Look #{existing_look.id} #{existing_look.title} in space #{space_id}", output: output
+        raise Gzr::CLI::Error, "Look #{existing_look[:title]} with slug #{existing_look[:slug]} already exists in folder #{folder_id}\nUse --force if you want to overwrite it" unless @options[:force]
+        say_ok "Modifying existing Look #{existing_look.id} #{existing_look.title} in folder #{folder_id}", output: output
         new_look = source.select do |k,v|
           (keys_to_keep('update_look') - [:space_id,:folder_id,:user_id,:query_id,:slug]).include? k
         end
@@ -147,7 +148,7 @@ module Gzr
         new_look[:slug] = source[:slug] unless slug_used
         new_look[:query_id] = query_id
         new_look[:user_id] = user_id
-        new_look[:space_id] = space_id
+        new_look[:folder_id] = folder_id
 
         find_vis_config_reference(new_look) do |vis_config|
           find_color_palette_reference(vis_config) do |o,default_colors|

data/lib/gzr/modules/session.rb

@@ -102,7 +102,7 @@ module Gzr
       conn_hash
     end
 
-    def login(min_api_version=nil)
+    def login(min_api_version="4.0")
       if (@options[:client_id].nil? && ENV["LOOKERSDK_CLIENT_ID"])
         @options[:client_id] = ENV["LOOKERSDK_CLIENT_ID"]
       end
@@ -111,10 +111,6 @@ module Gzr
         @options[:client_secret] = ENV["LOOKERSDK_CLIENT_SECRET"]
       end
 
-      if (@options[:api_version].nil? && ENV["LOOKERSDK_API_VERSION"])
-        @options[:api_version] = ENV["LOOKERSDK_API_VERSION"]
-      end
-
       if (@options[:verify_ssl] && ENV["LOOKERSDK_VERIFY_SSL"])
         @options[:verify_ssl] = !(/^f(alse)?$/i =~ ENV["LOOKERSDK_VERIFY_SSL"])
       end
@@ -137,6 +133,7 @@ module Gzr
           :links_parser => Sawyer::LinkParsers::Simple.new,
           :serializer  => LookerSDK::Client::Serializer.new(JSON),
           :faraday => Faraday.new(conn_hash[:connection_options]) do |conn|
+            conn.use LookerSDK::Response::RaiseError
             if @options[:persistent]
               conn.adapter :net_http_persistent
             end
@@ -166,21 +163,19 @@ module Gzr
       end
 
       say_warning "API current_version #{@current_version}" if @options[:debug]
-      say_warning "API versions #{@versions}" if @options[:debug]
-
-      raise Gzr::CLI::Error, "Operation requires API v#{min_api_version}, but user specified version #{@options[:api_version]}" unless sufficient_version?(@options[:api_version],min_api_version)
+      say_warning "Supported API versions #{@versions}" if @options[:debug]
 
       api_version = [min_api_version, @current_version].max
       raise Gzr::CLI::Error, "Operation requires API v#{api_version}, which is not available from this host" if api_version && !@versions.any? {|v| v == api_version}
-      raise Gzr::CLI::Error, "User specified API v#{@options[:api_version]}, which is not available from this host" if @options[:api_version] && !@versions.any? {|v| v == @options[:api_version]}
 
-      conn_hash = build_connection_hash(@options[:api_version] || api_version)
+      conn_hash = build_connection_hash(api_version)
       @secret = nil
 
       say_ok("connecting to #{conn_hash.map { |k,v| "#{k}=>#{(k == :client_secret) ? '*********' : v}" }}") if @options[:debug]
 
       begin
         faraday = Faraday.new(conn_hash[:connection_options]) do |conn|
+          conn.use LookerSDK::Response::RaiseError
           if @options[:persistent]
             conn.adapter :net_http_persistent
           end
@@ -242,7 +237,7 @@ module Gzr
       end
     end
 
-    def with_session(min_api_version="3.0")
+    def with_session(min_api_version="4.0")
       return nil unless block_given?
       begin
         login(min_api_version) unless @sdk

data/lib/gzr/version.rb

@@ -20,5 +20,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Gzr
-  VERSION = '0.2.59'.freeze
+  VERSION = '0.2.60'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.59
+  version: 0.2.60
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.3
 - !ruby/object:Gem::Dependency
   name: looker-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -127,9 +141,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,9 +148,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +246,7 @@ extra_rdoc_files: []
 files:
 - ".github/scripts/parse_version.sh"
 - ".github/scripts/wait_for_looker.sh"
+- ".github/workflows/lint-pr.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/ruby-ci.yml"
 - ".gitignore"
@@ -276,6 +285,14 @@ files:
 - lib/gzr/commands/dashboard/import.rb
 - lib/gzr/commands/dashboard/mv.rb
 - lib/gzr/commands/dashboard/rm.rb
+- lib/gzr/commands/folder.rb
+- lib/gzr/commands/folder/cat.rb
+- lib/gzr/commands/folder/create.rb
+- lib/gzr/commands/folder/export.rb
+- lib/gzr/commands/folder/ls.rb
+- lib/gzr/commands/folder/rm.rb
+- lib/gzr/commands/folder/top.rb
+- lib/gzr/commands/folder/tree.rb
 - lib/gzr/commands/group.rb
 - lib/gzr/commands/group/ls.rb
 - lib/gzr/commands/group/member_groups.rb
@@ -310,14 +327,6 @@ files:
 - lib/gzr/commands/role/user_add.rb
 - lib/gzr/commands/role/user_ls.rb
 - lib/gzr/commands/role/user_rm.rb
-- lib/gzr/commands/space.rb
-- lib/gzr/commands/space/cat.rb
-- lib/gzr/commands/space/create.rb
-- lib/gzr/commands/space/export.rb
-- lib/gzr/commands/space/ls.rb
-- lib/gzr/commands/space/rm.rb
-- lib/gzr/commands/space/top.rb
-- lib/gzr/commands/space/tree.rb
 - lib/gzr/commands/subcommandbase.rb
 - lib/gzr/commands/user.rb
 - lib/gzr/commands/user/cat.rb
@@ -330,6 +339,7 @@ files:
 - lib/gzr/modules/connection.rb
 - lib/gzr/modules/dashboard.rb
 - lib/gzr/modules/filehelper.rb
+- lib/gzr/modules/folder.rb
 - lib/gzr/modules/group.rb
 - lib/gzr/modules/look.rb
 - lib/gzr/modules/model.rb
@@ -337,7 +347,6 @@ files:
 - lib/gzr/modules/plan.rb
 - lib/gzr/modules/role.rb
 - lib/gzr/modules/session.rb
-- lib/gzr/modules/space.rb
 - lib/gzr/modules/user.rb
 - lib/gzr/templates/.gitkeep
 - lib/gzr/templates/attribute/cat/.gitkeep