knife-sharp 0.4.2 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f1a5548924fee079df802660b4e9a9d1980386db
+  data.tar.gz: c6f27200d24340b77a27570c95e73ee10c106d94
+SHA512:
+  metadata.gz: 556242f0e8727b7e9bdbe5384265b2f3f12fcef57756cf978ae5de787b8a1ff4cf69ebadab5fa737d918d5748da5935765a4bacbe3852e04f77de08cedaa6ca0
+  data.tar.gz: 16ac33df09b42e16d5796bf63e1d88a3093c67f48e5d75c2e9e7940c7afc64f8c310b635e385c280b3ab8c09e52a7b19b3d8be7e240364cc28e2f4f52239f6dc

data/README.md

@@ -233,6 +233,10 @@ License
 3 clauses BSD
 
 Authors
-======
+=======
 * Nicolas Szalay | https://github.com/rottenbytes
 * Jonathan Amiez | https://github.com/josqu4red
+
+Contributors
+============
+* Grégoire Doumergue

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

@@ -27,6 +27,8 @@ module KnifeSharp
       :default => false
 
     deps do
+      require 'chef/environment'
+      require 'chef/role'
       require 'chef/cookbook/metadata'
       require 'chef/cookbook_loader'
       require 'chef/cookbook_uploader'
@@ -136,7 +138,7 @@ module KnifeSharp
       ui.msg(ui.color("== Cookbooks ==", :bold))
 
       updated_versions = Hash.new
-      local_versions = Hash[Dir.glob("#{@cb_path}/*").map {|cb| [File.basename(cb), @loader[File.basename(cb)].version] }]
+      local_versions = Hash[Dir.glob("#{@cb_path}/*").select {|cb| File.directory?(cb)}.map {|cb| [File.basename(cb), @loader[File.basename(cb)].version] }]
       remote_versions = Chef::Environment.load(@environment).cookbook_versions.each_value {|v| v.gsub!("= ", "")}
 
       if local_versions.empty?
@@ -301,6 +303,7 @@ module KnifeSharp
       if !updated_dbs.empty?
         all = false
         updated_dbs.each do |name, obj|
+          answer = nil
           answer = ui.ask_question("> Update #{name.join("/")} data bag item on server ? Y/N/(A)ll/(Q)uit ", :default => "N").upcase unless all
 
           if answer == "A"
@@ -322,9 +325,20 @@ module KnifeSharp
     end
 
     def update_databags
+      parent_databags = Chef::DataBag.list.keys
       unless @databags.empty?
         @databags.each do |name, obj|
           begin
+            # create the parent if needed
+            unless parent_databags.include?(name.first)
+              db = Chef::DataBag.new
+              db.name(name.first)
+              db.create
+              # add it to the list to avoid trying to recreate it
+              parent_databags.push(name.first)
+              ui.msg("* Creating data bag #{name.first}")
+              log_action("creating data bag #{name.first}")
+            end
             db = Chef::DataBagItem.new
             db.data_bag(name.first)
             db.raw_data = obj
@@ -483,4 +497,5 @@ module KnifeSharp
       end
     end
   end
+
 end

data/lib/knife-sharp.rb

@@ -1,3 +1,3 @@
 module KnifeSharp
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-sharp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - Nicolas Szalay
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.14.0
   type: :runtime
   prerelease: false
   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:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 description: Sharpen your knife
@@ -54,34 +49,34 @@ extra_rdoc_files: []
 files:
 - README.md
 - ext/sharp-config.yml
-- lib/knife-sharp.rb
 - lib/chef/knife/sharp-align.rb
 - lib/chef/knife/sharp-backup.rb
 - lib/chef/knife/sharp-history.rb
-- lib/chef/knife/sharp-server.rb
 - lib/chef/knife/sharp-rollback.rb
+- lib/chef/knife/sharp-server.rb
+- lib/knife-sharp.rb
 homepage: https://github.com/Fotolia/knife-sharp
-licenses: []
+licenses:
+- 3-BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Knife sharp plugin
 test_files: []