gazer 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3703d087e39d95150305aa414fa6a7bf8f18c6b0
-  data.tar.gz: e3a77952ee01fd8eb78f3c89b194622800de2de9
+  metadata.gz: a25b9ad954b83530e3561459d1a5ca6d9bee6f3f
+  data.tar.gz: 31cf9c8329e387157cc7939849b590ac9c483601
 SHA512:
-  metadata.gz: 83ae74fca0c61ee82e50f9fb7f5db945276a6c47956a1799c8ebe5b4733de8be874522af7b79d660c22d19f0ff073cfe0c9b853186ab1aaf81597367fd3573d2
-  data.tar.gz: daf31b848eed4d29d6be094362b2178d606be3a0457660eef0fc0f47b3d84119e6d044ad1a1e65a60c2a4c08f94abf35d34eb59c614aa5241fa54b6c35391425
+  metadata.gz: da0eb3d49d53a4e9aca08de2128ad03ec5701ee2c9633e8752bd77e9e0c219af266256fca37158fa92785afc8f2756ee5cbe83b708a79630e1bb44af55f90531
+  data.tar.gz: e35d9573f74d7c1fe6fec0ae1ee5527cd62764be13015b6f36214cfaf2efa0c0e2edc8e75aaf3a583e77aa5e7daafccaad4a6287d1c2317a734cd2df2401baa6

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.23)
+    gazer (0.2.24)
       looker-sdk (~> 0.0.6)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)
+      rubyzip (~> 1.3.0)
       thor (~> 0.20.0)
       tty-reader (~> 0.3.0)
       tty-table (~> 0.10.0)
@@ -13,11 +14,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     diff-lcs (1.3)
     equatable (0.5.0)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     kramdown (1.16.2)
     looker-sdk (0.0.6)
@@ -29,7 +30,7 @@ GEM
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
-    public_suffix (3.1.0)
+    public_suffix (4.0.1)
     rake (10.5.0)
     rouge (3.1.1)
     rspec (3.8.0)
@@ -45,6 +46,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    rubyzip (1.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)

data/gzr.gemspec

@@ -58,6 +58,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pastel", "~> 0.7.2"
   spec.add_dependency "thor", "~> 0.20.0"
   spec.add_dependency 'netrc', "~> 0.11.0"
+  spec.add_dependency 'rubyzip', "~> 1.3.0"
   spec.add_dependency 'looker-sdk', "~> 0.0.6"
 
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/gzr/commands/space.rb

@@ -68,6 +68,8 @@ module Gzr
                            desc: 'Tar file to store output'
       method_option :tgz, type: :string,
                            desc: 'TarGZ file to store output'
+      method_option :zip, type: :string,
+                           desc: 'Zip file to store output'
       def export(starting_space)
         if options[:help]
           invoke :help, ['export']

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

@@ -28,6 +28,7 @@ require_relative '../../modules/dashboard'
 require_relative '../../modules/filehelper'
 require 'pathname'
 require 'stringio'
+require 'zip'
 
 module Gzr
   module Commands
@@ -46,26 +47,35 @@ module Gzr
         def execute(input: $stdin, output: $stdout)
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session("3.1") do
-            if @options[:tar] || @options[:tgz] then
-              arc_path = Pathname.new(@options[:tgz] || @options[:tar])
+            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?
-              f = File.open(arc_path.to_path, "wb")
-              tarfile = StringIO.new(String.new,"w")
-              begin
-                tw = Gem::Package::TarWriter.new(tarfile)
-                process_space(@space_id, tw)
-                tw.flush
-                tarfile.rewind
-                if @options[:tgz]
-                  gzw = Zlib::GzipWriter.new(f)
-                  gzw.write tarfile.string
-                  gzw.close
-                else
-                  f.write tarfile.string
+              if @options[:tar] || @options[:tgz]
+                f = File.open(arc_path.to_path, "wb")
+                tarfile = StringIO.new(String.new,"w") unless @options[:zip]
+                begin
+                  tw = Gem::Package::TarWriter.new(tarfile)
+                  process_space(@space_id, tw)
+                  tw.flush
+                  tarfile.rewind
+                  if @options[:tgz]
+                    gzw = Zlib::GzipWriter.new(f)
+                    gzw.write tarfile.string
+                    gzw.close
+                  else
+                    f.write tarfile.string
+                  end
+                ensure
+                  f.close
+                  tarfile.close
+                end
+              else
+                z = Zip::File.new(arc_path.to_path, Zip::File::CREATE, false, continue_on_exists_proc: true)
+                begin
+                  process_space(@space_id, z)
+                ensure
+                  z.close
                 end
-              ensure
-                f.close
-                tarfile.close
               end
             else
               process_space(@space_id, @options[:dir])

data/lib/gzr/modules/filehelper.rb

@@ -28,16 +28,26 @@ module Gzr
   module FileHelper
     def write_file(file_name=nil,base_dir=nil,path=nil,output=$stdout)
       f = nil
-      if base_dir.respond_to?(:mkdir)&& base_dir.respond_to?(:add_file) then
+      if base_dir.respond_to?(:mkdir)&& (base_dir.respond_to?(:add_file) || base_dir.respond_to?(:get_output_stream)) then
         if path then
           @archived_paths ||= Array.new
-          base_dir.mkdir(path.to_path, 0755) unless @archived_paths.include?(path.to_path)
+          begin
+            base_dir.mkdir(path.to_path, 0755) unless @archived_paths.include?(path.to_path)
+          rescue Errno::EEXIST => e
+            nil
+          end
           @archived_paths << path.to_path
         end
         fn = Pathname.new(file_name.gsub('/',"\u{2215}"))
         fn = path + fn if path
-        base_dir.add_file(fn.to_path, 0644) do |tf|
-          yield tf
+        if base_dir.respond_to?(:add_file)
+          base_dir.add_file(fn.to_path, 0644) do |tf|
+            yield tf
+          end
+        elsif base_dir.respond_to?(:get_output_stream)
+          base_dir.get_output_stream(fn.to_path, 0644) do |zf|
+            yield zf
+          end
         end
         return
       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.23"
+  VERSION = "0.2.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Mike DeAngelo
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: looker-sdk
   requirement: !ruby/object:Gem::Requirement