chef-resolver 0.10.0 → 0.11.0

data/bin/chef-resolver

@@ -25,6 +25,7 @@ if ARGV[0] == 'install'
 # # Access with role.config_name.chef
 # config_name:
 #   knife_file: /full/path/to/knife.rb
+#   search_extra: 'role:production' # optional
 #   env: # optional
 #     CHEF_ENV: production
 DEFAULT_CONFIG

data/lib/chef/resolver/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Resolver
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

data/lib/chef/resolver_server.rb

@@ -96,7 +96,15 @@ class Chef
       load_chef_config config
 
       puts "\tLooking up role #{role}..."
-      nodes = Chef::Search::Query.new.search('node', "role:#{role}")[0]
+
+      # Build search string
+      search = "role:#{role}"
+      if config.key?('search_extra')
+        search = "(#{config['search_extra']}) AND #{search}"
+      end
+
+      # Find the nodes
+      nodes = Chef::Search::Query.new.search('node', search)[0]
       if index >= nodes.length
         puts "\tIndex beyond bounds: #{index} vs #{nodes.length}"
         return nil

data/spec/resolver_server_spec.rb

@@ -14,10 +14,10 @@ describe Chef::ResolverServer do
     @server = nil
   end
 
-  def stub_search role, nodes
+  def stub_search search, nodes
     query = double('Chef::Search::Query')
     nodes.each_with_index {|n, i| n['name'] = "node #{i}" }
-    query.should_receive(:search).with('node', "role:#{role}").and_return([nodes, 0, nodes.length])
+    query.should_receive(:search).with('node', search).and_return([nodes, 0, nodes.length])
     Chef::Search::Query.should_receive(:new) { query }
   end
 
@@ -45,6 +45,7 @@ describe Chef::ResolverServer do
     @default_config = Chef::Config.configuration
     @test_config = {'knife_file' => File.dirname(__FILE__)+'/files/test_knife.rb'}
     @test2_config = {'knife_file' => File.dirname(__FILE__)+'/files/test2_knife.rb', 'env' => {'ENV_PROP' => 'test2'}}
+    @test3_config = {'knife_file' => File.dirname(__FILE__)+'/files/test_knife.rb', 'search_extra' => 'role:staging'}
   end
 
   after :each do
@@ -84,14 +85,21 @@ describe Chef::ResolverServer do
   it "should resolve a name like ROLE.CONFIG.chef" do
     new_server 'test' => @test_config, 'test2' => @test2_config
     @server.start
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.test2.chef').should == '1.1.1.1'
   end
 
+  it "should use the search_extra if given for lookups" do
+    new_server 'test3' => @test3_config
+    @server.start
+    stub_search '(role:staging) AND role:test_role',  [{'ipaddress' => '1.1.1.1'}]
+    getaddress('test_role.test3.chef').should == '1.1.1.1'
+  end
+
   it "should resolve a name like ROLE-INDEX.CONFIG.chef" do
     new_server 'test' => @test_config
     @server.start
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}, {'ipaddress' => '2.2.2.2'}, {'ipaddress' => '3.3.3.3'}, {'ipaddress' => '4.4.4.4'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}, {'ipaddress' => '2.2.2.2'}, {'ipaddress' => '3.3.3.3'}, {'ipaddress' => '4.4.4.4'}]
     getaddress('test_role-3.test.chef').should == '3.3.3.3'
   end
 
@@ -105,7 +113,7 @@ describe Chef::ResolverServer do
     # Should succeed with one config
     new_server 'test' => @test_config
     @server.start
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.chef').should == '1.1.1.1'
   end
 
@@ -118,7 +126,7 @@ describe Chef::ResolverServer do
   it "should resolve ec2 node public ip addresses properly" do
     new_server 'test' => @test_config
     @server.start
-    stub_search 'test_role', [{'ec2' => {'public_ipv4' => '1.1.1.1'}, 'ipaddress' => '0.0.0.0'}]
+    stub_search 'role:test_role', [{'ec2' => {'public_ipv4' => '1.1.1.1'}, 'ipaddress' => '0.0.0.0'}]
     getaddress('test_role.chef').should == '1.1.1.1'
   end
 
@@ -127,7 +135,7 @@ describe Chef::ResolverServer do
     File.open(path, 'w') {|f| f.write({'test' => @test_config}.to_yaml)}
     new_server path
     @server.start
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.chef').should == '1.1.1.1'
   end
 
@@ -142,7 +150,7 @@ describe Chef::ResolverServer do
     sleep 2
 
     expect { getaddress('test_role.test.chef') }.to raise_error(Resolv::ResolvError)
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.test2.chef').should == '1.1.1.1'
   end
 
@@ -154,7 +162,7 @@ describe Chef::ResolverServer do
     new_server config_path, true
     @server.start
 
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.changing.chef').should == '1.1.1.1'
     Chef::Config.test_prop.should == true
 
@@ -162,7 +170,7 @@ describe Chef::ResolverServer do
     File.open(knife_path, 'w') {|f| f.write("test_prop false\n")}
     sleep 2
 
-    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    stub_search 'role:test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.changing.chef').should == '1.1.1.1'
     Chef::Config.test_prop.should == false
   end

metadata

@@ -1,45 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chef-resolver
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
+version: !ruby/object:Gem::Version
+  version: 0.11.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Augenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-06 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 11
-        - 6
-        version: "11.6"
+date: 2014-03-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  requirement: *id001
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.6'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.6'
 description: A DNS resolver for Mac OS X that does role queries to resolve hostnames
-email: 
+email:
 - perl.programmer@gmail.com
-executables: 
+executables:
 - chef-resolver
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -54,37 +49,38 @@ files:
 - spec/files/test_knife.rb
 - spec/resolver_server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/warhammerkid/chef-resolver
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: 160828053575409919
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 160828053575409919
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Instead of doing knife search node role every time you want to look up a server, simply ssh into ROLE_NAME-##.chef
-test_files: 
+summary: Instead of doing knife search node role every time you want to look up a
+  server, simply ssh into ROLE_NAME-##.chef
+test_files:
 - spec/files/test2_knife.rb
 - spec/files/test_knife.rb
 - spec/resolver_server_spec.rb