motherbrain 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9be9ce62f7fcfc6a682ed09f894e1b4aa31fe85
-  data.tar.gz: 516d1f29441d4bf6d0744f4a8b63facfe2850036
+  metadata.gz: 64cea7b12adcd4f120a1b7f0a580398d5544fbe1
+  data.tar.gz: a176fe1c0d298ae58ce95091cd310009cec02578
 SHA512:
-  metadata.gz: b0b5efa24f154d5557d346ac05ec20e5e4bd1f4fb0cc516cb57fda607e3a8a100b2dea5c203f61d17cd4ea853921d4f7bd54c7a517b16a8cd878989e32fbfdc5
-  data.tar.gz: 2c6a8e012f3ec6473b86886a2e91cf6ac3de1e1eb9b085f345a9f338075201d0ee02ea8550461a00886e429ce78fcb6f5b15d39fa85585e1949803ce71f185b8
+  metadata.gz: c6117c6036b918db282d96af96c64a83d9142184ca213ae894b81390cc7c0d961bd397fb8cf2832498c6122fa24441b0b95d5c1a6d7ce17d6de87f9aa017f669
+  data.tar.gz: 12e87e68c1fab167236d1c299b5d82923a9e08bebfd9ee488d9b0a7eb8e0332ca43c33516c25ea9a654060e9e19f2882811d2bcc6f5b31e7e7e4a94eb2490d58

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.1.2
+
+* [#691](https://github.com/RiotGames/motherbrain/pull/691) Add some extra error handling to NodeQuerier in order to prevent it from crashing
+* [#692](https://github.com/RiotGames/motherbrain/pull/692) Fix a bug preventing Job reporting from causing the unlock to fail during enabling/disabling
+* [#690](https://github.com/RiotGames/motherbrain/pull/690) More updates to gemspec to get bundler working appropriately
+* [#689](https://github.com/RiotGames/motherbrain/pull/689) Update to newer versions of berkshelf, ridley, celluloid, and others
+
 # 1.1.1
 
 * Lock tighter on http gem

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2013 Riot Games
+Copyright 2012-2014 Riot Games
 
     Jamie Winsor (<jamie@vialstudios.com>)
     Jesse Howarth (<jhowarth@riotgames.com>)

data/lib/mb/api/helpers.rb

@@ -31,7 +31,7 @@ module MotherBrain::API
       return nil if version.nil?
 
       ver_string = version.gsub('_', '.')
-      Solve::Version.split(ver_string)
+      Semverse::Version.split(ver_string)
       ver_string
     end
   end

data/lib/mb/api/v1/plugins_endpoint.rb

@@ -8,7 +8,7 @@ module MotherBrain::API
         rack_response(ex.to_json, 404, "Content-type" => "application/json")
       end
 
-      rescue_from Solve::Errors::InvalidVersionFormat do |ex|
+      rescue_from Semverse::InvalidVersionFormat do |ex|
         rack_response(ex.to_json, 400, "Content-type" => "application/json")
       end
 

data/lib/mb/api/validators/sem_ver.rb

@@ -9,9 +9,9 @@ module MotherBrain::API::Validators
       return nil if params[attr_name].nil?
 
       ver_string = params[attr_name].gsub('_', '.')
-      Solve::Version.split(ver_string)
+      Semverse::Version.split(ver_string)
       params[attr_name] = ver_string
-    rescue Solve::Errors::InvalidVersionFormat => ex
+    rescue Semverse::InvalidVersionFormat => ex
       throw :error, status: 400, message: ex.to_s
     end
   end

data/lib/mb/bootstrap/template.rb

@@ -1,5 +1,3 @@
-require 'faraday_middleware/response/follow_redirects'
-
 module MotherBrain
   module Bootstrap
     class Template
@@ -24,7 +22,7 @@ module MotherBrain
               uri = URI.parse(filename_or_url)
               begin
                 conn = Faraday.new do |b|
-                  b.use FaradayMiddleware::FollowRedirects
+                  b.use Ridley::Middleware::FollowRedirects
                   b.adapter :net_http
                 end
                 response = conn.get filename_or_url

data/lib/mb/cookbook_metadata.rb

@@ -58,11 +58,11 @@ module MotherBrain
       end
     end
 
-    # Override the default version with [Solve::Version]
+    # Override the default version with [Semverse::Version]
     #
-    # @return [Solve::Version]
+    # @return [Semverse::Version]
     def version(data = nil)
-      @version = data.nil? ? @version : Solve::Version.new(data)
+      @version = data.nil? ? @version : Semverse::Version.new(data)
     end
 
     private

data/lib/mb/mixin/attribute_setting.rb

@@ -233,11 +233,11 @@ module MotherBrain
         # @return [Hash]
         def expand_constraints(cookbook_versions)
           expanded = cookbook_versions.collect do |name, constraint|
-            [name, Solve::Constraint.new(constraint).to_s]
+            [name, Semverse::Constraint.new(constraint).to_s]
           end
 
           Hash[expanded]
-        rescue Solve::Errors::InvalidConstraintFormat => ex
+        rescue Semverse::InvalidConstraintFormat => ex
           raise ArgumentError, ex
         end
 

data/lib/mb/node_querier.rb

@@ -125,17 +125,17 @@ module MotherBrain
       end
 
       response = if options[:override_recipes]
-          override_recipes = options[:override_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}")
+        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 = safe_remote(host) { chef_connection.node.execute_command(host, "chef-client --override-runlist #{cmd_recipe_syntax}") }
 
-          chef_run_response
-        else
-          log.info { "Running Chef client on: #{host}" }
-          chef_connection.node.chef_run(host)
-        end
+        chef_run_response
+      else
+        log.info { "Running Chef client on: #{host}" }
+        safe_remote(host) { chef_connection.node.chef_run(host) }
+      end
 
       if response.error?
         log.info { "Failed Chef client run on: #{host}" }
@@ -181,7 +181,7 @@ module MotherBrain
         abort RemoteCommandError.new("cannot put_secret without a hostname or ipaddress")
       end
 
-      response = chef_connection.node.put_secret(host)
+      response = safe_remote(host) { chef_connection.node.put_secret(host) }
 
       if response.error?
         log.info { "Failed to put secret file on: #{host}" }
@@ -205,7 +205,7 @@ module MotherBrain
         abort RemoteCommandError.new("cannot execute command without a hostname or ipaddress")
       end
 
-      response = chef_connection.node.execute_command(host, command)
+      response = safe_remote(host) { chef_connection.node.execute_command(host, command) }
 
       if response.error?
         log.info { "Failed to execute command on: #{host}" }
@@ -250,7 +250,7 @@ module MotherBrain
       if (client_id = node_name(host)).nil?
         return nil
       end
-      chef_connection.client.find(client_id).try(:name)
+      safe_remote(host) { chef_connection.client.find(client_id).try(:name) }
     end
 
     # Asynchronously remove Chef from a target host and purge it's client and node object from the
@@ -329,7 +329,12 @@ module MotherBrain
 
       job.set_status("Cleaning up the host's file system.")
       futures << chef_connection.node.future(:uninstall_chef, host, options.slice(:skip_chef))
-      futures.map(&:value)
+
+      begin
+        safe_remote(host) { futures.map(&:value) }
+      rescue RemoteCommandError => e
+        job.report_failure
+      end
 
       job.report_success
     ensure
@@ -358,9 +363,11 @@ module MotherBrain
       end
       
       job.set_status("Host registered as #{node_name}.")
-      node = chef_connection.node.find(node_name)
+
+      node = fetch_node(job, node_name)
 
       required_run_list = []
+      success = false
       chef_synchronize(chef_environment: node.chef_environment, force: options[:force], job: job) do
         if node.run_list.include?(DISABLED_RUN_LIST_ENTRY)
           required_run_list = on_dynamic_services(job, node) do |dynamic_service, plugin|
@@ -377,14 +384,18 @@ module MotherBrain
           node.run_list = node.run_list.reject { |r| r == DISABLED_RUN_LIST_ENTRY }
           
           if node.save
-            job.report_success "#{node.name} enabled successfully."
+            job.set_status "#{node.name} enabled successfully."
+            success = true
           else
-            job.report_failure "#{node.name} did not save! Disabled run_list entry was unable to be removed to the node."
+            job.set_status "#{node.name} did not save! Disabled run_list entry was unable to be removed to the node."
           end
         else
-          job.report_success("#{node.name} is not disabled. No need to enable.")
+          job.set_status("#{node.name} is not disabled. No need to enable.")
+          success = true
         end
       end
+
+      job.report_boolean(success)
     rescue MotherBrain::ResourceLocked => e
       job.report_failure e.message
     ensure
@@ -411,11 +422,15 @@ module MotherBrain
                            "node name may not be available. #{host} was not disabled!")
       end
       job.set_status("Host registered as #{node_name}.")
-      node = chef_connection.node.find(node_name)
+
+      node = fetch_node(job, node_name)
+
       required_run_list = []
+      success = false
       chef_synchronize(chef_environment: node.chef_environment, force: options[:force], job: job) do
         if node.run_list.include?(DISABLED_RUN_LIST_ENTRY)
-          job.report_success("#{node.name} is already disabled.")
+          job.set_status("#{node.name} is already disabled.")
+          success = true
         else
           required_run_list = on_dynamic_services(job, node) do |dynamic_service, plugin|
             dynamic_service.node_state_change(job,
@@ -425,20 +440,25 @@ module MotherBrain
                                               false)
           end
         end
-        if !required_run_list.empty?
-          job.set_status "Running chef with the following run list: #{required_run_list.inspect}"
-          self.bulk_chef_run(job, [node], required_run_list)
-        else
-          job.set_status "No recipes required to run."
-        end
 
-        node.run_list = [DISABLED_RUN_LIST_ENTRY].concat(node.run_list)
-        if node.save
-          job.report_success "#{node.name} disabled."
-        else
-          job.report_failure "#{node.name} did not save! Disabled run_list entry was unable to be added to the node."
+        if !success
+          if !required_run_list.empty?
+            job.set_status "Running chef with the following run list: #{required_run_list.inspect}"
+            self.bulk_chef_run(job, [node], required_run_list)
+          else
+            job.set_status "No recipes required to run."
+          end
+
+          node.run_list = [DISABLED_RUN_LIST_ENTRY].concat(node.run_list)
+          if node.save
+            job.set_status "#{node.name} disabled."
+            success = true
+          else
+            job.set_status "#{node.name} did not save! Disabled run_list entry was unable to be added to the node."
+          end
         end
       end
+      job.report_boolean(success)
     rescue MotherBrain::ResourceLocked => e
       job.report_failure e.message
     ensure
@@ -492,7 +512,7 @@ module MotherBrain
         abort RemoteCommandError.new("cannot execute a ruby_script without a hostname or ipaddress")
       end
 
-      response = chef_connection.node.ruby_script(host, command_lines)
+      response = safe_remote(host) { chef_connection.node.ruby_script(host, command_lines) }
       
       if response.error?
         raise RemoteScriptError.new(response.stderr.chomp)
@@ -527,5 +547,21 @@ module MotherBrain
         end
       end.flatten.uniq
     end
+
+    def fetch_node(job, node_name)
+      node = safe_remote(node_name) { chef_connection.node.find(node_name) }
+    rescue RemoteCommandError => e
+      job.report_failure("Encountered error retrieving the node object.")
+    end
+    
+    def safe_remote(host = nil)
+      yield
+    rescue Exception => e
+      msg = "Unhandled Exception: [#{e.class}] #{e.message}"
+      msg = "[#{host}] #{msg}" if host
+      log.warn { msg }
+      log.debug { e.backtrace.join("\n") }
+      abort RemoteCommandError.new(msg, host)
+    end
   end
 end

data/lib/mb/plugin_manager.rb

@@ -258,7 +258,7 @@ module MotherBrain
 
       potentials = list(name: name, remote: false).map(&:version)
       potentials += remote_cookbook_versions(name) if options[:remote]
-      potentials = potentials.collect { |version| Solve::Version.new(version) }.uniq.sort.reverse
+      potentials = potentials.collect { |version| Semverse::Version.new(version) }.uniq.sort.reverse
 
       potentials.find do |version|
         found = find(name, version.to_s, options.slice(:remote))
@@ -412,7 +412,7 @@ module MotherBrain
     #
     # @param [String] plugin_name
     #   name of the plugin
-    # @param [String, Solve::Constraint] constraint
+    # @param [String, Semverse::Constraint] constraint
     #   constraint to satisfy
     #
     # @option options [Boolean] :remote (false)
@@ -424,7 +424,7 @@ module MotherBrain
     # @return [MB::Plugin]
     def satisfy(plugin_name, constraint, options = {})
       options    = options.reverse_merge(remote: false)
-      constraint = Solve::Constraint.new(constraint)
+      constraint = Semverse::Constraint.new(constraint)
 
       # Optimize for equality operator. Don't need to find all of the versions if
       # we only care about one.
@@ -435,7 +435,7 @@ module MotherBrain
       else
         graph = Solve::Graph.new
         versions(plugin_name, options[:remote]).each do |version|
-          graph.artifacts(plugin_name, version)
+          graph.artifact(plugin_name, version)
         end
 
         solution = Solve.it!(graph, [[plugin_name, constraint]])
@@ -444,7 +444,7 @@ module MotherBrain
         # calling versions() and including a {remote: true} option.
         find(plugin_name, version, remote: false)
       end
-    rescue Solve::Errors::NoSolutionError
+    rescue Semverse::NoSolutionError
       abort PluginNotFound.new(plugin_name, constraint)
     end
 

data/lib/mb/version.rb

@@ -1,3 +1,3 @@
 module MotherBrain
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/motherbrain.rb

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

data/man/man_helper.rb

@@ -17,7 +17,7 @@ module MB
 
       metadata = MB::CookbookMetadata.new
       metadata.name = "plugin"
-      metadata.version = Solve::Version.new("1.0.0")
+      metadata.version = Semverse::Version.new("1.0.0")
 
       plugin = MB::Plugin.new(metadata)
 

data/motherbrain.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.version       = MotherBrain::VERSION
 
-  s.add_dependency 'celluloid', '~> 0.15'
+  s.add_dependency 'celluloid', '~> 0.16.pre'
+  s.add_dependency 'celluloid-io', '~> 0.16.pre'
   # s.add_dependency 'dcell', '~> 0.14.0'
   s.add_dependency 'reel', '~> 0.4.0'
   s.add_dependency 'reel-rack'
@@ -42,11 +43,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'grape', '~> 0.6.0'
   s.add_dependency 'net-ssh'
   s.add_dependency 'net-sftp'
-  s.add_dependency 'solve', '>= 0.4.4'
-  s.add_dependency 'ridley-connectors', '~> 1.7.1'
+  s.add_dependency 'solve', '~> 1.1'
+  s.add_dependency 'ridley-connectors', '~> 2.0'
   s.add_dependency 'thor', '~> 0.18.0'
-  s.add_dependency 'faraday', '< 0.9.0'
-  s.add_dependency 'faraday_middleware'
+  s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'multi_json'
   s.add_dependency 'fog', '~> 1.10.0'
   s.add_dependency 'json', '>= 1.8.0'
@@ -55,5 +55,6 @@ 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'
+  s.add_dependency 'berkshelf', '~> 3.0'
+  s.add_dependency 'semverse', '~> 1.1'
 end

data/spec/support/actor_mocking.rb

@@ -1,5 +1,5 @@
 RSpec.configuration.before(:each) do
-  class Celluloid::ActorProxy
+  class Celluloid::CellProxy
     [ :should_receive, :should_not_receive, :stub, :stub_chain, :should, :should_not ].each do |method|
       undef_method(method) if method_defined?(method)
     end

data/spec/unit/mb/cookbook_metadata_spec.rb

@@ -53,8 +53,8 @@ describe MotherBrain::CookbookMetadata do
           subject.long_description.should eql("Installs/Configures motherbrain")
         end
 
-        it "sets a Solve::Version value for 'version'" do
-          subject.version.should be_a(Solve::Version)
+        it "sets a Semverse::Version value for 'version'" do
+          subject.version.should be_a(Semverse::Version)
           subject.version.to_s.should eql("0.1.0")
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motherbrain
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -23,14 +23,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.pre
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.pre
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
@@ -119,30 +133,30 @@ dependencies:
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ridley-connectors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -161,30 +175,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -303,14 +303,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta7
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: semverse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta7
+        version: '1.1'
 description: An orchestrator for Chef
 email:
 - jamie@vialstudios.com
@@ -607,7 +621,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An orchestrator for Chef