sfrest 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d57d6198ba83bf3677c3821c165785970eb76900e7fa551f6254b5e3e8c1ae
-  data.tar.gz: e7d0e0b759510dda5c05a11e5fd52736895d8ccde760b61adf948a97a43290e2
+  metadata.gz: '09110b9e469ba6a0f45ad9b28828acb55d46b5809b80283a722c626f2374b81e'
+  data.tar.gz: 4ab3d5fefe519216e45a6fa175d44b3f1d6f0d978ec2ec3e7475ca6da59f182b
 SHA512:
-  metadata.gz: d7139a0cd1c942c760f71000cdd14a56fd782c285bdbdaf07510510f8d9d45d49b7bfaefb0fa3aebcf24c083e60260311d980b1a71a44361e428c7d2d3cf5ccd
-  data.tar.gz: 33e9836ef34538be4327cb613a7fced426675de41056fa1ecea69f87a8a08b3eee8f62039a4e065deb87bb731a8125914a66c6e0cddf322f55cbcdb4bd38e96c
+  metadata.gz: ba5deeabee76e8d7e871a0f4fd025b994ae0117093e5fa5359133531440282a9ea7cd615413b1981f1d0d74d706ced48c5615f1b117177ecfa5213cea5f46f4b
+  data.tar.gz: 8a26d194101fcfa0628f314140a04190231f4a0236531cf58b96bc8fdcc761a69717f635a514cd2c32432d8fd4ba7943e50cb4487e6faac21965a3341207578a

data/lib/sfrest/error.rb

@@ -26,7 +26,6 @@ module SFRest
   # If the return cannot be parsed into something useful
   class InvalidResponse < SFRest::SFError; end
 
-  # If you call an unsuported version
-  #
+  # If you call an unsupported version
   class InvalidApiVersion < SFRest::SFError; end
 end

data/lib/sfrest/update.rb

@@ -30,6 +30,9 @@ module SFRest
 
     # Starts an update.
     def start_update(ref)
+      if update_version == 'v2'
+        raise InvalidApiVersion, 'There is more than one codebase use sfrest.update.update directly.'
+      end
       update_data = { scope: 'sites', sites_type: 'code, db', sites_ref: ref }
       update(update_data)
     end
@@ -44,11 +47,19 @@ module SFRest
     # This method does not filter or validate so that it can be used for
     # negative cases. (missing data)
     def update(datum)
-      current_path = '/api/v1/update'
+      validate_request datum
+      current_path = "/api/#{update_version}/update"
       payload = datum.to_json
       @conn.post(current_path, payload)
     end
 
+    def validate_request(datum)
+      v1_keys = %i[scope sites_ref factory_ref sites_type factory_type db_update_arguments]
+      v2_keys = %i[sites factory]
+      key_overlap = binding.local_variable_get("#{update_version}_keys") & datum.keys
+      raise InvalidDataError, "An invalid stucture was passed to the #{update_version} endpoint" if key_overlap.empty?
+    end
+
     # Gets the list of updates.
     def update_list
       current_path = '/api/v1/update'
@@ -74,5 +85,10 @@ module SFRest
       payload = { 'pause' => false }.to_json
       @conn.post(current_path, payload)
     end
+
+    # Determines the api version to use for updates.
+    def update_version
+      @conn.codebase.list['stacks'].size > 1 ? 'v2' : 'v1'
+    end
   end
 end

data/lib/sfrest/version.rb

@@ -1,4 +1,4 @@
 module SFRest
   # Just tracks the version of sfrest.
-  VERSION = '0.0.19'.freeze
+  VERSION = '0.0.20'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfrest
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - ACSF Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon