doggy 2.0.15 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a5d235c5e0d8ef358ef0fb74e8fdff03f5ea01
-  data.tar.gz: 3783e29d01e4dcdd5c4b7a5b4333ddb3d40c6886
+  metadata.gz: bb97cb24320519a7bba30b15a873051f5948728c
+  data.tar.gz: 327e1a6e44d4fcec59eccca3ad057587a6000604
 SHA512:
-  metadata.gz: 5b37a7aa0cf6f8598d7c18ac550ab9271fc85a4753fd1a160dd7f461c4adbbf3c0b265d70c8bbb8d10cc0773108c96477fefb7cc631705ee9a5502903fa2a7d1
-  data.tar.gz: 5e872fc853661cc5b9c3e4a33bb23c8ab4c41952ca376ed780a16c78c24d34c12c7208accfbe8276103e092d3807324b3a1fcb1ddafe549f2f09034f2940205f
+  metadata.gz: 07b2acceb8064210cb05db56b6544155a2228f7d2bc679dcbd6c773346dc436e91ad93c2400ffa344db0ab4c59ee4d9c395b93e547f29e90ccbf1bb1916e2e71
+  data.tar.gz: f0beada455921ce51d6b4b5a387654bcf352edef0b0810988a88b91428aebc08584340f1ffa13cafedb20b8a100698bb4f3fb08946a7cbd8d5d276dfad6d87b7

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doggy (2.0.15)
+    doggy (2.0.16)
       json (~> 1.8.3)
       parallel (~> 1.6.1)
       rugged (~> 0.23.2)

data/doggy.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '~> 2.0'
 
   spec.add_dependency "json",     "~> 1.8.3"
   spec.add_dependency "parallel", "~> 1.6.1"

data/lib/doggy/cli.rb

@@ -18,7 +18,7 @@ module Doggy
     method_option "all",        type: :boolean, desc: 'Pull everything', aliases: '-a'
 
     def pull(*ids)
-      CLI::Pull.new(ids: ids, options: options.dup).run
+      CLI::Pull.new(options.dup, ids).run
     end
 
     desc "push", "Pushes objects to Datadog"

data/lib/doggy/cli/edit.rb

@@ -48,6 +48,14 @@ module Doggy
       if @param =~ /^[0-9]+$/ then
         id = @param.to_i
         return resources.find { |res| res.id == id }
+      elsif @param =~ /^http/ then
+        id = case @param
+          when /com\/dash/     then Integer(@param[/dash\/(\d+)/i, 1])
+          when /com\/screen/   then Integer(@param[/screen\/(\d+)/i, 1])
+          when /com\/monitors/ then Integer(@param[/monitors#(\d+)/i, 1])
+          else raise StandardError.new('Unknown resource type, cannot edit.')
+          end
+        return resources.find { |res| res.id == id }
       else
         full_path = File.expand_path(@param, Doggy.object_root)
         return resources.find { |res| res.path == full_path }

data/lib/doggy/cli/pull.rb

@@ -2,9 +2,9 @@
 
 module Doggy
   class CLI::Pull
-    def initialize(ids:, options:)
-      @ids = ids
-      @options = options
+    def initialize(options, ids)
+      @options                = options
+      @ids                    = ids
       @updated_by_last_action = false
     end
 

data/lib/doggy/model.rb

@@ -138,12 +138,22 @@ module Doggy
         }.to_json)
       end
 
+      def sort_by_key(hash, &block)
+        hash.keys.sort(&block).reduce({}) do |seed, key|
+          seed[key] = hash[key]
+          if seed[key].is_a?(Hash)
+            seed[key] = Doggy::Model.sort_by_key(seed[key], &block)
+          end
+          seed
+        end
+      end
+
       protected
 
       def resource_url(id = nil)
         raise NotImplementedError, "#resource_url has to be implemented."
       end
-    end
+    end # class << self
 
     def initialize(attributes = nil)
       root_key = self.class.root
@@ -160,6 +170,10 @@ module Doggy
       File.open(@path, 'w') { |f| f.write(JSON.pretty_generate(to_h)) }
     end
 
+    def to_h
+      Doggy::Model.sort_by_key(super)
+    end
+
     def save
       ensure_managed_emoji!
 

data/lib/doggy/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Doggy
-  VERSION = "2.0.15"
+  VERSION = "2.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.17
 platform: ruby
 authors:
 - Vlad Gorodetsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="