knife-sharp 0.3.0 → 0.4.0

data/ext/sharp-config.yml

@@ -1,19 +1,31 @@
 logging:
   enabled: true
   destination: "~/.chef/sharp.log"
+
 global:
+  # chef git repo root
   git_cookbook_path: "/home/nico/sysadmin/chef/"
+  # backup dir for knife sharp backup
   backupdir: "/home/nico/.chef/sharp/backups/"
+
+# Currently only hubot notifications supported
 notification:
   hubot:
     enabled: true
     url: "http://your.hubot.lan:18080/hubot/chef/bump/"
     channel: "foo"
     username: "Nicolas"
+    # don't notify if updates are done on development chef
     skip: [dev]
+
+# ignore cookbooks/data bags/roles depending on chef server
 # key is the name of your server (in a knife sharp server sense)
 sandboxnico:
-  ignore_cookbooks: [ "tests" ]
+  ignore_cookbooks: [ tests ]
+  ignore_databags: [ staff/admin, infrastructure/mail ]
+  ignore_roles: [ webserver ]
+
+# store modifications of each deploy, to allow rollback
 rollback:
   enabled: true
   destination: "/home/nico/.chef/sharp/rollbacks/"

data/lib/chef/knife/sharp-align.rb

@@ -282,6 +282,13 @@ module KnifeSharp
         end
       end
 
+      if @cfg[@chef_server] and @cfg[@chef_server].has_key?("ignore_databags")
+        (updated_dbs.keys.map{|k| k.join("/")} & @cfg[@chef_server]["ignore_databags"]).each do |db|
+          updated_dbs.delete(db.split("/"))
+          ui.msg "* Skipping #{db} data bag (ignore list)"
+        end
+      end
+
       if !updated_dbs.empty?
         all = false
         updated_dbs.each do |name, obj|
@@ -390,6 +397,13 @@ module KnifeSharp
         ui.msg("* #{role} role is not up-to-date (#{diffs.join(",")})") unless diffs.empty?
       end
 
+      if @cfg[@chef_server] and @cfg[@chef_server].has_key?("ignore_roles")
+        (updated_roles.keys & @cfg[@chef_server]["ignore_roles"]).each do |r|
+          updated_roles.delete(r)
+          ui.msg "* Skipping #{r} role (ignore list)"
+        end
+      end
+
       if !updated_roles.empty?
         all = false
         updated_roles.each do |name, obj|

data/lib/knife-sharp.rb

@@ -1,3 +1,3 @@
 module KnifeSharp
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,66 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-sharp
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Nicolas Szalay
 - Jonathan Amiez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 119
-        segments: 
-        - 10
-        - 14
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 10.14.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: grit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.14.0
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: Sharpen your knife
-email: 
+email:
 - nico@rottenbytes.info
 - jonathan.amiez@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - ext/sharp-config.yml
 - lib/knife-sharp.rb
@@ -71,36 +62,26 @@ files:
 - lib/chef/knife/sharp-rollback.rb
 homepage: https://github.com/Fotolia/knife-sharp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Knife sharp plugin
 test_files: []
-