doggy 2.0.38 → 2.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957f7b3de058a28033615d38adc4cde2592e74c6
-  data.tar.gz: dc8100cfa99575c54904087b55eb01ac97a46d6e
+  metadata.gz: 3e04c1e4612bdfa22169dc85914ce496b940a72e
+  data.tar.gz: 9588342799f7ef5033f9720456b7e756a913cb6b
 SHA512:
-  metadata.gz: 6818fabbc4c59ed124504fed8bade0f29c20d11be312640fc04a7a3448bab6cac5de05e54074c1463d6e15afe3e62bba09f16488cc27fc70f902ad9d9eb21438
-  data.tar.gz: f95498183a511ec8cc023426ef8273b1d336a3894b445346a1f2de10775e7be1381daa71e3bf3fc5dd21a0e202c4c48fff30dc84a2d4dd0d0068e512e153e4d6
+  metadata.gz: 35838ed57e26c6cb0e0f9d20f50503a1247197d48680c5d9db8c467abc13ae13a70f4dd7c0c1f859f91d57e99736a6d370b98baa8d38bdca14f7e88c21ed76b8
+  data.tar.gz: 00e55e4ee1f7d3f9c621db78eeec3440f76ae40da3db054b32e70f01a516769269c25624b4ce7e3f2ca5ebb08d1329122b74e945026c8b7d7f73405860ddeabb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doggy (2.0.37)
+    doggy (2.0.39)
       activesupport (~> 4)
       json (~> 1.8.3)
       parallel (~> 1.6.1)
@@ -12,9 +12,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -32,9 +31,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.11)
     hashdiff (0.2.3)
-    i18n (0.7.0)
+    i18n (0.8.1)
     ice_nine (0.11.2)
-    json (1.8.3)
+    json (1.8.6)
     metaclass (0.0.4)
     minitest (5.9.0)
     mocha (1.1.0)
@@ -45,7 +44,7 @@ GEM
     rugged (0.23.3)
     safe_yaml (1.0.4)
     thor (0.19.4)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     virtus (1.0.5)
@@ -70,4 +69,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/lib/doggy/cli/push.rb

@@ -3,8 +3,8 @@
 module Doggy
   class CLI::Push
     WARNING_MESSAGE = "You are about to force push all the objects. "\
-      "This will override changes in Datadog if they have not been sycned to the dog repository. "\
-      "Do you want to proceed?(Y/N)"
+      "This will override changes in Datadog if they have not been synced to the dog repository. "\
+      "Do you want to proceed? (Y/N)"
 
     def sync_changes
       changed_resources = Doggy::Model.changed_resources

data/lib/doggy/model.rb

@@ -23,7 +23,7 @@ module Doggy
       attr_accessor :root
 
       def find(id)
-        attributes = request(:get, resource_url(id))
+        attributes = request(:get, resource_url(id), nil, [404])
         return if attributes['errors']
         resource   = new(attributes)
 
@@ -89,7 +89,7 @@ module Doggy
         return Models::Screen    if has_key.call('board_title')
       end
 
-      def request(method, url, body = nil)
+      def request(method, url, body = nil, accepted_errors = nil)
         uri = URI(url)
 
         if uri.query
@@ -112,10 +112,20 @@ module Doggy
         request.body = body if body
 
         response = http.request(request)
-        unless response.code =~ /\A[23][0-9]{2}\Z/
-          raise DoggyError, "Unexpected response code #{response.code} for #{url}."
+        parsed_response = response.body ? JSON.parse(response.body) : nil
+
+        unless accepted_response(response.code.to_i, accepted_errors)
+          raise DoggyError, "Unexpected response code #{response.code} for #{url}, body: #{parsed_response.to_s}"
+        end
+        parsed_response
+      end
+
+      def accepted_response(code, accepted_errors = nil)
+        if (accepted_errors != nil) && (accepted_errors.include? code)
+          true
+        else
+          code >= 200 && code < 400
         end
-        response.body ? JSON.parse(response.body) : nil
       end
 
       def current_sha

data/lib/doggy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Doggy
-  VERSION = '2.0.38'
+  VERSION = '2.0.39'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.38
+  version: 2.0.39
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json