gazer 0.2.59 → 0.2.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67ec12c5dba850ab2a62f07164e4d051e202cbe0b3b44b50a854499c87f80dc
-  data.tar.gz: 33ffc537d99dd9a184e43b20bc44423a0ed40d11966d1bfde06c637f23b71e5f
+  metadata.gz: ffbe3dcb8878d37708779d3b188b007db7a1fac7807183ccdee7f8e0410dbcf8
+  data.tar.gz: 3feaf5d5dd4d55c3f6844afdf62b86177ab489186c77b54dfcfc81b6b8b59daa
 SHA512:
-  metadata.gz: dbcbad1a30333e30a9de999ac7a9a807ed8b306378197a828397c1d7cf00bebec51190b0b3f35dc04828d0c6c8449b2b25f0b1811c85c9db0154abe2ed1b4f69
-  data.tar.gz: dbcc80f63e040184eebbffd1211cc20df0dcd9454277bbb4b71abfa8afbc45dd7fc1a103f0ef2976d5d6ee52e4a8454958b54e9452e645292aba3deaa2bd098a
+  metadata.gz: 8e28bcbc38b1f0077d7b4242649524b72db04ba7064add9e296569519bee38b43792f1b80bac96cbcdb4f50bf136aae6aa211c6f92d2a2ebdada43c6b79999fa
+  data.tar.gz: 857b9185b9ce97528befaa636895295bf0a1ff7724fa5b747227198f58324922ac74bf2e113a8d9fb09f420ebdb847fd8525ba2cc56eb3ddd8e574c92fdfb3ae

data/.github/workflows/lint-pr.yml

@@ -0,0 +1,17 @@
+name: "Lint PR"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/release.yml

@@ -11,6 +11,8 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
+      # Checkout code
+      - uses: actions/checkout@v3
       - uses: GoogleCloudPlatform/release-please-action@v2
         id: release
         with:
@@ -20,9 +22,6 @@ jobs:
           bump-patch-for-minor-pre-major: true
           version-file: "lib/gzr/version.rb"
           token: ${{ secrets.LOS_AUTO_BOT_RP_TOKEN }}
-      # Checkout code if release was created
-      - uses: actions/checkout@v2
-        if: ${{ steps.release.outputs.release_created }}
       # Setup ruby if a release was created
       - uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### [0.2.60](https://www.github.com/looker-open-source/gzr/compare/v0.2.59...v0.2.60) (2023-04-11)
+
+
+### Bug Fixes
+
+* quick typo fixes for API 4.0 changes ([#168](https://www.github.com/looker-open-source/gzr/issues/168)) ([82a634e](https://www.github.com/looker-open-source/gzr/commit/82a634e77de0aaee5bd62c84092e827a2f7f6c73))
+
 ### [0.2.59](https://www.github.com/looker-open-source/gzr/compare/v0.2.58...v0.2.59) (2023-03-29)
 
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.59)
-      looker-sdk (~> 0.1.1, <= 0.1.2)
+    gazer (0.2.60)
+      faraday (~> 1.10.3)
+      looker-sdk (~> 0.1.1)
       net-http-persistent (~> 4.0, >= 4.0.1)
       netrc (~> 0.11.0)
       pastel (~> 0.8.0)
@@ -42,8 +43,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    looker-sdk (0.1.2)
-      faraday (>= 1.2, < 2.0)
+    looker-sdk (0.1.4)
+      faraday (>= 1.2, < 3.0)
       sawyer (~> 0.8)
     multipart-post (2.3.0)
     net-http-persistent (4.0.1)
@@ -51,7 +52,7 @@ GEM
     netrc (0.11.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (4.0.7)
+    public_suffix (5.0.1)
     rake (12.3.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/gzr.gemspec

@@ -59,7 +59,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 1.1', '>= 1.1.0'
   spec.add_dependency 'netrc', "~> 0.11.0"
   spec.add_runtime_dependency 'rubyzip', '~> 1.3', '>= 1.3.0'
-  spec.add_dependency 'looker-sdk', "~> 0.1.1", "<= 0.1.2"
+  spec.add_dependency 'faraday', "~> 1.10.3"
+  spec.add_dependency 'looker-sdk', "~> 0.1.1"
   spec.add_runtime_dependency 'net-http-persistent', '~> 4.0', '>= 4.0.1'
 
   spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.10'

data/lib/gzr/cli.rb

@@ -36,9 +36,8 @@ module Gzr
     class_option :debug, type: :boolean, default: false, desc: 'Run in debug mode'
     class_option :host, type: :string, default: 'localhost', desc: 'Looker Host'
     class_option :port, type: :string, default: '19999', desc: 'Looker API Port'
-    class_option :client_id, type: :string, desc: 'API3 Client Id'
-    class_option :client_secret, type: :string, desc: 'API3 Client Secret'
-    class_option :api_version, type: :string, desc: 'Looker API Version'
+    class_option :client_id, type: :string, desc: 'API Client Id'
+    class_option :client_secret, type: :string, desc: 'API Client Secret'
     class_option :ssl, type: :boolean, default: true, desc: 'Use ssl to communicate with host'
     class_option :verify_ssl, type: :boolean, default: true, desc: 'Verify the SSL certificate of the host'
     class_option :timeout, type: :numeric, default: 60, desc: 'Seconds to wait for a response from the server'
@@ -57,7 +56,7 @@ module Gzr
       puts "v#{Gzr::VERSION}"
     end
     map %w(--version -v) => :version
-    map folder: :space  # Alias folder command to space
+    map space: :folder  # Alias space command to folder
 
     require_relative 'commands/attribute'
     register Gzr::Commands::Attribute, 'attribute', 'attribute [SUBCOMMAND]', 'Command description...'
@@ -92,7 +91,7 @@ module Gzr
     require_relative 'commands/look'
     register Gzr::Commands::Look, 'look', 'look [SUBCOMMAND]', 'Commands pertaining to looks'
 
-    require_relative 'commands/space'
-    register Gzr::Commands::Space, 'space', 'space [SUBCOMMAND]', 'Commands pertaining to spaces'
+    require_relative 'commands/folder'
+    register Gzr::Commands::Folder, 'folder', 'folder [SUBCOMMAND]', 'Commands pertaining to folders'
   end
 end

data/lib/gzr/command.rb

@@ -25,6 +25,7 @@ require 'forwardable'
 require 'tty-reader'
 require 'netrc'
 require 'looker-sdk'
+require 'faraday/multipart'
 
 require_relative 'modules/session'
 
@@ -182,7 +183,7 @@ module Gzr
           return
         end
         @default_colors=color_palette_lookup!(dcc)
-        say_warning("Default colors #{JSON.pretty_generate @default_colors}") if @options[:debug]
+        #say_warning("Default colors #{JSON.pretty_generate @default_colors}") if @options[:debug]
       end unless @default_colors
 
       if obj.respond_to?(:'has_key?') && obj.has_key?(:collection_id) && obj.has_key?(:palette_id)
@@ -194,13 +195,13 @@ module Gzr
 
     def color_palette_lookup!(obj)
       return nil unless obj.respond_to?(:'has_key?')
-      say_warning("performing color_palette_lookup! on #{JSON.pretty_generate obj}") if @options[:debug]
+      #say_warning("performing color_palette_lookup! on #{JSON.pretty_generate obj}") if @options[:debug]
       palettes = []
       palettes += obj[:categoricalPalettes] if obj[:categoricalPalettes]
       palettes += obj[:sequentialPalettes] if obj[:sequentialPalettes]
       palettes += obj[:divergingPalettes] if obj[:divergingPalettes]
       obj[:palettes]=palettes
-      say_warning("got palettes #{JSON.pretty_generate palettes}") if @options[:debug]
+      #say_warning("got palettes #{JSON.pretty_generate palettes}") if @options[:debug]
       obj
     end
 
@@ -211,11 +212,11 @@ module Gzr
         cc = default_colors
       else
         o[:collection_default] = false
-        say_ok("looking up color collection by id #{o[:collection_id]}") if @options[:debug]
+        #say_ok("looking up color collection by id #{o[:collection_id]}") if @options[:debug]
         cc = color_palette_lookup!(color_collection(o[:collection_id]))
       end
       return unless cc
-      say_warning("got color collection #{JSON.pretty_generate cc}") if @options[:debug]
+      #say_warning("got color collection #{JSON.pretty_generate cc}") if @options[:debug]
       o[:collection_label] = cc[:label]
       ps = cc[:palettes].select { |p| p[:id] == o[:palette_id] }
       if ps.length > 0
@@ -233,11 +234,11 @@ module Gzr
       cc = default_colors
       if !(force_default && o[:collection_default])
         # look up color collection by id
-        say_warning("attempting to match palette on id #{o[:collection_id]}") if @options[:debug]
+        #say_warning("attempting to match palette on id #{o[:collection_id]}") if @options[:debug]
         cc = color_palette_lookup!(color_collection(o[:collection_id]))
         if cc.nil?
           # find color collection by name
-          say_warning("no match on id, attempting to match palette on name #{o[:collection_label]}") if @options[:debug]
+          #say_warning("no match on id, attempting to match palette on name #{o[:collection_label]}") if @options[:debug]
           ccs = all_color_collections()&.select { |cc| o[:collection_label] == cc[:label]}
           if ccs.nil? || ccs.length == 0
             # no color collection found. Use default.
@@ -291,7 +292,10 @@ module Gzr
 
       say_warning "Expecting exactly one body parameter with a schema for operation #{operation}" unless parameters.length == 1
       schema_ref = parameters[0][:schema][:$ref].split(/\//)
-      return @sdk.swagger[schema_ref[1].to_sym][schema_ref[2].to_sym][:properties].reject { |k,v| v[:readOnly] }.keys
+      key_list = @sdk.swagger[schema_ref[1].to_sym][schema_ref[2].to_sym][:properties].reject { |k,v| v[:readOnly] }.keys
+      say_warning "key_list #{operation} -> #{key_list}" if @options[:debug]
+      return key_list
+
     end
 
     ##

data/lib/gzr/commands/attribute/get_group_value.rb

@@ -40,7 +40,7 @@ module Gzr
 
         def execute(input: $stdin, output: $stdout)
           say_warning(@options) if @options[:debug]
-          with_session("3.1") do
+          with_session do
 
             group_id = @group if /^\d+$/.match @group
             group = nil

data/lib/gzr/commands/attribute/set_group_value.rb

@@ -41,7 +41,7 @@ module Gzr
 
         def execute(input: $stdin, output: $stdout)
           say_warning(@options) if @options[:debug]
-          with_session("3.1") do
+          with_session do
 
             group_id = @group if /^\d+$/.match @group
             group = nil

data/lib/gzr/commands/dashboard/cat.rb

@@ -42,7 +42,7 @@ module Gzr
 
         def execute(*args, input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
-          with_session("3.1") do
+          with_session do
             data = cat_dashboard(@dashboard_id)
 
             replacements = {}

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

@@ -38,16 +38,16 @@ 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
 
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}", output: output) if @options[:debug]
-          with_session("3.1") do
+          with_session do
 
             @me ||= query_me("id")
 
@@ -63,7 +63,8 @@ module Gzr
                 raise Gzr::CLI::Error, "import file is not a valid dashboard"
               end
 
-              dashboard = sync_dashboard(data,@dest_space_id, output: output)
+              dashboard = sync_dashboard(data,@dest_folder_id, output: output)
+              say_warning "dashboard object #{JSON.pretty_generate dashboard.map(&:to_a).to_json}" if @options[:debug]
 
               dashboard[:dashboard_filters] ||= []
               source_filters = data[:dashboard_filters].sort { |a,b| a[:row] <=> b[:row] }
@@ -79,30 +80,32 @@ module Gzr
               dashboard[:dashboard_elements] ||= []
               elem_table = data[:dashboard_elements].map do |new_element|
                 element = new_element.select do |k,v|
-                  (keys_to_keep('create_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id, :result_maker_id]).include? k
+                  (keys_to_keep('create_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id, :result_maker_id, :query, :merge_result]).include? k
                 end
-                (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
-                say_warning "Creating dashboard element #{element.inspect}" if @options[:debug]
+                (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element)
+                say_warning "Creating dashboard element #{element.select {|k,v| !v.nil?}.inspect}" if @options[:debug]
                 element[:dashboard_id] = dashboard.id
                 result_maker = copy_result_maker_filterables(new_element)
                 element[:result_maker] = result_maker if result_maker
                 dashboard_element = create_dashboard_element(element)
+                say_warning "dashboard_element #{dashboard_element.inspect}" if @options[:debug]
                 dashboard[:dashboard_elements].push dashboard_element
                 [new_element[:id], dashboard_element.id]
               end
 
               source_dashboard_layouts = data[:dashboard_layouts].map do |new_layout|
                 layout_obj = nil
-                if new_layout[:active] 
+                if new_layout[:active]
                   layout_obj = get_dashboard_layout(dashboard[:dashboard_layouts].first.id)
                   say_warning "Updating layout #{layout_obj.id}" if @options[:debug]
-                else  
+                else
                   layout = new_layout.select do |k,v|
                     (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
                   end
                   layout[:dashboard_id] = dashboard.id
                   say_warning "Creating dashboard layout #{layout}" if @options[:debug]
                   layout_obj = create_dashboard_layout(layout)
+                  say_warning "Created dashboard layout #{JSON.pretty_generate layout_obj.map(&:to_a).to_json}" if @options[:debug]
                 end
                 layout_components = new_layout[:dashboard_layout_components].zip(layout_obj.dashboard_layout_components)
                 layout_components.each do |source,target|
@@ -121,22 +124,22 @@ module Gzr
                 end
               end
               upsert_plans_for_dashboard(dashboard.id,@me.id,data[:scheduled_plans]) if data[:scheduled_plans]
-              output.puts "Imported dashboard #{dashboard.id}" unless @options[:plain] 
-              output.puts dashboard.id if @options[:plain] 
+              output.puts "Imported dashboard #{dashboard.id}" unless @options[:plain]
+              output.puts dashboard.id if @options[:plain]
             end
           end
         end
 
-        def sync_dashboard(source, target_space_id, output: $stdout)
-          # try to find dashboard by slug in target space
-          existing_dashboard = search_dashboards_by_slug(source[:slug], target_space_id).fetch(0,nil) if source[:slug]
-          # check for dash of same title in target space
-          title_used = search_dashboards_by_title(source[:title], target_space_id).select {|d| !d[:deleted] }.fetch(0,nil)
-
-          # If there is no match by slug in target space or no slug given, then we match by title
+        def sync_dashboard(source, target_folder_id, output: $stdout)
+          # try to find dashboard by slug in target folder
+          existing_dashboard = search_dashboards_by_slug(source[:slug], target_folder_id).fetch(0,nil) if source[:slug]
+          # check for dash of same title in target folder
+          title_used = search_dashboards_by_title(source[:title], target_folder_id).select {|d| !d[:deleted] }.fetch(0,nil)
+          # If there is no match by slug in target folder or no slug given, then we match by title
           existing_dashboard ||= title_used
+          say_warning "existing_dashboard object #{existing_dashboard.inspect}" if @options[:debug]
 
-          # same_title is now a flag indicating that there is already a dash in the same space with
+          # same_title is now a flag indicating that there is already a dash in the same folder with
           # that title, and it is the one we are updating.
           same_title = (title_used&.fetch(:id,nil) == existing_dashboard&.fetch(:id,nil))
 
@@ -148,18 +151,18 @@ module Gzr
           same_slug = (slug_used&.fetch(:id,nil) == existing_dashboard&.fetch(:id,nil))
 
           if slug_used && !same_slug then
-            say_warning "slug #{slug_used.slug} already used for dashboard #{slug_used.title} in space #{slug_used.space_id}", output: output
+            say_warning "slug #{slug_used.slug} already used for dashboard #{slug_used.title} in folder #{slug_used.folder_id}", output: output
             say_warning("That dashboard is in the 'Trash' but not fully deleted yet", output: output) if slug_used.deleted
             say_warning "dashboard will be imported with new slug", output: output
           end
 
           if existing_dashboard then
             if title_used && !same_title then
-              raise Gzr::CLI::Error, "Dashboard #{source[:title]} already exists in space #{target_space_id}\nDelete it before trying to upate another dashboard to have that title."
+              raise Gzr::CLI::Error, "Dashboard #{source[:title]} already exists in folder #{target_folder_id}\nDelete it before trying to upate another dashboard to have that title."
             end
-            raise Gzr::CLI::Error, "Dashboard #{existing_dashboard[:title]} with slug #{existing_dashboard[:slug]} already exists in space #{target_space_id}\nUse --force if you want to overwrite it" unless @options[:force]
+            raise Gzr::CLI::Error, "Dashboard #{existing_dashboard[:title]} with slug #{existing_dashboard[:slug]} already exists in folder #{target_folder_id}\nUse --force if you want to overwrite it" unless @options[:force]
 
-            say_ok "Modifying existing dashboard #{existing_dashboard.id} #{existing_dashboard[:title]} in space #{target_space_id}", output: output
+            say_ok "Modifying existing dashboard #{existing_dashboard.id} #{existing_dashboard[:title]} in folder #{target_folder_id}", output: output
             new_dash = source.select do |k,v|
               (keys_to_keep('update_dashboard') - [:space_id,:folder_id,:user_id,:slug]).include? k
             end
@@ -188,9 +191,13 @@ module Gzr
               (keys_to_keep('create_dashboard') - [:space_id,:folder_id,:user_id,:slug]).include? k
             end
             new_dash[:slug] = source[:slug] unless slug_used
-            new_dash[:space_id] = target_space_id
+            new_dash[:folder_id] = target_folder_id
             new_dash[:user_id] = @me.id
-            return create_dashboard(new_dash)
+            new_dash.select!{|k,v| !v.nil?}
+            say_warning "new dashboard request #{new_dash.inspect}" if @options[:debug]
+            d = create_dashboard(new_dash)
+            say_warning "new dashboard object #{d.inspect}" if @options[:debug]
+            return d
           end
         end
 
@@ -209,7 +216,7 @@ module Gzr
         end
 
         def process_dashboard_element(dash_elem)
-          return [nil, upsert_look(@me.id, create_fetch_query(dash_elem[:look][:query]).id, @dest_space_id, dash_elem[:look]).id, nil] if dash_elem[:look]
+          return [nil, upsert_look(@me.id, create_fetch_query(dash_elem[:look][:query]).id, @dest_folder_id, dash_elem[:look]).id, nil] if dash_elem[:look]
 
           query = dash_elem[:result_maker]&.fetch(:query, false) || dash_elem[:query]
           return [create_fetch_query(query).id, nil, nil] if query

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

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

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