doggy 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae47149af8df1d2a4f5e977b85ec4659b396c524
-  data.tar.gz: 4ba1dffaf222c19e4c6a6f6f64c75643d9bb4924
+  metadata.gz: cf029d6c55560584ae887c90bb30d74c330e028b
+  data.tar.gz: c3e318a4c4ef35243fbc5e95f163e896b81b7cc3
 SHA512:
-  metadata.gz: 256336173e7b014f436b936a57eca85b9d73f9eae3dbab1a8cd73cb41b6617dc89ff4b0ee6499329270b862213816b5019be9857b57f6d2f1f056262ecaadd3f
-  data.tar.gz: 16d53a9d77766dcc441f49cf2ee8b12ee9636fed3cf155f54eb4576eb1cc624385fa20072deeff91fa8ff23a2eb26763c6e8a9d1be148f30bb4e177350cf6dc4
+  metadata.gz: d8413005760d002bbb137e09ba19b1907ac0ed778873c680d6ca2f1e659bd621a36fada78843a837da862e207ba369d5a48779f4ee117b7dc30db40f2ee91825
+  data.tar.gz: 7df10df686ff27ec591e6dd5acfe405d701c4f36fbcf3b3ef1c3c5f3e70021feb4fc015713bf2ae6321de668f8e23f426b817912558bf42bcb4aae2408ab6d4d

data/lib/doggy/model/dash.rb

@@ -1,7 +1,7 @@
 module Doggy
   class Dash
     def self.upload_all
-      objects = all_local_items.find_all { |(type, id), object| type == 'dash' }
+      objects = Doggy.all_local_items.find_all { |(type, id), object| type == 'dash' }
       puts "Uploading #{objects.size} dashboards"
       upload(objects.map { |(type, id), object| id })
     rescue => e

data/lib/doggy/model/monitor.rb

@@ -1,7 +1,7 @@
 module Doggy
   class Monitor
     def self.upload_all
-      objects = all_local_items.find_all { |(type, id), object| type == 'monitor' }
+      objects = Doggy.all_local_items.find_all { |(type, id), object| type == 'monitor' }
       puts "Uploading #{objects.size} monitors"
       upload(objects.map { |(type, id), object| id })
     rescue => e
@@ -88,6 +88,8 @@ module Doggy
     end
 
     def push
+      @name ||= raw_local['name']
+
       return if @name =~ Doggy::DOG_SKIP_REGEX
       return unless Doggy.determine_type(raw_local) == 'monitor'
 
@@ -132,7 +134,7 @@ module Doggy
     end
 
     def mute_state_for(id)
-      if remote_state = Doggy.all_remote_monitors.detect { |key, value| key == [ 'monitor', id.to_i ] }
+      if remote_state = Doggy.all_local_items.detect { |key, value| key == [ 'monitor', id.to_i ] }
         remote_state[1]['options']['silenced'] if remote_state[1]['options']
       end
     end

data/lib/doggy/model/screen.rb

@@ -1,7 +1,7 @@
 module Doggy
   class Screen
     def self.upload_all
-      objects = all_local_items.find_all { |(type, id), object| type == 'screen' }
+      objects = Doggy.all_local_items.find_all { |(type, id), object| type == 'screen' }
       puts "Uploading #{objects.size} screens"
       upload(objects.map { |(type, id), object| id })
     rescue => e

data/lib/doggy/shared_helpers.rb

@@ -32,5 +32,32 @@ module Doggy
       puts
       line == "Y"
     end
+
+    def self.error(msg)
+      puts "[ERROR] #{ msg }"
+    end
+
+    def self.find_root
+      File.dirname(find_file("Gemfile"))
+    end
+
+    def self.find_file(*names)
+      search_up(*names) do |filename|
+        return filename if File.file?(filename)
+      end
+    end
+
+    def self.search_up(*names)
+      previous = nil
+      current  = File.expand_path(Pathname.pwd)
+
+      until !File.directory?(current) || current == previous
+        names.each do |name|
+          filename = File.join(current, name)
+          yield filename
+        end
+        current, previous = File.expand_path("..", current), current
+      end
+    end
   end
 end

data/lib/doggy/version.rb

@@ -1,3 +1,3 @@
 module Doggy
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/lib/doggy.rb

@@ -35,7 +35,7 @@ module Doggy
     end
 
     def objects_path
-      @objects_path ||= Pathname.new('objects').expand_path(Dir.pwd).expand_path.tap { |path| FileUtils.mkdir_p(path) }
+      @objects_path ||= Pathname.new('objects').expand_path(SharedHelpers.find_root).expand_path.tap { |path| FileUtils.mkdir_p(path) }
     end
 
     def load_item(f)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Vlad Gorodetsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler