knife-annex 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjYxZjc4ZjhhNzViZGZhZTA1YTc1MWZlNTFjMWU4ZDg4YjkyNTU2Nw==
+    MmNjZWJjMTUxNzA4ZWViMDk3MzhhMWJiZjg2MWFkMDVkNTk0ZmU4MQ==
   data.tar.gz: !binary |-
-    MWI2YjEyOTkwMGRjYTUzNWZiMDdjNzQ5OWExMWUzNzg3YmM3ZDk1Ng==
+    MGZmMzMwZjZiNzNiMWJhYTFkMGJlMzBjZTJhNGIzNDI2N2M2NTg1YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmE2OTNkZTY3MzY5ZTg0NGQ0NWY2YjE1ZmNiYmJjOGQ0NTllY2U5MzE0OTMx
-    ODJiYTZlZmIxOTlkY2MyZmZkMzQyYWRkMjUzZTY5MjM5NzNhOWEyZDg1MDQ3
-    NzUyN2ZiMDFiMGYxZDIyNzFjOTE4NThjOWFhM2NlNjM1OWNkODc=
+    NTJjYzViMTU4NjM5Y2NhNDViYWFlNmYzNDZkYWViNjAyMDFjNzgzOTI2Njhh
+    NDA1ZWQxM2ExZWVlMDllZjcyY2YxYzhiODZkOTAwY2M3MDM4NTBkOTYzZGYz
+    ZmQ2MTExNGM3YmQ2Y2QzMmYzNjVlNzQ5MjQ5NzA1MTE3OTllMWQ=
   data.tar.gz: !binary |-
-    M2M2NTQ3YzFiMmI0Njk5MTY0NjRiNTNlM2Q2YzhmZDI1ZGYwMGY4NGQ1MGVi
-    MjM4YzYyNDJhODFhYjk3ZTM3NzNmNDE5ZTcyNGYyNDgzZWNjNDc4NWQ0NTI3
-    MGIxNjA1OWEwNDAxY2NjY2VjZmQ0ZTFiYzI1NzA4NWRiYjhmMjQ=
+    N2MxMzJkZmVhNGJjZjljYzYyZmNkMDA2NzU1N2I5YzY2Y2U1NzY3MGM3Nzg3
+    OGQ1ODc2MTIyYjc3MjgyMTYxYjkzOWYxYjA2MTljMGNjN2VjZTJkYjEzM2U5
+    MGY4MDI4MzA1N2MzZGJjM2RkN2ZhMjEzOWU1YTM5Zjk5OGYyMDg=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 0.0.2
+ * Fix checkpresent hook
+ * Fix item ids
+ * Actually rotate keys
+
 ## 0.0.1
 
  * Initial release

data/lib/chef/knife/annex.rb

@@ -20,31 +20,39 @@ class Chef
       def admins
         @admins ||= Chef::User.list.
           keys.
-          select { |u| !IGNORE_USERS.include?(u) && Chef::User.load(u).admin }
+          select { |u| !IGNORE_USERS.include?(u) && Chef::User.load(u).admin }.
+          join(',')
       end
 
       def annex_key
-        ENV['ANNEX_KEY'].gsub(/[^[:alnum:]_\-]+/, '_')
+        ENV['ANNEX_KEY']
       end
 
       def annex_file
         ENV['ANNEX_FILE']
       end
 
+      def item_id
+        # We substitute characters invalid for data bag item id with
+        # underscore, and add "__i" to allow any file extension
+        # including ".keys" without confusing list for rekey.
+        @item_id ||= annex_key.gsub(/[^[:alnum:]_\-]+/, '_') << "__i"
+      end
+
       def run
         case ENV['ANNEX_ACTION']
         when 'store'
           begin
-            item = ChefVault::Item.load(DATA_BAG, annex_key)
+            item = ChefVault::Item.load(DATA_BAG, item_id)
           rescue ChefVault::Exceptions::KeysNotFound,
                  ChefVault::Exceptions::ItemNotFound
-            item = ChefVault::Item.new(DATA_BAG, annex_key)
+            item = ChefVault::Item.new(DATA_BAG, item_id)
           end
           item['data'] = File.read(annex_file)
-          item.admins(admins.join(','))
+          item.admins(admins)
           item.save
         when 'retrieve'
-          item = ChefVault::Item.load(DATA_BAG, annex_key)
+          item = ChefVault::Item.load(DATA_BAG, item_id)
           if annex_file
             File.write(annex_file, item['data'])
           else
@@ -52,24 +60,28 @@ class Chef
           end
         when 'remove'
           delete_object(ChefVault::Item, "#{vault}/#{item}", "chef_vault_item") do
-            ChefVault::Item.load(DATA_BAG, annex_key).destroy
+            ChefVault::Item.load(DATA_BAG, item_id).destroy
           end
         when 'checkpresent'
           begin
-            ChefVault::Item.load(DATA_BAG, annex_key)
+            ChefVault::Item.load(DATA_BAG, item_id)
           rescue ChefVault::Exceptions::KeysNotFound,
                  ChefVault::Exceptions::ItemNotFound
             # not found, we do nothing
           else
-            # found
+            # found, print original key
             puts annex_key
           end
         else
-          items = ( @name_args.empty? ?
-            Chef::DataBag.load(DATA_BAG).keys.reject { |k| k =~ /_keys$/ } :
+          item_ids = ( @name_args.empty? ?
+            Chef::DataBag.load(DATA_BAG).keys.grep(/__i$/) :
             @name_args )
           if config[:rotate_keys]
-            p rotate: items
+            item_ids.each do |item_id|
+              item = ChefVault::Item.load(DATA_BAG, item_id)
+              item.admins(admins)
+              item.rotate_keys!
+            end
           else
             puts "Use this command as git-annex hook"
           end

data/lib/knife-annex/version.rb

@@ -1,3 +1,3 @@
 module KnifeAnnex
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-annex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Maciej Pasternacki