guard-knife 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,3 +1,6 @@
+0.1.2
+- unbreak data bag handling, from Alan Harper
+
 0.1.1
 - only upload each cookbook once, even if multiple files change
 - better title for notifications

data/README.md

@@ -4,14 +4,15 @@ Guard::Knife
 Knife guard allows to update cookbooks, data bags, environments, and roles
 automatically when files are modified.
 
-It differs from Guard::Chef in that it does not depend on activesupport and
-it uses knife directly instead of relying on some rake tasks being around.
+It differs from [Guard::Chef][guard-chef-repo] in that it does not depend on
+activesupport and it uses knife directly instead of relying on some rake tasks
+being around.
 
 Install
 -------
 
 Please be sure to have [Guard](https://github.com/guard/guard) installed before
-continueing.
+continuing.
 
 Install the gem:
 
@@ -64,3 +65,5 @@ Author
 ------
 
 [Nikolay Sturm](http://blog.nistu.de/)
+
+[guard-chef-repo]: https://github.com/dreamr/guard-chef#readme

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.1'
-  s.date              = '2012-03-18'
+  s.version           = '0.1.2'
+  s.date              = '2012-05-17'
   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.1'
+    VERSION = '0.1.2'
 
     # Initialize a Guard.
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
@@ -64,10 +64,9 @@ module Guard
     def upload(path)
       if path.match(/^cookbooks\/([^\/]*)/)
         upload_cookbook($1)
-      elsif path.match(/^data_bags\/(.*)\/(.*).json$/)
+      elsif path.match(/^data_bags\/(.*)\/.*\.json$/)
         data_bag = $1
-        item = $2
-        upload_databag(data_bag, item)
+        upload_databag(data_bag, path)
       elsif path.match(/^(environments\/.*\.rb)$/)
         upload_environment($1)
       elsif path.match(/^(roles\/.*.rb)$/)
@@ -95,11 +94,12 @@ module Guard
       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", :title => 'Knife')
+    def upload_databag(data_bag, path)
+      item = File.basename path, '.json'
+      if system("knife data bag from file #{data_bag} #{path} #{knife_options}")
+        ::Guard::Notifier.notify("Data bag item #{data_bag}::#{item} uploaded", :title => 'Knife')
       else
-        ::Guard::Notifier.notify("Data bag #{data_bag} failed to upload", :title => 'Knife', :image => :failed)
+        ::Guard::Notifier.notify("Data bag item #{data_bag}::#{item} failed to upload", :title => 'Knife', :image => :failed)
       end
     end
 

metadata

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