chef-vault 1.0.0 → 1.0.1

data/lib/chef-vault/version.rb

@@ -1,4 +1,4 @@
 class ChefVault
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/chef/knife/DecryptCert.rb

@@ -3,9 +3,10 @@ require 'chef/knife'
 class DecryptCert < Chef::Knife
   deps do
     require 'chef/search/query'
-    require 'chef/shef/ext'
     require 'json'
+    require File.expand_path('../compat', __FILE__)
   end
+  include ChefVault::Compat
 
   banner "knife decrypt cert --name NAME"
 
@@ -19,7 +20,7 @@ class DecryptCert < Chef::Knife
       puts("You must supply a certificate to decrypt")
       exit 1
     end
-    Shef::Extensions.extend_context_object(self)
+    extend_context_object(self)
 
     data_bag = "certs"
     data_bag_path = "./data_bags/#{data_bag}"

data/lib/chef/knife/DecryptPassword.rb

@@ -3,9 +3,10 @@ require 'chef/knife'
 class DecryptPassword < Chef::Knife
   deps do
     require 'chef/search/query'
-    require 'chef/shef/ext'
     require 'json'
+    require File.expand_path('../compat', __FILE__)
   end
+  include ChefVault::Compat
 
   banner "knife decrypt password --username USERNAME"
 
@@ -19,7 +20,7 @@ class DecryptPassword < Chef::Knife
       puts("You must supply a username to decrypt")
       exit 1
     end
-    Shef::Extensions.extend_context_object(self)
+    extend_context_object(self)
 
     data_bag_path = "./data_bags/passwords"
 

data/lib/chef/knife/EncryptCert.rb

@@ -3,8 +3,9 @@ require 'chef/knife'
 class EncryptCert < Chef::Knife
   deps do
     require 'chef/search/query'
-    require 'chef/shef/ext'
+    require File.expand_path('../compat', __FILE__)
   end
+  include ChefVault::Compat
 
   banner "knife encrypt cert --search SEARCH --cert CERT --password PASSWORD --name NAME --admins ADMINS"
 
@@ -46,7 +47,7 @@ class EncryptCert < Chef::Knife
       puts("You must supply either -A or --admins")
       exit 1
     end
-    Shef::Extensions.extend_context_object(self)
+    extend_context_object(self)
 
     data_bag = "certs"
     data_bag_path = "./data_bags/#{data_bag}"

data/lib/chef/knife/EncryptPassword.rb

@@ -3,8 +3,9 @@ require 'chef/knife'
 class EncryptPassword < Chef::Knife
   deps do
     require 'chef/search/query'
-    require 'chef/shef/ext'
+    require File.expand_path('../compat', __FILE__)
   end
+  include ChefVault::Compat
 
   banner "knife encrypt password --search SEARCH --username USERNAME --password PASSWORD --admins ADMINS"
 
@@ -45,7 +46,8 @@ class EncryptPassword < Chef::Knife
       puts("You must supply either -A or --admins")
       exit 1
     end
-    Shef::Extensions.extend_context_object(self)
+  
+    extend_context_object(self)
 
     data_bag = "passwords"
     data_bag_path = "./data_bags/#{data_bag}"

data/lib/chef/knife/compat.rb

@@ -0,0 +1,16 @@
+# Make a wraper to chef10/11 "shef/shell" changes 
+
+module ChefVault
+  module Compat
+    require 'chef/version'
+    def extend_context_object(obj)
+      if Chef::VERSION.to_i >= 11 
+        require "chef/shell/ext"
+        Shell::Extensions.extend_context_object(obj)
+      else 
+        require 'chef/shef/ext'
+        Shef::Extensions.extend_context_object(obj)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-vault
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -45,6 +45,7 @@ files:
 - lib/chef/knife/DecryptPassword.rb
 - lib/chef/knife/EncryptCert.rb
 - lib/chef/knife/EncryptPassword.rb
+- lib/chef/knife/compat.rb
 homepage: 
 licenses: []
 post_install_message: