xapixctl 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb39c7aace95b6c10168b43e536b404a8d5edcdfc48d12890b296708199dccda
-  data.tar.gz: 5db98915dd0ac3f1c02b64ceee8ba7497a72fe4ccd65c09c2543aa108a4a1b95
+  metadata.gz: 3735380aedfe9b2b343be8035f2d988225e1ab686c8b861343a7872b74856b86
+  data.tar.gz: 134e2c3c03e630fddda6dfdc266b51716c6e239989d24a8af4d0e495f8b80ba0
 SHA512:
-  metadata.gz: d67fe8ecd7b977fd05c7f8f8fb9b2b0fdbd4b1153405f0419f93bf05eea7dcb77d4314f4a635d77cb8472c50fcdef9c92df5fae1e361a8874b33401968dfaa35
-  data.tar.gz: e44e46596d4b155a5e3e5c08772de09fdbac68d1b5de23c6377a448f75af35c3701e59cf25498491d57c1c5418b3340ec7098939d168063f0c18bbe929c532d7
+  metadata.gz: 5ad8cc281b69dd9a42b9f4b335b36bcde452888cd75896a4841af22957ce6631adccca781192919e16996a4c550def367de43b9b05d70c9fcddf303a436c29ce
+  data.tar.gz: 4730232765f508b57a332486a29abb543af26f0592471f1304d4e34a05491497d95ba04d737708cdf10085281293a5dda5a0edaf256fa4fa5d6f0f73052cadd3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xapixctl (1.1.1)
+    xapixctl (1.1.2)
       activesupport (>= 5.2.3, < 6.0.0)
       rest-client (>= 2.1.0, < 3.0.0)
       thor (>= 1.0.0, < 1.1.0)
@@ -16,7 +16,7 @@ GEM
       tzinfo (~> 1.1)
     ast (2.4.1)
     concurrent-ruby (1.1.7)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     http-accept (1.7.0)
@@ -30,7 +30,7 @@ GEM
     minitest (5.14.2)
     netrc (0.11.0)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
@@ -55,17 +55,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.91.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.2)
-      parser (>= 2.7.1.4)
+    rubocop-ast (0.5.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     thor (1.0.1)
     thread_safe (0.3.6)

data/lib/xapixctl/base_cli.rb

@@ -13,7 +13,7 @@ module Xapixctl
     private
 
     def warn_api_error(text, err, result)
-      details = "\n " + result['errors'].map { |k| k['detail'] }.join("\n ") rescue err.to_s
+      details = result['errors'].map { |k| k['detail'] }.unshift('').join("\n ") rescue err.to_s
       warn "#{text}: #{details}"
       exit 1
     end
@@ -30,14 +30,28 @@ module Xapixctl
 
     DOCUMENT_STRUCTURE = %w[version kind metadata definition].freeze
     def resources_from_file(filename)
-      yaml_string = filename == '-' ? $stdin.read : IO.read(filename)
-      yaml_string.split(/^---\s*\n/).map { |yml| Psych.safe_load(yml) }.compact.each do |doc|
-        unless (DOCUMENT_STRUCTURE - doc.keys.map(&:to_s)).empty?
-          warn "does not look like a correct resource definition:"
-          warn doc.inspect
-          exit 1
+      load_files(filename) do |yaml_string|
+        yaml_string.split(/^---\s*\n/).map { |yml| Psych.safe_load(yml) }.compact.each do |doc|
+          unless (DOCUMENT_STRUCTURE - doc.keys.map(&:to_s)).empty?
+            warn "does not look like a correct resource definition:"
+            warn doc.inspect
+            exit 1
+          end
+          yield doc
+        end
+      end
+    end
+
+    def load_files(filename)
+      if filename == '-'
+        yield $stdin.read
+      else
+        pn = Pathname.new(filename)
+        if pn.directory?
+          pn.glob(["**/*.yaml", "**/*.yml"]).sort.each { |dpn| yield dpn.read }
+        else
+          yield pn.read
         end
-        yield doc
       end
     end
 

data/lib/xapixctl/cli.rb

@@ -37,14 +37,7 @@ module Xapixctl
         end
       else
         connection.resource_ids(resource_type, org: options[:org], project: options[:project]) do |res|
-          res.on_success do |resource_ids|
-            resource_ids.each do |resource_id|
-              connection.resource(resource_type, resource_id, org: options[:org], project: options[:project], format: options[:format].to_sym) do |res|
-                res.on_success { |resource| puts resource }
-                res.on_error { |err, result| warn_api_error("could not get", err, result) }
-              end
-            end
-          end
+          res.on_success { |resource_ids| resource_ids.each { |res_id| get(resource_type, res_id) } }
           res.on_error { |err, result| warn_api_error("could not get", err, result) }
         end
       end
@@ -83,11 +76,13 @@ module Xapixctl
       If applied on a project (i.e. organization and project are given), the given project is used.
 
       The given file should be in YAML format and can contain multiple resource definitions, each as it's own YAML document.
+      You can also provide a directory, in which case all files with yml/yaml extension will get loaded.
       You can also read from stdin by using '-'.
 
       Examples:
       \x5> $ xapixctl apply -o xapix -f get_a_list.yaml
       \x5> $ xapixctl apply -o xapix -p some-project -f get_a_list.yaml
+      \x5> $ xapixctl apply -o xapix -p some-project -f ./
 
       To copy over all data sources from one project to another:
       \x5> $ xapixctl get -o xapix-old -p some-project DataSource -f yaml | xapixctl apply -o xapix-new -f -
@@ -111,28 +106,27 @@ module Xapixctl
       \x5`xapixctl delete TYPE ID` will delete the resource by given TYPE and ID.
 
       The given file should be in YAML format and can contain multiple resource definitions, each as it's own YAML document.
+      You can also provide a directory, in which case all files with yml/yaml extension will get loaded.
       You can also read from stdin by using '-'.
 
       Examples:
       \x5> $ xapixctl delete -o xapix -p some-project -f get_a_list.yaml
+      \x5> $ xapixctl delete -o xapix -p some-project -f ./
       \x5> $ xapixctl delete -o xapix -p some-project DataSource get-a-list
       \x5> $ xapixctl delete -o xapix Project some-project
     LONGDESC
     def delete(resource_type = nil, resource_id = nil)
       if resource_type && resource_id
         connection.delete(resource_type, resource_id, org: options[:org], project: options[:project]) do |res|
-          res.on_success { puts 'DELETED' }
+          res.on_success { puts "DELETED #{resource_type} #{resource_id}" }
           res.on_error { |err, result| warn_api_error("could not delete", err, result) }
         end
       elsif options[:file]
         resources_from_file(options[:file]) do |desc|
-          type = desc['kind']
-          id = desc.dig('metadata', 'id')
-          puts "deleting #{type} #{id}"
-          connection.delete(type, id, org: options[:org], project: options[:project]) do |res|
-            res.on_success { puts "DELETED #{type} #{id}" }
-            res.on_error { |err, result| warn_api_error("could not delete", err, result); break }
-          end
+          res_type = desc['kind']
+          res_id = desc.dig('metadata', 'id')
+          puts "deleting #{res_type} #{res_id}"
+          delete(res_type, res_id)
         end
       else
         warn "need TYPE and ID or --file option"

data/lib/xapixctl/phoenix_client.rb

@@ -80,12 +80,13 @@ module Xapixctl
         DataSource
         Pipeline
         Service
+        ServiceInstall
         EndpointGroup
         Endpoint
         StreamGroup
         Stream
-        Scheduler
         StreamProcessor
+        Scheduler
         ApiPublishing
         ApiPublishingRole
       ].freeze

data/lib/xapixctl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xapixctl
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapixctl
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael Reinsch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport