motherbrain 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a478e99e516d43785867b8e067d0dc47ea676c
-  data.tar.gz: 3b13b3e672777cc022ab3ffa2a7d789fb066b36e
+  metadata.gz: 45f24209faef88c327c3979ebdf59cdc961bf530
+  data.tar.gz: 49f3bbdb3c81b052aa3a1eddfdc1256427818653
 SHA512:
-  metadata.gz: 8357c35313e3402ca32181ff777f9498c387306545d5d1619267127b0481b479b228243d48051648d4ffeece01c46c5c70c24d8bc4e8c6642483c1b9ecce217b
-  data.tar.gz: 672b31a6fb744bdca06e4a235f7a8c6594d1bb0db29dfa515981721f40a19c44d8b7ed4bdd9d73ea0f8cfbcbc543d6e41284b613cd140357b4d1bb97ba351351
+  metadata.gz: e50ad349193026c2bd4c221e6ec3e9a78729c6dc1304bfe130a6f0be20d2011d3f480f708926a3cb73410790e833b98b9da2aec831d881948ab1ad3d23273145
+  data.tar.gz: e32e2999bbfb6157237bfffd0a3fc1320f0bd1ce4164ee35960fd6c0b3046ceb77b490d538f31e53aa2d5fbf5638227d297fa98a46d2b803f47f4179d14ec466

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.14.5
+
+* Use run_list instead of roles/recipes
+
+# 0.14.4
+
+* Use newer ridley-connectors
+* Profiling options
+* Issue #665 - Use cookbook versions found Berksfile.lock if found
+
 # 0.13.1
 
 * Depend on faraday < 0.9

data/Gemfile

@@ -22,7 +22,7 @@ group :development do
   gem 'ronn', platforms: :ruby
   gem 'chef-zero', '~> 1.5.0'
   gem 'pry-nav'
-  gem 'ruby-prof'
+  gem 'ruby-prof', platforms: :ruby
 end
 
 group :test do

data/lib/mb/berkshelf.rb

@@ -46,5 +46,36 @@ module MotherBrain
         Pathname.new(Application.config.berkshelf.path || default_path)
       end
     end
+
+    # A wrapper around the berkshelf's Berkshelf::Lockfile
+    class Lockfile
+      include MB::Logging
+
+      BERKSFILE_LOCK = 'Berksfile.lock'.freeze
+
+      class << self
+        def from_path(root_path)
+          new(File.join(root_path, BERKSFILE_LOCK))
+        end
+      end
+
+      attr_reader :berksfile_lock
+
+      def initialize(berksfile_lock_path)
+        @berksfile_lock = ::Berkshelf::Lockfile.from_file(berksfile_lock_path)
+      end
+
+      # Return a hash of all of the cookbook versions found in the Berksfile.lock
+      # The key is the name of the cookbook and the value is the version as a
+      # String. If there is no lockfile an empty hash is returned.
+      #
+      # @return [Hash]
+      def locked_versions
+        berksfile_lock.graph.locks.inject({}) do |hash, (name, dependency)|
+          hash[name] = dependency.locked_version.to_s
+          hash
+        end
+      end
+    end
   end
 end

data/lib/mb/bootstrap/manager.rb

@@ -76,7 +76,6 @@ module MotherBrain
       # @see {#async_bootstrap} for options
       def bootstrap(job, environment, manifest, plugin, options = {})
         options = options.reverse_merge(
-          cookbook_versions: Hash.new,
           component_versions: Hash.new,
           environment_attributes: Hash.new,
           hints: Hash.new,
@@ -104,9 +103,10 @@ module MotherBrain
             set_component_versions(environment, plugin, options[:component_versions])
           end
 
-          if options[:cookbook_versions].any?
+          cookbook_versions = options[:cookbook_versions] || plugin.cookbook_versions
+          if cookbook_versions.any?
             job.set_status("Setting cookbook versions")
-            set_cookbook_versions(environment, options[:cookbook_versions])
+            set_cookbook_versions(environment, cookbook_versions)
           end
 
           if options[:environment_attributes].any?

data/lib/mb/cli/sub_command/plugin.rb

@@ -61,6 +61,7 @@ module MotherBrain
                   aliases: "--components"
                 method_option :cookbook_versions,
                   type: :hash,
+                  hidden: true,
                   desc: "The cookbook versions to set on the environment",
                   aliases: "--cookbooks"
                 method_option :environment_attributes,
@@ -84,6 +85,8 @@ module MotherBrain
                   boot_options = Hash.new.merge(options).deep_symbolize_keys
                   manifest     = MB::Bootstrap::Manifest.from_file(manifest_file)
 
+                  cookbooks_option_deprecated(options)
+
                   job = bootstrapper.async_bootstrap(
                     environment.freeze,
                     manifest.freeze,
@@ -103,6 +106,7 @@ module MotherBrain
                   aliases: "--components"
                 method_option :cookbook_versions,
                   type: :hash,
+                  hidden: true,
                   desc: "The cookbook versions to set on the environment",
                   aliases: "--cookbooks"
                 method_option :environment_attributes,
@@ -129,6 +133,8 @@ module MotherBrain
                   prov_options = Hash.new.merge(options).deep_symbolize_keys
                   manifest     = Provisioner::Manifest.from_file(manifest_file)
 
+                  cookbooks_option_deprecated(options)
+
                   job = provisioner.async_provision(
                     environment.freeze,
                     manifest.freeze,
@@ -170,6 +176,7 @@ module MotherBrain
                   aliases: "--components"
                 method_option :cookbook_versions,
                   type: :hash,
+                  hide: true,
                   desc: "The cookbook versions to set on the environment",
                   aliases: "--cookbooks"
                 method_option :environment_attributes,
@@ -196,12 +203,7 @@ module MotherBrain
                 define_method(:upgrade) do
                   upgrade_options = Hash.new.merge(options).deep_symbolize_keys
 
-                  requires_one_of [
-                    :component_versions,
-                    :cookbook_versions,
-                    :environment_attributes,
-                    :environment_attributes_file
-                  ]
+                  cookbooks_option_deprecated(options)
 
                   job = upgrade_manager.async_upgrade(
                     environment.freeze,
@@ -220,6 +222,14 @@ module MotherBrain
                   ui.say plugin.metadata.attributes.to_yaml
                 end
               end
+
+              no_commands do
+                def cookbooks_option_deprecated(options)
+                  if options[:cookbook_versions]
+                    ui.deprecated "--cookbooks option is deprecated in favor of loading versions from Berksfile.lock"
+                  end
+                end
+              end
             end
 
             klass

data/lib/mb/group.rb

@@ -57,8 +57,8 @@ module MotherBrain
         "#{attribute_escape(key)}:#{value}"
       end
 
-      items += roles.collect { |role| "roles:#{solr_escape(role)}" }
-      items += recipes.collect { |recipe| "recipes:#{solr_escape(recipe)}" }
+      items += roles.collect { |role| "run_list:#{solr_escape('role['+role+']')}" }
+      items += recipes.collect { |recipe| "run_list:#{solr_escape('recipe['+recipe+']')}" }
 
       items.join(' AND ')
     end

data/lib/mb/node_querier.rb

@@ -50,7 +50,7 @@ module MotherBrain
       node_failures_count  = 0
       node_failures = Array.new
 
-      futures = nodes.map { |node| node_querier.future(:chef_run, node.public_hostname, node_object: node, override_recipes: override_recipes) }
+      futures = nodes.map { |node| node_querier.future(:chef_run, node.public_hostname, override_recipes: override_recipes) }
 
       futures.each do |future|
         begin
@@ -125,21 +125,12 @@ module MotherBrain
       end
 
       response = if options[:override_recipes]
-          node = options[:node_object]
-          node.reload
-          old_recipes = node.automatic_attributes.recipes
           override_recipes = options[:override_recipes]
 
           cmd_recipe_syntax = override_recipes.join(',') { |recipe| "recipe[#{recipe}]" }
           log.info { "Running Chef client with override runlist '#{cmd_recipe_syntax}' on: #{host}" }
           chef_run_response = chef_connection.node.execute_command(host, "chef-client --override-runlist #{cmd_recipe_syntax}")
 
-          # reset the run list
-          node.reload
-          log.info { "Resetting node's recipes attribute back to #{old_recipes}" }
-          node.automatic_attributes.recipes = old_recipes
-          node.save
-
           chef_run_response
         else
           log.info { "Running Chef client on: #{host}" }

data/lib/mb/plugin.rb

@@ -4,18 +4,24 @@ module MotherBrain
       # Create a new plugin instance from the given content
       #
       # @param [MB::CookbookMetadata] metadata
+      # @param [Hash<String, String>] cookbook_versions
+      #   The cookbook dependencies which this plugin depends on. Key is
+      #   the cookbook name and the value is the version of the cookbook.
       #
       # @raise [PluginLoadError]
       #
       # @yieldreturn [MotherBrain::Plugin]
-      def load(metadata, &block)
-        new(metadata, &block).validate!
+      def load(metadata, cookbook_versions = {}, &block)
+        new(metadata, cookbook_versions, &block).validate!
       rescue PluginSyntaxError => ex
         ErrorHandler.wrap(ex)
       end
 
       # Load the contents of a directory into an instance of MB::Plugin
       #
+      # The cookbook dependencies of this plugin will be loaded from the
+      # Berksfile.lock if it is found.
+      #
       # @param [#to_s] path
       #   a path to a directory containing a motherbrain plugin file and cookbook
       #   metadata file
@@ -31,8 +37,9 @@ module MotherBrain
         plugin_filename = File.join(path, PLUGIN_FILENAME)
         plugin_contents = File.read(plugin_filename)
         metadata        = CookbookMetadata.from_path(path)
+        berksfile_lock  = Berkshelf::Lockfile.from_path(path)
 
-        load(metadata) { eval(plugin_contents, binding, plugin_filename, 1) }
+        load(metadata, berksfile_lock.locked_versions) { eval(plugin_contents, binding, plugin_filename, 1) }
       rescue PluginSyntaxError => ex
         raise PluginSyntaxError, ErrorHandler.new(ex, file_path: plugin_filename).message
       end
@@ -58,6 +65,8 @@ module MotherBrain
     attr_reader :components
     # @return [Set<MB::Command>]
     attr_reader :commands
+    # @return [Hash<String, String>]
+    attr_reader :cookbook_versions
 
     def_delegator :metadata, :name
     def_delegator :metadata, :maintainer
@@ -68,10 +77,14 @@ module MotherBrain
     def_delegator :metadata, :version
 
     # @param [MB::CookbookMetadata] metadata
-    def initialize(metadata, &block)
-      @metadata     = metadata
-      @components   = Set.new
-      @commands     = Set.new
+    # @param [Hash<String, String>] cookbook_versions
+    #   The cookbook dependencies which this plugin depends on. Key is
+    #   the cookbook name and the value is the version of the cookbook.
+    def initialize(metadata, cookbook_versions = {}, &block)
+      @metadata          = metadata
+      @cookbook_versions = cookbook_versions
+      @components        = Set.new
+      @commands          = Set.new
 
       if block_given?
         dsl_eval(&block)

data/lib/mb/upgrade/worker.rb

@@ -104,7 +104,7 @@ module MotherBrain
 
         # @return [Hash]
         def cookbook_versions
-          options[:cookbook_versions] || {}
+          options[:cookbook_versions] || plugin.cookbook_versions
         end
 
         # @return [Hash]

data/lib/mb/version.rb

@@ -1,3 +1,3 @@
 module MotherBrain
-  VERSION = '0.14.4'
+  VERSION = '0.14.5'
 end

data/lib/motherbrain.rb

@@ -20,6 +20,7 @@ require 'mb/core_ext'
 require 'mb/grape_ext'
 require 'mb/ridley_ext'
 require 'mb/thor_ext'
+require 'berkshelf'
 
 module MotherBrain
   autoload :API, 'mb/api'

data/motherbrain.gemspec

@@ -55,4 +55,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-platform', '~> 0.1'
   s.add_dependency 'buff-ruby_engine', '~> 0.1'
   s.add_dependency 'grape-swagger', '~> 0.6.0'
+  s.add_dependency 'berkshelf', '~> 3.0.0.beta7'
 end

data/spec/fixtures/myface-0.1.0/Berksfile.lock

@@ -0,0 +1,3 @@
+GRAPH
+  cookbook1 (2.0.1)
+  cookbook2 (1.0.13)

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'motherbrain'
 require 'chef_zero/server'
 
 def setup_rspec
+  require File.expand_path('../../spec/support/berkshelf.rb', __FILE__)
   Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
 
   RSpec.configure do |config|

data/spec/unit/mb/berkshelf_spec.rb

@@ -35,4 +35,21 @@ describe MB::Berkshelf do
       subject.should be_a(Pathname)
     end
   end
+
+  describe MB::Berkshelf::Lockfile do
+    describe "#locked_versions" do
+
+      let(:plugin_path) { '/foo' }
+      subject { MB::Berkshelf::Lockfile.from_path(plugin_path) }
+
+      context "when there is no lockfile present" do
+        its(:locked_versions) { should == {} }
+      end
+
+      context "when there is a lockfile present" do
+        let(:plugin_path) { fixtures_path.join('myface-0.1.0') }
+        its(:locked_versions) { should == {'cookbook1' => '2.0.1', 'cookbook2' => '1.0.13'}}
+      end
+    end
+  end
 end

data/spec/unit/mb/bootstrap/manager_spec.rb

@@ -8,8 +8,10 @@ describe MB::Bootstrap::Manager do
     MB::CookbookMetadata.from_file(fixtures_path.join('cb_metadata.rb'))
   }
 
+  let(:cookbook_versions) { {} }
+
   let(:plugin) {
-    MB::Plugin.new(cookbook_metadata) do
+    MB::Plugin.new(cookbook_metadata, cookbook_versions) do
       component "activemq" do
         group "master"
         group "slave"
@@ -132,6 +134,15 @@ describe MB::Bootstrap::Manager do
       end
     end
 
+    context "when the plugin has cookbook version dependencies set" do
+      let(:cookbook_versions) { {'cookbook1' => '1.2.3', 'cookbook2' => '4.5.6'} }
+
+      it "should set the cookbook versions on the environment" do
+        manager.should_receive(:set_cookbook_versions).with(environment, cookbook_versions)
+        run
+      end
+    end
+
     context "when :environment_attributes_file is passed as an option" do
       let(:filepath) { double }
 

data/spec/unit/mb/group_spec.rb

@@ -189,7 +189,7 @@ describe MB::Group do
       end
 
       it "returns them escaped and joined together by AND" do
-        expect(subject).to eql("chef_environment:#{environment} AND recipes:pvpnet\\:\\:default AND recipes:pvpnet\\:\\:database")
+        expect(subject).to eql("chef_environment:#{environment} AND run_list:recipe\\[pvpnet\\:\\:default\\] AND run_list:recipe\\[pvpnet\\:\\:database\\]")
       end
     end
 
@@ -201,7 +201,7 @@ describe MB::Group do
       end
 
       it "does not escape the dash" do
-        expect(subject).to eql("chef_environment:#{environment} AND recipes:build-essential")
+        expect(subject).to eql("chef_environment:#{environment} AND run_list:recipe\\[build-essential\\]")
       end
     end
 
@@ -214,7 +214,7 @@ describe MB::Group do
       end
 
       it "returns them escaped and joined together by AND" do
-        expect(subject).to eql("chef_environment:#{environment} AND roles:app_server AND roles:database_server")
+        expect(subject).to eql("chef_environment:#{environment} AND run_list:role\\[app_server\\] AND run_list:role\\[database_server\\]")
       end
     end
   end

data/spec/unit/mb/plugin_spec.rb

@@ -107,6 +107,10 @@ describe MB::Plugin do
       it "returns a MB::Plugin from the given directory" do
         subject.should be_a(MB::Plugin)
       end
+
+      it "sets the cookbook_versions from the Berksfile.lock" do
+        subject.cookbook_versions.should == {'cookbook1' => '2.0.1', 'cookbook2' => '1.0.13'}
+      end
     end
   end
 

data/spec/unit/mb/upgrade/worker_spec.rb

@@ -15,7 +15,8 @@ describe MB::Upgrade::Worker do
   let(:job) { job_double }
   let(:options) { Hash.new }
   let(:nodes) { %w[node1 node2 node3] }
-  let(:plugin) { double MB::Plugin, name: plugin_name }
+  let(:locked_versions) { {} }
+  let(:plugin) { double MB::Plugin, name: plugin_name, cookbook_versions: locked_versions }
   let(:plugin_name) { "plugin_name" }
 
   before do
@@ -61,6 +62,15 @@ describe MB::Upgrade::Worker do
       end
     end
 
+    context "when cookbooks are found in the Berksfile.lock" do
+      let(:locked_versions) { {'foo' => '1.2.3', 'bar' => '4.5.6'} }
+      it "updates the cookbook versions from the lockfile" do
+        worker.should_receive(:set_cookbook_versions).with(environment_name, locked_versions)
+        run
+      end
+
+    end
+
     context "when only cookbook_versions is passed as an option" do
       before do
         options[:cookbook_versions] = cookbook_versions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motherbrain
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -283,6 +283,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta7
 description: An orchestrator for Chef
 email:
 - jamie@vialstudios.com
@@ -459,6 +473,7 @@ files:
 - spec/fixtures/cb_metadata.rb
 - spec/fixtures/fake_id_rsa
 - spec/fixtures/fake_key.pem
+- spec/fixtures/myface-0.1.0/Berksfile.lock
 - spec/fixtures/myface-0.1.0/metadata.rb
 - spec/fixtures/myface-0.1.0/motherbrain.rb
 - spec/fixtures/test_env.json
@@ -607,6 +622,7 @@ test_files:
 - spec/fixtures/cb_metadata.rb
 - spec/fixtures/fake_id_rsa
 - spec/fixtures/fake_key.pem
+- spec/fixtures/myface-0.1.0/Berksfile.lock
 - spec/fixtures/myface-0.1.0/metadata.rb
 - spec/fixtures/myface-0.1.0/motherbrain.rb
 - spec/fixtures/test_env.json