aether 0.0.2 → 0.0.3

data/README.md

@@ -7,11 +7,13 @@ server information from a Hosted Chef Server.
 The `Ather::Chef` class is mainly used in Capistrano recipes.
 
 
-Sample Usage
-------------
+Usage
+-----
 
     chef_server = Ather::Chef.new(:server_url => 'https://api.opscode.com/organizations/foo', :client_name => 'foo',
                     :client_key => '/path/to/.chef/foo.pem', :organization => 'foo', :environment => 'production')
 
-    webservers = chef_server.find_webservers # returns an array of Ridley::Node
-    any_servers = chef_server.find_servers(:role => 'a-chef-role') # returns an array of Ridley::Node
+    webservers = chef_server.find_webservers # returns an array of Aether::Server
+    webservers.first.hostname # => 'foo.bar.com'
+
+    servers = chef_server.find_servers(:role => 'a-chef-role') # search servers with a given role in its top level run list

data/aether.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rspec', '~> 2.11')
   gem.add_development_dependency('hashie', '~> 1.2')
 
-  gem.add_dependency('ridley', '~> 0.2')
+  gem.add_dependency('ridley', '~> 0.3')
 
   gem.name          = "aether"
   gem.version       = Aether::VERSION

data/lib/aether.rb

@@ -1,5 +1,5 @@
 require 'ridley'
 
 require 'aether/version'
-require 'aether/server'
+require 'aether/node'
 require 'aether/chef'

data/lib/aether/chef.rb

@@ -14,26 +14,56 @@ module Aether
       @environment = options[:environment]
     end
 
-    def find_servers(options = {})
-      role = options[:role]
+    def find_nodes(options = {}, include_environment = true)
+      roles = options[:roles] || []
       results = []
-      connection.search(:node, "chef_environment:#{environment} AND role:#{role}").each do |node|
-        results << Aether::Server.new(:node => node)
+
+      search_str = build_search_query(:include_environment => include_environment, :roles => roles)
+      connection.search(:node, search_str).each do |node|
+        results << Aether::Node.new(node)
       end
 
       results
     end
 
-    def find_web_servers(role = 'web-server')
-      find_servers(:role => role)
+    def find_data_bag_item(bag_name, item_name)
+      connection.data_bag.all.find{ |bag| bag.name == bag_name }.item.find(item_name).attributes
     end
 
-    def find_db_migration_server(role = 'db-migration-server')
-      find_servers(:role => role).first
+    def build_search_query(options = {})
+      include_environment = options[:include_environment]
+      roles = options[:roles] || []
+
+      str = ''
+      str << "chef_environment:#{environment}" if include_environment
+      unless roles.empty?
+        str << " AND " if include_environment
+        str << build_search_roles_query(roles)
+      end
+
+      str
     end
 
-    def find_data_bag_item(bag_name, item_name)
-      connection.data_bag.all.find{ |bag| bag.name == bag_name }.item.find(item_name).attributes
+
+    private
+
+    def build_search_roles_query(roles)
+      str = ''
+
+      last_index = roles.size - 1
+      roles.each_with_index do |role, i|
+        if i == last_index
+          str << "role:#{role}"
+        else
+          if roles.size == 1
+            str << "role:#{role}"
+          else
+            str << "role:#{role} AND "
+          end
+        end
+      end
+
+      str
     end
 
   end

data/lib/aether/{server.rb → node.rb}

@@ -1,10 +1,9 @@
 module Aether
-  class Server
+  class Node
 
     attr_reader :name, :attributes, :raw
 
-    def initialize(options = {})
-      node = options[:node]
+    def initialize(node)
       @name = node.name
       @attributes = node.attributes
       @raw = node
@@ -13,10 +12,12 @@ module Aether
     def ipaddress
       @ipaddress ||= attributes[:automatic][:ipaddress]
     end
+    alias_method :local_ipv4, :ipaddress
 
     def hostname
       @hostname ||= attributes[:automatic][:fqdn]
     end
+    alias_method :fqdn, :hostname
 
   end
 end

data/lib/aether/version.rb

@@ -1,3 +1,3 @@
 module Aether
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/aether/chef_spec.rb

@@ -15,13 +15,45 @@ describe Aether::Chef do
     end
   end
 
-  describe "#find_servers" do
+  describe "#build_search_query" do
+    let(:chef_server) { Aether::Chef.new(chef_server_info) }
+
+    context "with env and 1 role" do
+      it "returns an appropriate search query" do
+        results = chef_server.build_search_query(:include_environment => true, :roles => ['web-server'])
+        expect(results).to eq("chef_environment:#{chef_server.environment} AND role:web-server")
+      end
+    end
+
+    context "with env and 2 roles" do
+      it "returns an appropriate search query" do
+        results = chef_server.build_search_query(:include_environment => true, :roles => ['web-server', 'worker-server'])
+        expect(results).to eq("chef_environment:#{chef_server.environment} AND role:web-server AND role:worker-server")
+      end
+    end
+
+    context "without env and 1 role" do
+      it "returns an appropriate search query" do
+        results = chef_server.build_search_query(:include_environment => false, :roles => ['web-server'])
+        expect(results).to eq("role:web-server")
+      end
+    end
+
+    context "without env and more than one role" do
+      it "returns an appropriate search query" do
+        results = chef_server.build_search_query(:include_environment => false, :roles => ['web-server', 'push-server', 'worker-server'])
+        expect(results).to eq("role:web-server AND role:push-server AND role:worker-server")
+      end
+    end
+  end
+
+  describe "#find_nodes" do
     let(:chef_server) { Aether::Chef.new(chef_server_info) }
 
     it "returns an array of Chef::Server" do
-      results = chef_server.find_servers(:role => 'web-server')
+      results = chef_server.find_nodes(:roles => ['web-server'])
       expect(results).to be_an_instance_of(Array)
-      expect(results.first).to be_an_instance_of(Aether::Server)
+      expect(results.first).to be_an_instance_of(Aether::Node)
     end
   end
 

data/spec/aether/node_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Aether::Node do
+  let(:node) { Aether::Node.new(mock_node) }
+
+  describe "#ipaddress" do
+    it "returns the ip address" do
+      expect(node.ipaddress).to_not be_blank
+      expect(node.ipaddress).to eq(mock_node.attributes.automatic.ipaddress)
+    end
+  end
+
+  describe "#local_ipv4" do
+    it "returns the ip address" do
+      expect(node.local_ipv4).to_not be_blank
+      expect(node.local_ipv4).to eq(mock_node.attributes.automatic.ipaddress)
+    end
+  end
+
+  describe "#hostname" do
+    it "returns the fqdn" do
+      expect(node.hostname).to_not be_blank
+      expect(node.hostname).to eq(mock_node.attributes.automatic.fqdn)
+    end
+  end
+
+  describe "#fqdn" do
+    it "returns the fqdn" do
+      expect(node.fqdn).to_not be_blank
+      expect(node.fqdn).to eq(mock_node.attributes.automatic.fqdn)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -22,8 +22,8 @@ def chef_server_info
  @chef_server_info ||=  YAML.load_file(File.expand_path(File.join(File.dirname(__FILE__), 'chef_server.yml'))).symbolize_keys
 end
 
-def mock_node_results
-  @mock_node_results ||= Hashie::Mash.new(
+def mock_node
+  @mock_node ||= Hashie::Mash.new(
     :name => 'web01.staging.foo.com',
     :attributes => {
       :automatic => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aether
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Simple wrapper over Ridley gem (a Chef API client)
 email:
 - devops@bitium.com
@@ -91,10 +91,10 @@ files:
 - aether.gemspec
 - lib/aether.rb
 - lib/aether/chef.rb
-- lib/aether/server.rb
+- lib/aether/node.rb
 - lib/aether/version.rb
 - spec/aether/chef_spec.rb
-- spec/aether/server_spec.rb
+- spec/aether/node_spec.rb
 - spec/chef_server.yml.example
 - spec/spec_helper.rb
 homepage: https://github.com/bitium/aether
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1696241638785372526
+      hash: 3580871981690329813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1696241638785372526
+      hash: 3580871981690329813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -130,6 +130,6 @@ summary: Provides helper methods to be used in Capistrano recipes to retrieve se
   info from a Chef Server
 test_files:
 - spec/aether/chef_spec.rb
-- spec/aether/server_spec.rb
+- spec/aether/node_spec.rb
 - spec/chef_server.yml.example
 - spec/spec_helper.rb

data/spec/aether/server_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe Aether::Server do
-  let(:server) { Aether::Server.new(:node => mock_node_results) }
-
-  describe "#ipaddress" do
-    it "returns the ip address" do
-      expect(server.ipaddress).to_not be_blank
-      expect(server.ipaddress).to eq(mock_node_results.attributes.automatic.ipaddress)
-    end
-  end
-
-  describe "#hostname" do
-    it "returns the fqdn" do
-      expect(server.hostname).to_not be_blank
-      expect(server.hostname).to eq(mock_node_results.attributes.automatic.fqdn)
-    end
-  end
-
-end