gazer 0.2.58 → 0.2.60

data/lib/gzr/commands/dashboard.rb

@@ -29,17 +29,17 @@ module Gzr
 
       namespace :dashboard
 
-      desc 'mv DASHBOARD_ID TARGET_SPACE_ID', 'Move a dashboard to the given space'
+      desc 'mv DASHBOARD_ID TARGET_FOLDER_ID', 'Move a dashboard to the given folder'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :force,  type: :boolean,
-                           desc: 'Overwrite a dashboard with the same name in the target space'
-      def mv(dashboard_id, target_space_id)
+                           desc: 'Overwrite a dashboard with the same name in the target folder'
+      def mv(dashboard_id, target_folder_id)
         if options[:help]
           invoke :help, ['mv']
         else
           require_relative 'dashboard/mv'
-          Gzr::Commands::Dashboard::Mv.new(dashboard_id, target_space_id, options).execute
+          Gzr::Commands::Dashboard::Mv.new(dashboard_id, target_folder_id, options).execute
         end
       end
 
@@ -63,19 +63,19 @@ module Gzr
         end
       end
 
-      desc 'import FILE DEST_SPACE_ID', 'Import a dashboard from a file'
+      desc 'import FILE DEST_FOLDER_ID', 'Import a dashboard from a file'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :plain, type: :boolean,
                            desc: 'Provide minimal response information'
       method_option :force,  type: :boolean,
-                           desc: 'Overwrite a dashboard with the same name/slug in the target space'
-      def import(file,dest_space_id)
+                           desc: 'Overwrite a dashboard with the same name/slug in the target folder'
+      def import(file,dest_folder_id)
         if options[:help]
           invoke :help, ['import']
         else
           require_relative 'dashboard/import'
-          Gzr::Commands::Dashboard::Import.new(file, dest_space_id, options).execute
+          Gzr::Commands::Dashboard::Import.new(file, dest_folder_id, options).execute
         end
       end
 

data/lib/gzr/commands/{space → folder}/cat.rb

@@ -22,27 +22,27 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 require_relative '../../modules/filehelper'
 require 'zlib'
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Cat < Gzr::Command
-        include Gzr::Space
+        include Gzr::Folder
         include Gzr::FileHelper
-        def initialize(space_id, options)
+        def initialize(folder_id, options)
           super()
-          @space_id = space_id
+          @folder_id = folder_id
           @options = options
         end
 
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
-            data = query_space(@space_id)
-            write_file(@options[:dir] ? "Space_#{data.id}_#{data.name}.json" : nil, @options[:dir], nil, output) do |f|
+            data = query_folder(@folder_id)
+            write_file(@options[:dir] ? "Folder_#{data.id}_#{data.name}.json" : nil, @options[:dir], nil, output) do |f|
               f.puts JSON.pretty_generate(data.to_attrs)
             end
           end

data/lib/gzr/commands/{space → folder}/create.rb

@@ -22,26 +22,26 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Create < Gzr::Command
-        include Gzr::Space
-        def initialize(name,parent_space, options)
+        include Gzr::Folder
+        def initialize(name,parent_folder, options)
           super()
           @name = name
-          @parent_space = parent_space
+          @parent_folder = parent_folder
           @options = options
         end
 
         def execute(input: $stdin, output: $stdout)
-          space = nil
+          folder = nil
           with_session do
-            space = create_space(@name, @parent_space)
-            output.puts "Created space #{space.id}" unless @options[:plain] 
-            output.puts space.id if @options[:plain] 
+            folder = create_folder(@name, @parent_folder)
+            output.puts "Created folder #{folder.id}" unless @options[:plain] 
+            output.puts folder.id if @options[:plain] 
           end
         end
       end

data/lib/gzr/commands/{space → folder}/export.rb

@@ -22,7 +22,7 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 require_relative '../../modules/look'
 require_relative '../../modules/dashboard'
 require_relative '../../modules/plan'
@@ -33,22 +33,22 @@ require 'zip'
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Export < Gzr::Command
-        include Gzr::Space
+        include Gzr::Folder
         include Gzr::Look
         include Gzr::Dashboard
         include Gzr::Plan
         include Gzr::FileHelper
-        def initialize(space_id, options)
+        def initialize(folder_id, options)
           super()
-          @space_id = space_id
+          @folder_id = folder_id
           @options = options
         end
 
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
-          with_session("3.1") do
+          with_session do
             if @options[:tar] || @options[:tgz] || @options[:zip] then
               arc_path = Pathname.new(@options[:tgz] || @options[:tar] || @options[:zip])
               arc_path = Pathname.new(File.expand_path(@options[:dir])) + arc_path unless arc_path.absolute?
@@ -57,7 +57,7 @@ module Gzr
                 tarfile = StringIO.new(String.new,"w") unless @options[:zip]
                 begin
                   tw = Gem::Package::TarWriter.new(tarfile)
-                  process_space(@space_id, tw)
+                  process_folder(@folder_id, tw)
                   tw.flush
                   tarfile.rewind
                   if @options[:tgz]
@@ -74,44 +74,44 @@ module Gzr
               else
                 z = Zip::File.new(arc_path.to_path, Zip::File::CREATE, false, continue_on_exists_proc: true)
                 begin
-                  process_space(@space_id, z)
+                  process_folder(@folder_id, z)
                 ensure
                   z.close
                 end
               end
             else
-              process_space(@space_id, @options[:dir])
+              process_folder(@folder_id, @options[:dir])
             end
           end
         end
 
-        def process_space(space_id, base, rel_path = nil)
-          space = query_space(space_id).to_attrs
-          name = space[:name]
-          name = "nil (#{space_id})" if name.nil?
+        def process_folder(folder_id, base, rel_path = nil)
+          folder = query_folder(folder_id).to_attrs
+          name = folder[:name]
+          name = "nil (#{folder_id})" if name.nil?
           path = Pathname.new(name.gsub('/',"\u{2215}"))
           path = rel_path + path if rel_path
 
-          write_file("Space_#{space[:id]}_#{name}.json", base, path) do |f|
-            f.write JSON.pretty_generate(space.reject do |k,v|
+          write_file("Folder_#{folder[:id]}_#{name}.json", base, path) do |f|
+            f.write JSON.pretty_generate(folder.reject do |k,v|
               [:looks, :dashboards].include?(k)
             end)
           end
-          space[:looks].each do |l|
+          folder[:looks].each do |l|
             look = cat_look(l[:id])
             write_file("Look_#{look[:id]}_#{look[:title]}.json", base, path) do |f|
               f.write JSON.pretty_generate(look)
             end
           end
-          space[:dashboards].each do |d|
+          folder[:dashboards].each do |d|
             data = cat_dashboard(d[:id])
             write_file("Dashboard_#{data[:id]}_#{data[:title]}.json", base, path) do |f|
               f.write JSON.pretty_generate(data)
             end
           end
-          space_children = query_space_children(space_id)
-          space_children.each do |child_space|
-            process_space(child_space[:id], base, path)
+          folder_children = query_folder_children(folder_id)
+          folder_children.each do |child_folder|
+            process_folder(child_folder[:id], base, path)
           end
         end
       end

data/lib/gzr/commands/{space → folder}/ls.rb

@@ -22,14 +22,14 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 require 'tty-table'
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Ls < Gzr::Command
-        include Gzr::Space
+        include Gzr::Folder
         def initialize(filter_spec, options)
           super()
           @filter_spec = filter_spec
@@ -61,27 +61,27 @@ module Gzr
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
-            space_ids = process_args([@filter_spec])
+            folder_ids = process_args([@filter_spec])
             begin
-              puts "No spaces match #{@filter_spec}"
+              puts "No folders match #{@filter_spec}"
               return nil
-            end unless space_ids && space_ids.length > 0
+            end unless folder_ids && folder_ids.length > 0
 
             @options[:fields] = 'dashboards(id,title)' if @filter_spec == 'lookml'
             f = @options[:fields]
 
-            data = space_ids.map do |space_id|
-              query_space(space_id, f).to_attrs
+            data = folder_ids.map do |folder_id|
+              query_folder(folder_id, f).to_attrs
             end.compact
-            space_ids.each do |space_id|
-              query_space_children(space_id, 'id,name,parent_id').map {|child| child.to_attrs}.each do |child|
+            folder_ids.each do |folder_id|
+              query_folder_children(folder_id, 'id,name,parent_id').map {|child| child.to_attrs}.each do |child|
                 data.push child
               end
             end
 
 
             begin
-              puts "No data returned for spaces #{space_ids.inspect}"
+              puts "No data returned for folders #{folder_ids.inspect}"
               return nil
             end unless data && data.length > 0
 

data/lib/gzr/commands/{space → folder}/rm.rb

@@ -22,32 +22,32 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Rm < Gzr::Command
-        include Gzr::Space
-        def initialize(space,options)
+        include Gzr::Folder
+        def initialize(folder,options)
           super()
-          @space = space
+          @folder = folder
           @options = options
         end
 
         def execute(input: $stdin, output: $stdout)
           with_session do
-            space = query_space(@space)
+            folder = query_folder(@folder)
 
             begin
-              puts "Space #{@space} not found"
+              puts "Folder #{@folder} not found"
               return nil
-            end unless space
-            children = query_space_children(@space)
-            unless (space.looks.length == 0 && space.dashboards.length == 0 && children.length == 0) || @options[:force] then
-              raise Gzr::CLI::Error, "Space '#{space.name}' is not empty. Space cannot be deleted unless --force is specified"
+            end unless folder
+            children = query_folder_children(@folder)
+            unless (folder.looks.length == 0 && folder.dashboards.length == 0 && children.length == 0) || @options[:force] then
+              raise Gzr::CLI::Error, "Folder '#{folder.name}' is not empty. Folder cannot be deleted unless --force is specified"
             end
-            delete_space(@space)
+            delete_folder(@folder)
           end
         end
       end

data/lib/gzr/commands/{space → folder}/top.rb

@@ -22,14 +22,14 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 require 'tty-table'
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Top < Gzr::Command
-        include Gzr::Space
+        include Gzr::Folder
         def initialize(options)
           super()
           @options = options
@@ -40,19 +40,19 @@ module Gzr
           with_session do
             extra_fields = %w(is_shared_root is_users_root is_embed_shared_root is_embed_users_root)
             query_fields = (@options[:fields].split(',') + extra_fields).uniq
-            spaces = all_spaces(query_fields.join(','))
+            folders = all_folders(query_fields.join(','))
 
             begin
-              puts "No spaces found"
+              puts "No folders found"
               return nil
-            end unless spaces && spaces.length > 0
+            end unless folders && folders.length > 0
 
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
             expressions = fields.collect { |fn| field_expression(fn) }
             rows = []
-            spaces.each do |h|
+            folders.each do |h|
               if ( h.is_shared_root || h.is_users_root || h.is_embed_shared_root || h.is_embed_users_root) then
                 rows << expressions.collect do |e|
                   eval "h.#{e}"

data/lib/gzr/commands/{space → folder}/tree.rb

@@ -22,7 +22,7 @@
 # frozen_string_literal: true
 
 require_relative '../../command'
-require_relative '../../modules/space'
+require_relative '../../modules/folder'
 require 'tty-tree'
 
 # The tty-tree tool is built on the idea of handling directories, so it does
@@ -51,9 +51,9 @@ end
 
 module Gzr
   module Commands
-    class Space
+    class Folder
       class Tree < Gzr::Command
-        include Gzr::Space
+        include Gzr::Folder
         def initialize(filter_spec, options)
           super()
           @filter_spec = filter_spec
@@ -63,35 +63,35 @@ module Gzr
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
-            space_ids = process_args([@filter_spec])
+            folder_ids = process_args([@filter_spec])
 
             tree_data = Hash.new
-            
-            space_ids.each do |space_id| 
-              s = query_space(space_id, "id,name,parent_id,looks(id,title),dashboards(id,title)")
-              space_name = s.name
-              space_name = "nil (#{s.id})" unless space_name 
-              space_name = "\"#{space_name}\"" if ((space_name != space_name.strip) || (space_name.length == 0))
-              space_name += " (#{space_id})" unless space_ids.length == 1
-              tree_data[space_name] =
-                [ recurse_spaces(s.id) ] +
+
+            folder_ids.each do |folder_id| 
+              s = query_folder(folder_id, "id,name,parent_id,looks(id,title),dashboards(id,title)")
+              folder_name = s.name
+              folder_name = "nil (#{s.id})" unless folder_name 
+              folder_name = "\"#{folder_name}\"" if ((folder_name != folder_name.strip) || (folder_name.length == 0))
+              folder_name += " (#{folder_id})" unless folder_ids.length == 1
+              tree_data[folder_name] =
+                [ recurse_folders(s.id) ] +
                 s.looks.map { |l| "(l) #{l.title}" } +
-                  s.dashboards.map { |d| "(d) #{d.title}" }
+                s.dashboards.map { |d| "(d) #{d.title}" }
             end
             tree = TTY::Tree.new(tree_data)
             output.puts tree.render
           end
         end
 
-        def recurse_spaces(space_id)
-          data = query_space_children(space_id, "id,name,parent_id,looks(id,title),dashboards(id,title)")
+        def recurse_folders(folder_id)
+          data = query_folder_children(folder_id, "id,name,parent_id,looks(id,title),dashboards(id,title)")
           tree_branch = Hash.new
           data.each do |s|
-            space_name = s.name
-            space_name = "nil (#{s.id})" unless space_name 
-            space_name = "\"#{space_name}\"" if ((space_name != space_name.strip) || (space_name.length == 0))
-            tree_branch[space_name] =
-              [ recurse_spaces(s.id) ] +
+            folder_name = s.name
+            folder_name = "nil (#{s.id})" unless folder_name 
+            folder_name = "\"#{folder_name}\"" if ((folder_name != folder_name.strip) || (folder_name.length == 0))
+            tree_branch[folder_name] =
+              [ recurse_folders(s.id) ] +
               s.looks.map { |l| "(l) #{l.title}" } +
               s.dashboards.map { |d| "(d) #{d.title}" }
           end

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

@@ -25,25 +25,25 @@ require_relative 'subcommandbase'
 
 module Gzr
   module Commands
-    class Space < SubCommandBase
+    class Folder < SubCommandBase
 
-      namespace :space
+      namespace :folder
 
-      desc 'create NAME PARENT_SPACE', 'Command description...'
+      desc 'create NAME PARENT_FOLDER', 'Command description...'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :plain, type: :boolean,
                            desc: 'Provide minimal response information'
-      def create(name, parent_space)
+      def create(name, parent_folder)
         if options[:help]
           invoke :help, ['create']
         else
-          require_relative 'space/create'
-          Gzr::Commands::Space::Create.new(name, parent_space, options).execute
+          require_relative 'folder/create'
+          Gzr::Commands::Folder::Create.new(name, parent_folder, options).execute
         end
       end
 
-      desc 'top', 'Retrieve the top level (or root) spaces'
+      desc 'top', 'Retrieve the top level (or root) folders'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :fields, type: :string, default: 'id,name,is_shared_root,is_users_root,is_embed_shared_root,is_embed_users_root',
@@ -56,12 +56,12 @@ module Gzr
         if options[:help]
           invoke :help, ['top']
         else
-          require_relative 'space/top'
-          Gzr::Commands::Space::Top.new(options).execute
+          require_relative 'folder/top'
+          Gzr::Commands::Folder::Top.new(options).execute
         end
       end
 
-      desc 'export SPACE_ID', 'Export a space, including all child looks, dashboards, and spaces.'
+      desc 'export FOLDER_ID', 'Export a folder, including all child looks, dashboards, and folders.'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :plans,  type: :boolean,
@@ -74,42 +74,42 @@ module Gzr
                            desc: 'TarGZ file to store output'
       method_option :zip, type: :string,
                            desc: 'Zip file to store output'
-      def export(starting_space)
+      def export(starting_folder)
         if options[:help]
           invoke :help, ['export']
         else
-          require_relative 'space/export'
-          Gzr::Commands::Space::Export.new(starting_space,options).execute
+          require_relative 'folder/export'
+          Gzr::Commands::Folder::Export.new(starting_folder,options).execute
         end
       end
 
-      desc 'tree STARTING_SPACE', 'Display the dashbaords, looks, and subspaces or a space in a tree format'
+      desc 'tree STARTING_FOLDER', 'Display the dashboards, looks, and subfolders of a folder in a tree format'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
-      def tree(starting_space)
+      def tree(starting_folder)
         if options[:help]
           invoke :help, ['tree']
         else
-          require_relative 'space/tree'
-          Gzr::Commands::Space::Tree.new(starting_space,options).execute
+          require_relative 'folder/tree'
+          Gzr::Commands::Folder::Tree.new(starting_folder,options).execute
         end
       end
 
-      desc 'cat SPACE_ID', 'Output the JSON representation of a space to the screen or a file'
+      desc 'cat FOLDER_ID', 'Output the JSON representation of a folder to the screen or a file'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :dir,  type: :string,
                            desc: 'Directory to get output file'
-      def cat(space_id)
+      def cat(folder_id)
         if options[:help]
           invoke :help, ['cat']
         else
-          require_relative 'space/cat'
-          Gzr::Commands::Space::Cat.new(space_id,options).execute
+          require_relative 'folder/cat'
+          Gzr::Commands::Folder::Cat.new(folder_id,options).execute
         end
       end
 
-      desc 'ls FILTER_SPEC', 'list the contents of a space given by space name, space_id, ~ for the current user\'s default space, or ~name / ~number for the home space of a user'
+      desc 'ls FILTER_SPEC', 'list the contents of a folder given by folder name, folder_id, ~ for the current user\'s default folder, or ~name / ~number for the home folder of a user'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       method_option :fields, type: :string, default: 'parent_id,id,name,looks(id,title),dashboards(id,title)',
@@ -122,20 +122,20 @@ module Gzr
         if options[:help]
           invoke :help, ['ls']
         else
-          require_relative 'space/ls'
-          Gzr::Commands::Space::Ls.new(filter_spec,options).execute
+          require_relative 'folder/ls'
+          Gzr::Commands::Folder::Ls.new(filter_spec,options).execute
         end
       end
 
-      desc 'rm SPACE_ID', 'Delete a space. The space must be empty or the --force flag specified to deleted subspaces, dashboards, and looks.'
+      desc 'rm FOLDER_ID', 'Delete a folder. The folder must be empty or the --force flag specified to deleted subfolders, dashboards, and looks.'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
-      def rm(space_id)
+      def rm(folder_id)
         if options[:help]
           invoke :help, ['rm']
         else
-          require_relative 'space/rm'
-          Gzr::Commands::Space::Rm.new(space_id,options).execute
+          require_relative 'folder/rm'
+          Gzr::Commands::Folder::Rm.new(folder_id,options).execute
         end
       end
     end

data/lib/gzr/commands/group.rb

@@ -32,7 +32,7 @@ module Gzr
       desc 'member_users GROUP_ID', 'List the users that are members of the given group'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
-      method_option :fields, type: :string, default: 'id,email,last_name,first_name,personal_space_id,home_space_id',
+      method_option :fields, type: :string, default: 'id,email,last_name,first_name,personal_folder_id,home_folder_id',
                            desc: 'Fields to display'
       method_option :plain, type: :boolean, default: false,
                            desc: 'print without any extra formatting'

data/lib/gzr/commands/look/import.rb

@@ -35,10 +35,10 @@ module Gzr
         include Gzr::User
         include Gzr::Plan
         include Gzr::FileHelper
-        def initialize(file, dest_space_id, options)
+        def initialize(file, dest_folder_id, options)
           super()
           @file = file
-          @dest_space_id = dest_space_id
+          @dest_folder_id = dest_folder_id
           @options = options
         end
 
@@ -60,7 +60,7 @@ module Gzr
                 raise Gzr::CLI::Error, "import file is not a valid look"
               end
 
-              look = upsert_look(@me.id,create_fetch_query(data[:query]).id,@dest_space_id,data,output: output)
+              look = upsert_look(@me.id,create_fetch_query(data[:query]).id,@dest_folder_id,data,output: output)
               upsert_plans_for_look(look.id,@me.id,data[:scheduled_plans]) if data[:scheduled_plans]
               output.puts "Imported look #{look.id}" unless @options[:plain] 
               output.puts look.id if @options[:plain] 

data/lib/gzr/commands/look/mv.rb

@@ -30,10 +30,10 @@ module Gzr
     class Look
       class Mv < Gzr::Command
         include Gzr::Look
-        def initialize(look_id, target_space_id, options)
+        def initialize(look_id, target_folder_id, options)
           super()
           @look_id = look_id
-          @target_space_id = target_space_id
+          @target_folder_id = target_folder_id
           @options = options
         end
 
@@ -44,18 +44,18 @@ module Gzr
             look = query_look(@look_id)
             raise Gzr::CLI::Error, "Look with id #{@look_id} does not exist" unless look
 
-            matching_title = search_looks_by_title(look[:title],@target_space_id)
+            matching_title = search_looks_by_title(look[:title],@target_folder_id)
             if matching_title.empty? || matching_title.first[:deleted]
               matching_title = false
             end
-            
+
             if matching_title
-              raise Gzr::CLI::Error, "Look #{look[:title]} already exists in space #{@target_space_id}\nUse --force if you want to overwrite it" unless @options[:force]
-              say_ok "Deleting existing look #{matching_title.first[:id]} #{matching_title.first[:title]} in space #{@target_space_id}", output: output
+              raise Gzr::CLI::Error, "Look #{look[:title]} already exists in folder #{@target_folder_id}\nUse --force if you want to overwrite it" unless @options[:force]
+              say_ok "Deleting existing look #{matching_title.first[:id]} #{matching_title.first[:title]} in folder #{@target_folder_id}", output: output
               update_look(matching_title.first[:id],{:deleted=>true})
             end
-            update_look(look[:id],{:space_id=>@target_space_id})
-            output.puts "Moved look #{look[:id]} to space #{@target_space_id}" unless @options[:plain] 
+            update_look(look[:id],{:folder_id=>@target_folder_id})
+            output.puts "Moved look #{look[:id]} to folder #{@target_folder_id}" unless @options[:plain] 
           end
         end
       end