gazer 0.2.39 → 0.2.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1add57b55260f495931de9280559b27e74c627adb2abd3f6ac5656f775f20f91
-  data.tar.gz: 5472e7f295a06fb352dd3a2f9992126601efc0c9a1808be215752dd853a80039
+  metadata.gz: 417b013d1a277bbb0f15622d80475dd2371a306323156ef46a60b9730fefc159
+  data.tar.gz: eaa6ed298f737c3fa29b59b04f783b3278f4c3731f00fefc40cb39820505fd05
 SHA512:
-  metadata.gz: ea605bf8b9b63af92224e246e56859ee4e6afd3ff831a89b4ed75c252934b5d2b3b236a9f8f04a78fc24dca2d4c0449ca4877d5b6a6cd1f1b30c74de74453484
-  data.tar.gz: 4904b769e06cae1b6ec971ac7f83157777d0ca9a1d0cbbabfeb4e9b259569827487653642c6cebf5fb63984d631065bc96d892a4850057365e89d7254f7b0fa4
+  metadata.gz: 31d6d7d1fbec05153cd86db80c7556b9de2e774d10b0cbea10d8403fead584a6f47eb21b0d78d5424c6b219bf4d8950ec9c446bb3e9bab879715ef9f9a55557c
+  data.tar.gz: e813f21a9aef2ea51d88536ebfa4286e62fcbc6a0fe78e64fb23dc33c3877ea762d2260f022638dee4b57919daeab77f520f37ade199d060ec969c023ba3ac53

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.39)
+    gazer (0.2.40)
       looker-sdk (~> 0.0.7)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)

data/lib/gzr/commands/space/ls.rb

@@ -36,6 +36,28 @@ module Gzr
           @options = options
         end
 
+        def flatten_data(raw_array)
+          rows = raw_array.map do |entry|
+            entry.select do |k,v|
+              !(v.kind_of?(Array) || v.kind_of?(Hash))
+            end
+          end
+          raw_array.map do |entry|
+            entry.select do |k,v|
+              v.kind_of? Array
+            end.each do |section,section_value|
+              section_value.each do |section_entry|
+                h = {}
+                section_entry.each_pair do |k,v|
+                  h[:"#{section}.#{k}"] = v
+                end
+                rows.push(h)
+              end
+            end
+          end
+          rows
+        end
+
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
@@ -45,40 +67,33 @@ module Gzr
               return nil
             end unless space_ids && space_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, @options[:fields])
+              query_space(space_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|
+                data.push child
+              end
+            end
+
 
             begin
               puts "No data returned for spaces #{space_ids.inspect}"
               return nil
             end unless data && data.length > 0
 
-            @options[:fields] = 'dashboards(id,title)' if @filter_spec == 'lookml'
             table_hash = Hash.new
             fields = field_names(@options[:fields])
-            table_hash[:header] = field_names(@options[:fields]) unless @options[:plain]
-            rows = []
-            data.each do |r|
-              h = r.to_attrs
-              if @filter_spec != 'lookml' then
-                rows << [h[:parent_id],h[:id],h[:name], nil, nil, nil, nil]
-                subspaces = query_space_children(h[:id], "id,name,parent_id")
-                rows += subspaces.map do |r|
-                  h1 = r.to_attrs
-                  [h1[:parent_id], h1[:id], h1[:name], nil, nil, nil, nil]
-                end
+            table_hash[:header] = fields unless @options[:plain]
+            table_hash[:rows] = flatten_data(data).map do |row|
+              fields.collect do |e|
+                row.fetch(e.to_sym,nil)
               end
-              h[:looks].each do |r|
-                rows << [h[:parent_id],h[:id],h[:name], r[:id], r[:title], nil, nil]
-              end if h[:looks]
-              h[:dashboards].each do |r|
-                rows << [h[:parent_id],h[:id],h[:name], nil, nil, r[:id], r[:title]] unless @filter_spec == 'lookml'
-                rows << [r[:id], r[:title]] if @filter_spec == 'lookml'
-              end if h[:dashboards]
             end
-            table_hash[:rows] = rows
-            table = TTY::Table.new(table_hash) if data[0]
+            table = TTY::Table.new(table_hash)
             alignments = fields.collect do |k|
               (k =~ /id\)*$/) ? :right : :left
             end

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.39"
+  VERSION = "0.2.40"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.39
+  version: 0.2.40
 platform: ruby
 authors:
 - Mike DeAngelo