MuranoCLI 3.2.1.pre.beta.3 → 3.2.1.pre.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da25ca3b8f76c8441e11b57712ef6d7a536cf9c70a92e03822131e29dbaf4019
-  data.tar.gz: 68dfdbefe7259168d61e30009e305a79d505cc503ae94b86b982947724d0c588
+  metadata.gz: 7812fe5f8ac5180e3f818638e4586b70fab15a2007e64bd536c46d6fe741441a
+  data.tar.gz: 6e5f89324f7568fc559efbf72d598c17b28da66626e40004e7a1de670afd34c3
 SHA512:
-  metadata.gz: ccdbdbfa174682349eaef3f788d031fdc6f785ac4369cf798132dc6efdd0361c0dc61f5d3bf531d6775f2589630704c799bed9ecd9e38119e4f5ddd0fa7ed0db
-  data.tar.gz: 83e03633309260f8e50eb35b6641a48474f89f4aac27d5229b5ac1b549bf3f1a1fa0795d799c89cb38f0f1c5431162bb21828d21f64235fd69d5a72367602925
+  metadata.gz: b05b44d56e78ae1a5db9e8bb4a74833b203a29a52662e396df9cf26569e9e18d173201b97c28a4b3ff7b3e34d3f82045f84af6b61d456b8adc586ca9015b61d5
+  data.tar.gz: '020758ee1312fbbc66a966b11c8b7c69c0401b67a421c591c58a5771fbcdd0f8f881d2a097ac82987450a7a526290c5812f6e186090e1e996dee1d7849ab0ea7'

data/lib/MrMurano/Gateway.rb

@@ -128,17 +128,9 @@ module MrMurano
         # @return [String] The resource alias.
         attr_accessor :alias
 
-        def reject_ephemeral!
-          super.reject do |attr_key, _|
-            [
-              # Server-siders:
-              #  :format,
-              #  :unit,
-              #  :settable,
-              #  :allowed,
-              #  :alias,
-            ].include? attr_key
-          end
+        def reject_ephemeral
+          # All attrs exist on server, so nothing to remove.
+          super
         end
       end
 

data/lib/MrMurano/Solution-Services.rb

@@ -84,7 +84,7 @@ module MrMurano
       script = config_vars_decode(script)
 
       name = mkname(thereitem)
-      req_body = thereitem.to_h.merge(
+      req_body = thereitem.reject_ephemeral.to_h.merge(
         solution_id: @api_id,
         script: script,
         alias: mkalias(thereitem),
@@ -286,21 +286,23 @@ module MrMurano
 
   # What Murano calls "Modules". Snippets of Lua code.
   class Module < ServiceBase
-    # Module Specific details on an Item
+    # Module Specific details on an Item.
     class ModuleItem < Item
-      # @return [String] Internal Alias name
+      # @return [String] Internal Alias name.
       attr_accessor :alias
-      # @return [String] Timestamp when this was created.
+      # @return [String] Timestamp when this item was created.
       attr_accessor :created_at
       # @return [String] The application solution's ID.
       attr_accessor :solution_id
 
-      def reject_ephemeral!
+      def reject_ephemeral
         super.reject do |attr_key, _|
           [
-            :alias,
+            # Writeable platform properties:
+            #  :alias,
+            #  :solution_id,
+            # Read-only platform properties:
             :created_at,
-            :solution_id,
           ].include? attr_key
         end
       end
@@ -393,10 +395,12 @@ module MrMurano
   class EventHandler < ServiceBase
     # EventHandler Specific details on an Item
     class EventHandlerItem < Item
+      # Already part of Item:
+      #   :id
+      #   :name
+      #   :updated_at
       # @return [String] Internal Alias name
       attr_accessor :alias
-      # @return [String] Timestamp when this was updated.
-      attr_accessor :updated_at
       # @return [String] Timestamp when this was created.
       attr_accessor :created_at
       # @return [String] The soln's product.id or application.id (Murano's api_id).
@@ -418,19 +422,20 @@ module MrMurano
       # @return [Boolean] True if a service that should not be deleted remotely.
       attr_accessor :undeletable
 
-      def reject_ephemeral!
+      def reject_ephemeral
         super.reject do |attr_key, attr_val|
           [
-            # Server-siders:
+            # Writeable platform properties:
             #  :alias,
-            #  :service,
             #  :event,
+            #  :service,
+            #  :solution_id,
             #  :type,
-            :updated_at,
+            # Read-only platform properties:
             :created_at,
-            :solution_id,
-            :svc_alias,
+            # Local-only attrs:
             :phantom,
+            :svc_alias,
             :undeletable,
           ].include?(attr_key) || ((attr_key == :type) && (attr_val.nil?))
         end

data/lib/MrMurano/Solution-Users.rb

@@ -158,6 +158,7 @@ module MrMurano
       warning %(Updating Users is not yet implemented.)
       # post does work if the :password field is set.
       return unless upload_item_allowed(local)
+      # TODO: ...implement.
     end
 
     def synckey(item)

data/lib/MrMurano/SyncUpDown-Core.rb

@@ -60,19 +60,19 @@ module MrMurano
       end
       todel.select { |item| item[:phantom] }.each do |item|
         syncup_item(item, options, :delete, 'Clearing') do |aitem|
-          remove_or_clear(aitem[itemkey], aitem.reject_ephemeral!, true)
+          remove_or_clear(aitem[itemkey], aitem, true)
           num_synced += 1
         end
       end
       toadd.each do |item|
         syncup_item(item, options, :create, 'Adding') do |aitem|
-          upload(aitem[:local_path], aitem.reject_ephemeral!, false)
+          upload(aitem[:local_path], aitem, false)
           num_synced += 1
         end
       end
       tomod.each do |item|
         syncup_item(item, options, :update, 'Updating') do |aitem|
-          upload(aitem[:local_path], aitem.reject_ephemeral!, true)
+          upload(aitem[:local_path], aitem, true)
           num_synced += 1
         end
       end

data/lib/MrMurano/SyncUpDown-Item.rb

@@ -20,7 +20,8 @@ module MrMurano
       attr_accessor :name
       # @return [Pathname] Where this item lives.
       attr_accessor :local_path
-      # FIXME/EXPLAIN: ??? what is this?
+      # Read-only platform UUID, used to uniquely identify items.
+      # See also writable :alias property available on some items.
       attr_accessor :id
       # @return [String] The Lua code for this item. (not all items use this.)
       attr_accessor :script
@@ -156,23 +157,25 @@ module MrMurano
       end
 
       # Scrub local, non-BizAPI/Pegasus attrs from Item (before uploading).
-      def reject_ephemeral!
+      def reject_ephemeral
         reject do |attr_key, _|
           [
-            # Server-siders:
+            # Writeable platform properties:
             #  :name,
             #  :script,
-            :local_path,
+            # Read-only platform properties:
             :id,
+            :updated_at,
+            # Local-only attrs:
+            :diff,
+            :dup_count,
+            :header,
             :line_beg,
             :line_end,
-            :header,
-            :diff,
+            :local_path,
             :selected,
             :synckey,
             :synctype,
-            :updated_at,
-            :dup_count,
           ].include? attr_key
         end
       end

data/lib/MrMurano/Webservice-Endpoint.rb

@@ -29,15 +29,9 @@ module MrMurano
         # the server, so the code actually indirectly sees it in `def []=`.
         attr_accessor :use_basic_auth
 
-        def reject_ephemeral!
-          super.reject do |attr_key, _|
-            [
-              # Server-siders:
-              #  :method,
-              #  :path,
-              #  :content_type,
-            ].include? attr_key
-          end
+        def reject_ephemeral
+          # All attrs exist on server, so nothing to remove.
+          super
         end
       end
 
@@ -139,10 +133,11 @@ module MrMurano
           remote[:script] = script
         end
         limitkeys = [:method, :path, :script, :content_type, @itemkey]
-        remote = remote.to_h.select { |k, _v| limitkeys.include? k }
-        if remote.key? @itemkey
-          return unless upload_item_allowed(remote[@itemkey])
-          put('/' + remote[@itemkey], remote) do |request, http|
+        itemkey = remote[@itemkey]
+        remote = remote.reject_ephemeral.to_h.select { |k, _v| limitkeys.include? k }
+        if !itemkey.nil?
+          return unless upload_item_allowed(itemkey)
+          put('/' + itemkey, remote) do |request, http|
             response = http.request(request)
             case response
             when Net::HTTPSuccess
@@ -157,7 +152,6 @@ module MrMurano
           end
         else
           verbose "\tNo itemkey, creating"
-          #return unless upload_item_allowed(remote)
           return unless upload_item_allowed(local)
           post('', remote)
         end

data/lib/MrMurano/Webservice-File.rb

@@ -28,24 +28,26 @@ module MrMurano
         attr_accessor :path
         # @return [String] The MIME-Type for this content
         attr_accessor :mime_type
-        # @return [String] Checksum for the content.
+        # @return [String] Checksum for the content, returned on GET.
+        # EXPLAIN/2018-07-30: (lb): How does `checksum` relate to `md5`?
+        #   1. The asset service Swagger, at
+        #        pegasus_api/services/asset.yaml
+        #      suggests that `md5` is only returned on
+        #        GET /asset/{solution_id}/store/{path}:
+        #   2. The Gateway service Swagger, at
+        #        pegasus_api/services/webservice.yaml
+        #      suggest that `checksum` is a CORS object (a typo?) returned on
+        #        GET /{solution_id}/file
+        #   (lb): Which leaves me very confused.
         attr_accessor :checksum
-        # @return [String] MD5 checksum of the stored file. (Same as :checksum.)
+        # @return [String] MD5 checksum of the stored file. (See also :checksum.)
         attr_accessor :md5
         # @return [Integer] Size in bytes of the stored file.
         attr_accessor :size
 
-        def reject_ephemeral!
-          super.reject do |attr_key, _|
-            [
-              # Server-siders:
-              #  :path,
-              #  :mime_type,
-              :checksum,
-              :md5,
-              :size,
-            ].include? attr_key
-          end
+        def reject_ephemeral
+          # All attrs exist on server, so nothing to remove.
+          super
         end
       end
 

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.2.1.pre.beta.3'
+  VERSION = '3.2.1.pre.beta.4'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.beta.3
+  version: 3.2.1.pre.beta.4
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified