spiceweasel 2.6.0 → 2.8.0

data/lib/spiceweasel/clusters.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 #
-# Author:: Matt Ray (<matt@opscode.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
 #
-# Copyright:: 2012-2013, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2012-2014, Chef Software, Inc <legal@getchef.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,40 +18,43 @@
 #
 
 module Spiceweasel
+  # manages parsing of cluster files
   class Clusters
-
     attr_reader :create, :delete
 
-    def initialize(clusters, cookbooks, environments, roles, knifecommands)
-      @create = Array.new
-      @delete = Array.new
-      if clusters
-        Spiceweasel::Log.debug("clusters: #{clusters}")
-        clusters.each do |cluster|
-          cluster_name = cluster.keys.first
-          cluster_process_nodes(cluster, cluster_name, cookbooks, environments, roles, knifecommands)
-        end
+    def initialize(clusters, cookbooks, environments, roles, knifecommands, rootoptions)
+      @create = []
+      @delete = []
+      return unless clusters
+      Spiceweasel::Log.debug("clusters: #{clusters}")
+      clusters.each do |cluster|
+        cluster_name = cluster.keys.first
+        cluster_process_nodes(cluster, cluster_name, cookbooks, environments, roles, knifecommands, rootoptions)
       end
     end
 
     # configure the individual nodes within the cluster
-    def cluster_process_nodes(cluster, environment, cookbooks, environments, roles, knifecommands)
+    def cluster_process_nodes(cluster, environment, cookbooks, environments, roles, knifecommands, rootoptions)
       Spiceweasel::Log.debug("cluster::cluster_process_nodes '#{environment}' '#{cluster[environment]}'")
       cluster[environment].each do |node|
         node_name = node.keys.first
         options = node[node_name]['options'] || ''
         validate_environment(options, environment, environments) unless Spiceweasel::Config[:novalidation]
-        #push the Environment back on the options
+        # push the Environment back on the options
         node[node_name]['options'] = options + " -E #{environment}"
       end
       # let's reuse the Nodes logic
-      nodes = Spiceweasel::Nodes.new(cluster[environment], cookbooks, environments, roles, knifecommands)
+      nodes = Spiceweasel::Nodes.new(cluster[environment], cookbooks, environments, roles, knifecommands, rootoptions)
       @create.concat(nodes.create)
-      #what about providers??
+      # what about providers??
       nodes.delete.each do |del|
-        @delete << del unless del.to_s =~ /^knife client|^knife node/
+        @delete.push(del) unless del.to_s =~ /^knife client|^knife node/
+      end
+      if bundler?
+        @delete.push(Command.new("for N in $(bundle exec knife node list -E #{environment}); do bundle exec knife client delete $N -y; bundle exec knife node delete $N -y; done"))
+      else
+        @delete.push(Command.new("for N in $(knife node list -E #{environment}); do knife client delete $N -y; knife node delete $N -y; done"))
       end
-      @delete << "for N in $(knife node list -E #{environment}); do knife client delete $N -y; knife node delete $N -y; done"
     end
 
     def validate_environment(options, cluster, environments)
@@ -58,12 +62,16 @@ module Spiceweasel
         STDERR.puts "ERROR: Environment '#{cluster}' is listed in the cluster, but not specified as an 'environment' in the manifest."
         exit(-1)
       end
-      if options =~ /-E/ #Environment must match the cluster
-        env = options.split('-E')[1].split[0]
-        STDERR.puts "ERROR: Environment '#{env}' is specified for a node in cluster '#{cluster}'. The Environment is the cluster name."
-        exit(-1)
-      end
+
+      return unless options =~ /-E/ # Environment must match the cluster
+
+      env = options.split('-E')[1].split[0]
+      STDERR.puts "ERROR: Environment '#{env}' is specified for a node in cluster '#{cluster}'. The Environment is the cluster name."
+      exit(-1)
     end
 
+    def bundler?
+      ENV.key?('BUNDLE_BIN_PATH')
+    end
   end
 end

data/lib/spiceweasel/command.rb

@@ -1,15 +1,34 @@
+# encoding: UTF-8
+#
+# Author:: Matt Ray (<matt@getchef.com>)
+#
+# Copyright:: 2011-2014, Chef Software, Inc <legal@getchef.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Spiceweasel
+  # prepares shellout calls
   class Command
-
     attr_reader :allow_failure
     attr_reader :timeout
     attr_reader :command
-    
-    def initialize(command, options={})
+
+    def initialize(command, options = {})
       @command = command.rstrip
       @options = options
       @timeout = options['timeout']
-      @allow_failure = options.has_key?('allow_failure') ? options['allow_failure'] : true
+      @allow_failure = options.key?('allow_failure') ? options['allow_failure'] : true
     end
 
     def shellout_opts
@@ -20,6 +39,5 @@ module Spiceweasel
 
     alias_method :allow_failure?, :allow_failure
     alias_method :to_s, :command
-
   end
 end

data/lib/spiceweasel/command_helper.rb

@@ -1,15 +1,49 @@
+# encoding: UTF-8
+#
+# Author:: Matt Ray (<matt@getchef.com>)
+#
+# Copyright:: 2011-2014, Chef Software, Inc <legal@getchef.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'spiceweasel/command'
 
 module Spiceweasel
+  # helpers for create and delete commands
   module CommandHelper
     def create_command(*args)
       @create ||= []
-      @create.push(Command.new(*args))
+      if bundler?
+        args[0] = 'bundle exec ' + args[0]
+        @create.push(Command.new(*args))
+      else
+        @create.push(Command.new(*args))
+      end
     end
 
     def delete_command(*args)
       @delete ||= []
-      @delete.push(Command.new(*args))
+      if bundler?
+        args[0] = 'bundle exec ' + args[0]
+        @delete.push(Command.new(*args))
+      else
+        @delete.push(Command.new(*args))
+      end
+    end
+
+    def bundler?
+      ENV.key?('BUNDLE_BIN_PATH')
     end
   end
 end

data/lib/spiceweasel/config.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 #
-# Author:: Matt Ray (<matt@opscode.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
 #
-# Copyright:: 2012, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2012-2014, Chef Software, Inc <legal@getchef.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +20,7 @@
 require 'mixlib/config'
 
 module Spiceweasel
+  # provides defaults and manages the configuration via Mixlib::Config
   class Config
     extend Mixlib::Config
 
@@ -41,6 +43,5 @@ module Spiceweasel
     parallel false
     rebuild false
     siteinstall false
-
   end
 end

data/lib/spiceweasel/cookbooks.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 #
-# Author:: Matt Ray (<matt@opscode.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
 #
-# Copyright:: 2011-2012, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2011-2014, Chef Software, Inc <legal@getchef.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,73 +20,92 @@
 require 'chef/cookbook/metadata'
 
 module Spiceweasel
+  # manages parsing of Cookbooks
   class Cookbooks
-
     include CommandHelper
 
     attr_reader :cookbook_list, :create, :delete
 
-    def initialize(cookbooks = [], other_cookbook_list = {})
-      @create = Array.new
-      @delete = Array.new
+    def initialize(cookbooks = [], other_cookbook_list = {}) # rubocop:disable CyclomaticComplexity
+      @create = []
+      @delete = []
       @cookbook_list = other_cookbook_list
-      @dependencies = Array.new
-      #validate each of the cookbooks specified in the manifest
-      if cookbooks
-        @loader = Chef::CookbookLoader.new(Spiceweasel::Config[:cookbook_dir])
+      @dependencies = []
+
+      return unless cookbooks
+
+      # validate each of the cookbooks specified in the manifest
+      @loader = Chef::CookbookLoader.new(Spiceweasel::Config[:cookbook_dir])
+      begin
         @loader.load_cookbooks
-        Spiceweasel::Log.debug("cookbooks: #{cookbooks}")
+      rescue SyntaxError => e
+        STDERR.puts 'ERROR: invalid cookbook metadata.'
+        STDERR.puts e.message
+        exit(-1)
+      end
+      Spiceweasel::Log.debug("cookbooks: #{cookbooks}")
 
-        c_names = []
-        cookbooks.each do |cookbook|
-          name = cookbook.keys.first
-          if cookbook[name]
-            version = cookbook[name]['version']
-            options = cookbook[name]['options']
-          end
-          Spiceweasel::Log.debug("cookbook: #{name} #{version} #{options}")
-          if File.directory?("cookbooks")
+      validate_cookbooks(cookbooks)
+    end
 
-            if @loader.cookbooks_by_name[name]
-              validateMetadata(name,version) unless Spiceweasel::Config[:novalidation]
-            else
-              if Spiceweasel::Config[:siteinstall] #use knife cookbook site install
-                create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} site install #{name} #{version} #{options}")
-              else #use knife cookbook site download, untar and then remove the tarball
-                create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} site download #{name} #{version} --file cookbooks/#{name}.tgz #{options}")
-                create_command("tar -C cookbooks/ -xf cookbooks/#{name}.tgz")
-                create_command("rm -f cookbooks/#{name}.tgz")
-              end
-            end
-          elsif !Spiceweasel::Config[:novalidation]
-            STDERR.puts "ERROR: 'cookbooks' directory not found, unable to validate, download and load cookbooks"
-            exit(-1)
-          end
+    def validate_cookbooks(cookbooks)
+      c_names = []
+      cookbooks.each do |cookbook|
+        name = cookbook.keys.first
+        if cookbook[name]
+          version = cookbook[name]['version']
+          options = cookbook[name]['options']
+        end
+        Spiceweasel::Log.debug("cookbook: #{name} #{version} #{options}")
+
+        validate_metadata_or_get_knife_commands_wrapper(name, options, version)
 
-          if(options)
-            if !c_names.empty?
-              create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} upload #{c_names.join(' ')}")
-              c_names = []
-            end
-            create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} upload #{name} #{options}")
-          else
-            c_names.push(name)
+        if options
+          unless c_names.empty?
+            create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} upload #{c_names.join(' ')}")
+            c_names = []
           end
-          delete_command("knife cookbook#{Spiceweasel::Config[:knife_options]} delete #{name} #{version} -a -y")
-          @cookbook_list[name] = version #used for validation
+          create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} upload #{name} #{options}")
+        else
+          c_names.push(name)
         end
-        if !c_names.empty?
-          create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} upload #{c_names.join(' ')}")
+        delete_command("knife cookbook#{Spiceweasel::Config[:knife_options]} delete #{name} #{version} -a -y")
+        @cookbook_list[name] = version # used for validation
+      end
+      unless c_names.empty?
+        create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} upload #{c_names.join(' ')}")
+      end
+      validate_dependencies unless Spiceweasel::Config[:novalidation]
+    end
+
+    def validate_metadata_or_get_knife_commands_wrapper(name, options, version)
+      if File.directory?('cookbooks')
+        if @loader.cookbooks_by_name[name]
+          validate_metadata(name, version) unless Spiceweasel::Config[:novalidation]
+        else
+          get_knife_commands(name, options, version)
         end
-        validateDependencies() unless Spiceweasel::Config[:novalidation]
+      elsif !Spiceweasel::Config[:novalidation]
+        STDERR.puts "ERROR: 'cookbooks' directory not found, unable to validate, download and load cookbooks"
+        exit(-1)
       end
     end
 
-    #check the metadata for versions and gather deps
-    def validateMetadata(cookbook,version)
-      #check metadata.rb for requested version
+    def get_knife_commands(name, options, version)
+      if Spiceweasel::Config[:siteinstall] # use knife cookbook site install
+        create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} site install #{name} #{version} #{options}")
+      else # use knife cookbook site download, untar and then remove the tarball
+        create_command("knife cookbook#{Spiceweasel::Config[:knife_options]} site download #{name} #{version} --file cookbooks/#{name}.tgz #{options}")
+        create_command("tar -C cookbooks/ -xf cookbooks/#{name}.tgz")
+        create_command("rm -f cookbooks/#{name}.tgz")
+      end
+    end
+
+    # check the metadata for versions and gather deps
+    def validate_metadata(cookbook, version)
+      # check metadata.rb for requested version
       metadata = @loader.cookbooks_by_name[cookbook].metadata
-      Spiceweasel::Log.debug("validateMetadata: #{cookbook} #{metadata.name} #{metadata.version}")
+      Spiceweasel::Log.debug("validate_metadata: #{cookbook} #{metadata.name} #{metadata.version}")
       # Should the cookbook directory match the name in the metadata?
       if metadata.name.empty?
         Spiceweasel::Log.warn("No cookbook name in the #{cookbook} metadata.rb.")
@@ -103,11 +123,11 @@ module Spiceweasel
       end
     end
 
-    #compare the list of cookbook deps with those specified
-    def validateDependencies()
-      Spiceweasel::Log.debug("cookbook validateDependencies: '#{@dependencies}'")
+    # compare the list of cookbook deps with those specified
+    def validate_dependencies
+      Spiceweasel::Log.debug("cookbook validate_dependencies: '#{@dependencies}'")
       @dependencies.each do |dep|
-        if !member?(dep)
+        unless member?(dep)
           STDERR.puts "ERROR: Cookbook dependency '#{dep}' is missing from the list of cookbooks in the manifest."
           exit(-1)
         end
@@ -117,6 +137,5 @@ module Spiceweasel
     def member?(cookbook)
       cookbook_list.keys.include?(cookbook)
     end
-
   end
 end

data/lib/spiceweasel/data_bags.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 #
-# Author:: Matt Ray (<matt@opscode.com>)
+# Author:: Matt Ray (<matt@getchef.com>)
 #
-# Copyright:: 2011-2013, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2011-2014, Chef Software, Inc <legal@getchef.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,85 +17,120 @@
 # limitations under the License.
 #
 
-require 'yajl/json_gem'
+require 'ffi_yajl'
+
+require 'spiceweasel/command_helper'
 
 module Spiceweasel
+  # manages parsing of Data Bags
   class DataBags
-
     include CommandHelper
 
     attr_reader :create, :delete
 
-    def initialize(data_bags = [])
-      @create = Array.new
-      @delete = Array.new
-      if data_bags
-        Spiceweasel::Log.debug("data bags: #{data_bags}")
-        data_bags.each do |data_bag|
-          db = data_bag.keys.first
-          #check directories
-          if !File.directory?("data_bags") && !Spiceweasel::Config[:novalidation]
-            STDERR.puts "ERROR: 'data_bags' directory not found, unable to validate or load data bag items"
-            exit(-1)
-          end
-          if !File.directory?("data_bags/#{db}") && !Spiceweasel::Config[:novalidation]
-            STDERR.puts "ERROR: 'data_bags/#{db}' directory not found, unable to validate or load data bag items"
-            exit(-1)
-          end
-          create_command("knife data bag#{Spiceweasel::Config[:knife_options]} create #{db}")
-          delete_command("knife data bag#{Spiceweasel::Config[:knife_options]} delete #{db} -y")
-          if data_bag[db]
-            items = data_bag[db]['items']
-            secret = data_bag[db]['secret']
-            if secret && !File.exists?(File.expand_path(secret)) && !Spiceweasel::Config[:novalidation]
-              STDERR.puts "ERROR: secret key #{secret} not found, unable to load encrypted data bags for data bag #{db}."
-              exit(-1)
-            end
-          end
-          items = [] if items.nil?
-          Spiceweasel::Log.debug("data bag: #{db} #{secret} #{items}")
-          items.each do |item|
-            Spiceweasel::Log.debug("data bag #{db} item: #{item}")
-            if item =~ /\*/ #wildcard support, will fail if directory not present
-              files = Dir.glob("data_bags/#{db}/#{item}")
-              #remove anything not ending in .json
-              files.delete_if {|x| !x.end_with?('.json')}
-              items.concat(files.collect {|x| x["data_bags/#{db}/".length..-6]})
-              Spiceweasel::Log.debug("found files '#{files}' for data bag: #{db} with wildcard #{item}")
-              next
-            end
-            validateItem(db, item) unless Spiceweasel::Config[:novalidation]
-          end
-          items.delete_if {|x| x.include?("*")} #remove wildcards
-          items.sort!.uniq!
-          unless items.empty?
-            if secret
-              create_command("knife data bag#{Spiceweasel::Config[:knife_options]} from file #{db} #{items.join('.json ')}.json --secret-file #{secret}")
-            else
-              create_command("knife data bag#{Spiceweasel::Config[:knife_options]} from file #{db} #{items.join('.json ')}.json")
-            end
-          end
+    def initialize(data_bags = []) # rubocop:disable CyclomaticComplexity
+      @create = []
+      @delete = []
+
+      return unless data_bags
+
+      Spiceweasel::Log.debug("data bags: #{data_bags}")
+
+      data_bags.each do |data_bag|
+        db, items, secret = knife_data_bag_create_delete(data_bag)
+        items = invoke_validate_item(db, items, secret)
+
+        items.delete_if { |x| x.include?('*') } # remove wildcards
+
+        items.sort!.uniq!
+
+        data_bag_from_file(db, items, secret)
+      end
+    end
+
+    def data_bag_from_file(db, items, secret)
+      return if  items.empty?
+
+      if secret
+        create_command("knife data bag#{Spiceweasel::Config[:knife_options]} from file #{db} #{items.join('.json ')}.json --secret-file #{secret}")
+      else
+        create_command("knife data bag#{Spiceweasel::Config[:knife_options]} from file #{db} #{items.join('.json ')}.json")
+      end
+    end
+
+    def invoke_validate_item(db, items, secret)
+      items = [] if items.nil?
+      Spiceweasel::Log.debug("data bag: #{db} #{secret} #{items}")
+      items.each do |item|
+        Spiceweasel::Log.debug("data bag #{db} item: #{item}")
+        if item =~ /\*/ # wildcard support, will fail if directory not present
+          files = Dir.glob("data_bags/#{db}/#{item}")
+          # remove anything not ending in .json
+          files.delete_if { |x| !x.end_with?('.json') }
+          items.concat(files.map { |x| x["data_bags/#{db}/".length..-6] })
+          Spiceweasel::Log.debug("found files '#{files}' for data bag: #{db} with wildcard #{item}")
+          next
+        end
+        validate_item(db, item) unless Spiceweasel::Config[:novalidation]
+      end
+      items
+    end
+
+    def knife_data_bag_create_delete(data_bag)
+      db = data_bag.keys.first
+      # check directories
+      if !File.directory?('data_bags') && !Spiceweasel::Config[:novalidation]
+        STDERR.puts "ERROR: 'data_bags' directory not found, unable to validate or load data bag items"
+        exit(-1)
+      end
+
+      if !File.directory?("data_bags/#{db}") && !Spiceweasel::Config[:novalidation]
+        STDERR.puts "ERROR: 'data_bags/#{db}' directory not found, unable to validate or load data bag items"
+        exit(-1)
+      end
+
+      create_command("knife data bag#{Spiceweasel::Config[:knife_options]} create #{db}")
+      delete_command("knife data bag#{Spiceweasel::Config[:knife_options]} delete #{db} -y")
+
+      items, secret = identify_items_secret(data_bag, db)
+      return db, items, secret
+    end
+
+    def identify_items_secret(data_bag, db)
+      items = nil
+      secret = nil
+      if data_bag[db]
+        items = data_bag[db]['items']
+        secret = data_bag[db]['secret']
+        if secret && !File.exist?(File.expand_path(secret)) && !Spiceweasel::Config[:novalidation]
+          STDERR.puts "ERROR: secret key #{secret} not found, unable to load encrypted data bags for data bag #{db}."
+          exit(-1)
         end
       end
+      return items, secret
     end
 
-    #validate the item to be loaded
-    def validateItem(db, item)
-      if !File.exists?("data_bags/#{db}/#{item}.json")
+    # validate the item to be loaded
+    def validate_item(db, item)
+      unless File.exist?("data_bags/#{db}/#{item}.json")
         STDERR.puts "ERROR: data bag '#{db}' item '#{item}' file 'data_bags/#{db}/#{item}.json' does not exist"
         exit(-1)
       end
       f = File.read("data_bags/#{db}/#{item}.json")
-      itemfile = JSON.parse(f) #invalid JSON will throw a trace
-      #validate the id matches the file name
-      if item =~ /\// #pull out directories
-        item = item.split('/').last
-      end
-      if !item.eql?(itemfile['id'])
-        STDERR.puts "ERROR: data bag '#{db}' item '#{item}' listed in the manifest does not match the id '#{itemfile['id']}' within the 'data_bags/#{db}/#{item}.json' file."
+      begin
+        itemfile = JSON.parse(f)
+      rescue JSON::ParserError => e # invalid JSON
+        STDERR.puts "ERROR: data bag '#{db} item '#{item}' has JSON errors."
+        STDERR.puts e.message
         exit(-1)
       end
-    end
+      # validate the id matches the file name
+      item = item.split('/').last if item =~ /\// # pull out directories
 
+      return if item.eql?(itemfile['id'])
+
+      STDERR.puts "ERROR: data bag '#{db}' item '#{item}' listed in the manifest does not match the id '#{itemfile['id']}' within the 'data_bags/#{db}/#{item}.json' file."
+      exit(-1)
+    end
   end
 end