motherbrain 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62e98f5b68edf8d5b1fe136be7d161e34a33b40
-  data.tar.gz: 57125dfcf9d5d7def16f5fa375c9ea74b23b5278
+  metadata.gz: 92e848a7145f24eb7bcaee3193cb4445382e4dc5
+  data.tar.gz: f348b5cd5442d64ec7ecf4b575349fee037349cf
 SHA512:
-  metadata.gz: ae54535d3adb4a56fd180373fabc0d56ad7fd8f1081d430da14e15fc0551d7066a4fa91259ef1914e6809709c2eeb0ff4dfb9cb83dbfd4185d43c85bf2400fac
-  data.tar.gz: a5745aa04d56ce0ad5aa419fa285045e83f36662a741029ef8dc03f6b3f6a050bfe590772f9e67b2dd257ccea0edec6021fccc9e36e383ed84e6c301e9c407cc
+  metadata.gz: 30ba05db9263dc38a8a9d57bdb3351025e69ee13e5683e97e859b6ebe8f88abaa8e7afe49495f3b7a174f2e148f66eb3a0cb315739d852c12e1a3b264e7a2e9e
+  data.tar.gz: 8d2cf420dcfa7bede15b895f0b26f8b0a3d817a7e5473cc0449faae9c239b59f32b2c45821466e458af8ab4ccd7ed681d7ad269492c8dbede896922e01135a21

data/.gitignore

@@ -25,3 +25,4 @@ man/mb.1.ronn
 *~
 \#*
 .DS_store
+.ruby-version

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.2.0
+
+* [#701](https://github.com/RiotGames/motherbrain/pull/701) Pass OS hints through to ridley-connectors for smarter connector picking
+* [#700](https://github.com/RiotGames/motherbrain/pull/700) Fix for rspec-guard syntax
+* [#699](https://github.com/RiotGames/motherbrain/pull/699) Use the currently logged in user as a default in SSH / WinRM config
+* [#698](https://github.com/RiotGames/motherbrain/pull/698) Removing the .ruby-version file because it makes dev a pain
+* [#695](https://github.com/RiotGames/motherbrain/pull/695) Add a better lock on ridley-connectors
+
 # 1.1.3
 
 * [#694](https://github.com/RiotGames/motherbrain/pull/694) Upgrade to reel 0.5.0

data/Gemfile

@@ -40,7 +40,6 @@ group :test do
   gem 'guard-cucumber'
   gem 'guard-rspec'
   gem 'guard-spork'
-  gem 'guard-yard'
 
   require 'rbconfig'
 

data/Guardfile

@@ -1,18 +1,12 @@
 notification :off
 
-guard 'spork' do
+guard :spork do
   watch('Gemfile')
   watch('spec/spec_helper.rb')     { :rspec }
   watch(%r{^spec/support/.+\.rb$}) { :rspec }
 end
 
-guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
-  watch(%r{app/.+\.rb})
-  watch(%r{lib/.+\.rb})
-  watch(%r{ext/.+\.c})
-end
-
-guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
+guard :rspec, cmd: "bundle exec rspec --color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^spec/acceptance/.+_spec\.rb$})
 
@@ -21,7 +15,7 @@ guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_af
   watch('spec/spec_helper.rb')        { "spec" }
 end
 
-guard 'cucumber', cli: "--drb --require features --format pretty", all_on_start: false, all_after_pass: false do
+guard :cucumber, cli: "--drb --require features --format pretty", all_on_start: false, all_after_pass: false do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})                      { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/lib/mb/config.rb

@@ -87,6 +87,7 @@ module MotherBrain
       type: String
 
     attribute 'ssh.user',
+      default: ENV['USER'],
       type: String
 
     attribute 'ssh.password',
@@ -108,6 +109,7 @@ module MotherBrain
       type: String
 
     attribute 'winrm.user',
+      default: ENV['USER'],
       type: String
 
     attribute 'winrm.password',

data/lib/mb/environment_manager.rb

@@ -81,7 +81,7 @@ module MotherBrain
 
         job.set_status("Performing a chef client run on #{nodes.length} nodes")
         nodes.collect do |node|
-          node_querier.future(:chef_run, node.public_hostname)
+          node_querier.future(:chef_run, node.public_hostname, connector: node.chef_attributes.os)
         end.each do |future|
           begin
             response = future.value
@@ -216,7 +216,7 @@ module MotherBrain
     #
     # @return [Array(Ridley::NodeObject)]
     def nodes_for_environment(name)
-      ridley.partial_search(:node, "chef_environment:#{name}", ["fqdn", "cloud.public_hostname", "name"])
+      ridley.partial_search(:node, "chef_environment:#{name}", ["fqdn", "cloud.public_hostname", "name", "os"])
     end
 
     private

data/lib/mb/group.rb

@@ -40,7 +40,7 @@ module MotherBrain
     #
     # @return [Array<Ridley::Node>]
     def nodes(environment)
-      Application.ridley.partial_search(:node, search_query(environment), [ "public_ipv4", "public_hostname" ])
+      Application.ridley.partial_search(:node, search_query(environment), [ "public_ipv4", "public_hostname", "os" ])
     end
 
     # Returns an escape search query for Solr from the roles, rescipes, and chef_attributes

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, override_recipes: override_recipes) }
+      futures = nodes.map { |node| node_querier.future(:chef_run, node.public_hostname, override_recipes: override_recipes, connector: connector_for_os(node.chef_attributes.os)) }
 
       futures.each do |future|
         begin
@@ -85,6 +85,8 @@ module MotherBrain
     #   timeout value for SSH bootstrap
     # @option options [Boolean] :sudo (true)
     #   bootstrap with sudo
+    # @option options [String] :connector
+    #   a connector type for the chef connection to prefer
     #
     # @return [String, nil]
     def node_name(host, options = {})
@@ -112,6 +114,8 @@ module MotherBrain
     #   a recipe that will override the nodes current run list
     # @option options [Ridley::NodeObject] :node
     #   the actual node object
+    # @option options [String] :connector
+    #   a connector type for the chef connection to prefer
     #
     # @raise [RemoteCommandError] if an execution error occurs in the remote command
     # @raise [RemoteCommandError] if given a blank or nil hostname
@@ -129,16 +133,16 @@ module MotherBrain
 
         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 = safe_remote(host) { chef_connection.node.execute_command(host, "chef-client --override-runlist #{cmd_recipe_syntax}", connector: options[:connector]) }
 
         chef_run_response
       else
         log.info { "Running Chef client on: #{host}" }
-        safe_remote(host) { chef_connection.node.chef_run(host) }
+        safe_remote(host) { chef_connection.node.chef_run(host, connector: options[:connector]) }
       end
 
       if response.error?
-        log.info { "Failed Chef client run on: #{host}" }
+        log.info { "Failed Chef client run on: #{host} - #{response.stderr.chomp}" }
         abort RemoteCommandError.new(response.stderr.chomp, host)
       end
 
@@ -166,6 +170,8 @@ module MotherBrain
     #   timeout value for SSH bootstrap
     # @option options [Boolean] :sudo
     #   bootstrap with sudo
+    # @option options [String] :connector
+    #   a connector type for the chef connection to prefer
     #
     # @raise [RemoteFileCopyError]
     #
@@ -181,7 +187,7 @@ module MotherBrain
         abort RemoteCommandError.new("cannot put_secret without a hostname or ipaddress")
       end
 
-      response = safe_remote(host) { chef_connection.node.put_secret(host) }
+      response = safe_remote(host) { chef_connection.node.put_secret(host, connector: options[:connector]) }
 
       if response.error?
         log.info { "Failed to put secret file on: #{host}" }
@@ -197,15 +203,17 @@ module MotherBrain
     #
     # @param [String] host
     # @param [String] command
+    # @option options [String] :connector
+    #   a connector type for the chef connection to prefer
     #
     # @return [Ridley::HostConnection::Response]
-    def execute_command(host, command)
+    def execute_command(host, command, options = {})
 
       unless host.present?
         abort RemoteCommandError.new("cannot execute command without a hostname or ipaddress")
       end
 
-      response = safe_remote(host) { chef_connection.node.execute_command(host, command) }
+      response = safe_remote(host) { chef_connection.node.execute_command(host, command, connector: options[:connector]) }
 
       if response.error?
         log.info { "Failed to execute command on: #{host}" }
@@ -313,6 +321,10 @@ module MotherBrain
     #   skip removal of the Chef package and the contents of the installation
     #   directory. Setting this to true will only remove any data and configurations
     #   generated by running Chef client.
+    # @option options [String] :connector
+    #   a connector type for the chef connection to prefer
+    #
+    # @return [MB::JobTicket]
     def purge(job, host, options = {})
       options = options.reverse_merge(skip_chef: false)
       futures = Array.new
@@ -328,7 +340,7 @@ module MotherBrain
       end
 
       job.set_status("Cleaning up the host's file system.")
-      futures << chef_connection.node.future(:uninstall_chef, host, options.slice(:skip_chef))
+      futures << chef_connection.node.future(:uninstall_chef, host, options.slice(:skip_chef, :connector))
 
       begin
         safe_remote(host) { futures.map(&:value) }
@@ -471,6 +483,24 @@ module MotherBrain
       log.debug { "Node Querier stopping..." }
     end
 
+    # Returns a String representing the best connector
+    # type to use when communicating with a given node
+    #
+    # @param os [String]
+    #   the operating system
+    #
+    # @return [String]
+    def connector_for_os(os)
+      case os
+      when "windows"
+        Ridley::HostCommander::DEFAULT_WINDOWS_CONNECTOR
+      when "linux"
+        Ridley::HostCommander::DEFAULT_LINUX_CONNECTOR
+      else
+        nil
+      end
+    end
+
     # Run a Ruby script on the target host and return the result of STDOUT. Only scripts
     # that are located in the Mother Brain scripts directory can be used and they should
     # be identified just by their filename minus the extension
@@ -493,6 +523,8 @@ module MotherBrain
     #   timeout value for SSH bootstrap
     # @option options [Boolean] :sudo (true)
     #   bootstrap with sudo
+    # @option options [String] :connector
+    #   a connector type for the chef connection to prefer
     #
     # @raise [RemoteScriptError] if there was an error in execution
     # @raise [RuntimeError] if an unknown response is returned from Ridley
@@ -512,7 +544,7 @@ module MotherBrain
         abort RemoteCommandError.new("cannot execute a ruby_script without a hostname or ipaddress")
       end
 
-      response = safe_remote(host) { chef_connection.node.ruby_script(host, command_lines) }
+      response = safe_remote(host) { chef_connection.node.ruby_script(host, command_lines, connector: options[:connector]) }
       
       if response.error?
         raise RemoteScriptError.new(response.stderr.chomp)

data/lib/mb/version.rb

@@ -1,3 +1,3 @@
 module MotherBrain
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/motherbrain.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh'
   s.add_dependency 'net-sftp'
   s.add_dependency 'solve', '~> 1.1'
-  s.add_dependency 'ridley-connectors', '~> 2.0'
+  s.add_dependency 'ridley-connectors', '~> 2.1'
   s.add_dependency 'thor', '~> 0.18.0'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'multi_json'

data/spec/unit/mb/config_spec.rb

@@ -33,14 +33,21 @@ describe MB::Config do
 
   subject do
     MB::Config.new.tap do |o|
-      o.chef.api_url = "https://api.opscode.com/organizations/vialstudio"
+      o.chef.api_url    = "https://api.opscode.com/organizations/vialstudio"
       o.chef.api_client = "reset"
-      o.chef.api_key = "/Users/reset/.chef/reset.pem"
-      o.ssh.user = "root"
-      o.ssh.password = "something"
+      o.chef.api_key    = "/Users/reset/.chef/reset.pem"
+      o.ssh.password    = "something"
     end
   end
 
+  it "uses the currently logged in user as the default ssh user" do
+    expect(subject.ssh.user).to eql(ENV['USER'])
+  end
+
+  it "uses the currently logged in user as the default winrm user" do
+    expect(subject.winrm.user).to eql(ENV['USER'])
+  end
+
   describe "#log.level" do
     it "converts the string 'info' to 'INFO'" do
       subject.log.level = 'info'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motherbrain
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -149,14 +149,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -344,7 +344,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - COMMANDS.md

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p353