guard-knife 0.1.0 → 0.1.1

data/ChangeLog

@@ -1,3 +1,7 @@
+0.1.1
+- only upload each cookbook once, even if multiple files change
+- better title for notifications
+
 0.1.0
 - introduce notifications, from Alan Harper
 

data/guard-knife.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'guard-knife'
-  s.version           = '0.1.0'
-  s.date              = '2012-03-16'
+  s.version           = '0.1.1'
+  s.date              = '2012-03-18'
   s.rubyforge_project = ''
 
   s.summary     = "Guard for Chef using knife"

data/lib/guard/knife.rb

@@ -3,7 +3,7 @@ require 'guard/guard'
 
 module Guard
   class Knife < Guard
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 
     # Initialize a Guard.
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
@@ -39,9 +39,8 @@ module Guard
     # @param [Array<String>] paths the changes files or paths
     # @raise [:task_has_failed] when run_on_change has failed
     def run_on_change(paths)
+      paths = normalize(paths)
       paths.each do |path|
-        next if path.match(/\.swp$/)  # vim swap file
-
         upload(path)
       end
     end
@@ -52,10 +51,20 @@ module Guard
     def run_on_deletion(paths)
     end
 
+    def normalize(paths)
+      paths.map! do |path|
+        next if path.match(/\.swp$/)  # vim swap file
+
+        # only upload cookbook once in case many files change
+        path.gsub(/^(cookbooks\/[^\/]*)\/.*$/, '\1')
+      end
+      paths.compact.uniq
+    end
+
     def upload(path)
-      if path.match(/^cookbooks\/([^\/]*)\//)
+      if path.match(/^cookbooks\/([^\/]*)/)
         upload_cookbook($1)
-      elsif path.match(/^data_bags\/(.*)\/(.*)$/)
+      elsif path.match(/^data_bags\/(.*)\/(.*).json$/)
         data_bag = $1
         item = $2
         upload_databag(data_bag, item)
@@ -80,33 +89,33 @@ module Guard
 
     def upload_cookbook(cookbook)
       if system("knife cookbook upload #{cookbook} #{knife_options}")
-        ::Guard::Notifier.notify("Cookbook #{cookbook} uploaded")
+        ::Guard::Notifier.notify("Cookbook #{cookbook} uploaded", :title => 'Knife')
       else
-        ::Guard::Notifier.notify("Cookbook #{cookbook} failed to upload", :image => :failed)
+        ::Guard::Notifier.notify("Cookbook #{cookbook} failed to upload", :title => 'Knife', :image => :failed)
       end
     end
 
     def upload_databag(data_bag, item)
       if system("knife data bag from file #{data_bag} #{item} #{knife_options}")
-        ::Guard::Notifier.notify("Data bag #{data_bag} upload")
+        ::Guard::Notifier.notify("Data bag #{data_bag} upload", :title => 'Knife')
       else
-        ::Guard::Notifier.notify("Data bag #{data_bag} failed to upload", :image => :failed)
+        ::Guard::Notifier.notify("Data bag #{data_bag} failed to upload", :title => 'Knife', :image => :failed)
       end
     end
 
     def upload_environment(environment)
       if system("knife environment from file #{environment} #{knife_options}")
-        ::Guard::Notifier.notify("Environment #{environment} uploaded")
+        ::Guard::Notifier.notify("Environment #{environment} uploaded", :title => 'Knife')
       else
-        ::Guard::Notifier.notify("Environment #{environment} failed to upload", :image => :failed)
+        ::Guard::Notifier.notify("Environment #{environment} failed to upload", :title => 'Knife', :image => :failed)
       end
     end
 
     def upload_role(role)
       if system("knife role from file #{role} #{knife_options}")
-        ::Guard::Notifier.notify("Role #{role} uploaded")
+        ::Guard::Notifier.notify("Role #{role} uploaded", :title => 'Knife')
       else
-        ::Guard::Notifier.notify("Role #{role} upload failed", :image => :failed)
+        ::Guard::Notifier.notify("Role #{role} upload failed", :title => 'Knife', :image => :failed)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-knife
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &8503000 !ruby/object:Gem::Requirement
+  requirement: &14436540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8503000
+  version_requirements: *14436540
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &8502140 !ruby/object:Gem::Requirement
+  requirement: &14435980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *8502140
+  version_requirements: *14435980
 description: Guard for Chef using knife to upload files
 email: github@erisiandiscord.de
 executables: []
@@ -69,8 +69,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 2
 summary: Guard for Chef using knife
 test_files: []
+has_rdoc: