aether 0.0.1 → 0.0.2

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.chef
 .config
 .rvmrc
 .yardoc
@@ -13,6 +14,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/chef_server.yml
 test/tmp
 test/version_tmp
 tmp

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/README.md

@@ -14,5 +14,4 @@ Sample Usage
                     :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

data/aether.gemspec

@@ -5,6 +5,8 @@ require 'aether/version'
 
 Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '>= 0.8')
+  gem.add_development_dependency('rspec', '~> 2.11')
+  gem.add_development_dependency('hashie', '~> 1.2')
 
   gem.add_dependency('ridley', '~> 0.2')
 

data/lib/aether.rb

@@ -1,39 +1,5 @@
-require 'aether/version'
 require 'ridley'
 
-
-module Aether
- class Chef
-
-   attr_reader :connection, :environment
-
-   def initialize(options = {})
-     @connection = Ridley::Connection.new(
-       :server_url => options[:server_url],
-       :client_name => options[:client_name],
-       :client_key => options[:client_key],
-       :organization => options[:organization]
-     )
-
-     @environment = options[:environment]
-   end
-
-   def find_servers(options)
-     role = options[:role]
-     connection.search(:node, "chef_environment:#{environment} AND role:#{role}")
-   end
-
-   def find_web_servers(role = 'web-server')
-     @web_servers ||= find_servers(:role => role)
-   end
-
-   def find_db_migration_server(role = 'db-migration-server')
-     @db_migration_server ||= find_servers(:role => role).first
-   end
-
-   def find_data_bag_item(bag_name, item_name)
-     @data_bag_item ||= connection.data_bag.all.find{ |bag| bag.name == bag_name }.item.find(item_name).attributes
-   end
-
- end
-end
+require 'aether/version'
+require 'aether/server'
+require 'aether/chef'

data/lib/aether/chef.rb

@@ -0,0 +1,40 @@
+module Aether
+  class Chef
+
+    attr_reader :connection, :environment
+
+    def initialize(options = {})
+      @connection = Ridley::Connection.new(
+        :server_url => options[:server_url],
+        :client_name => options[:client_name],
+        :client_key => options[:client_key],
+        :organization => options[:organization]
+      )
+
+      @environment = options[:environment]
+    end
+
+    def find_servers(options = {})
+      role = options[:role]
+      results = []
+      connection.search(:node, "chef_environment:#{environment} AND role:#{role}").each do |node|
+        results << Aether::Server.new(:node => node)
+      end
+
+      results
+    end
+
+    def find_web_servers(role = 'web-server')
+      find_servers(:role => role)
+    end
+
+    def find_db_migration_server(role = 'db-migration-server')
+      find_servers(:role => role).first
+    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
+    end
+
+  end
+end

data/lib/aether/server.rb

@@ -0,0 +1,22 @@
+module Aether
+  class Server
+
+    attr_reader :name, :attributes, :raw
+
+    def initialize(options = {})
+      node = options[:node]
+      @name = node.name
+      @attributes = node.attributes
+      @raw = node
+    end
+
+    def ipaddress
+      @ipaddress ||= attributes[:automatic][:ipaddress]
+    end
+
+    def hostname
+      @hostname ||= attributes[:automatic][:fqdn]
+    end
+
+  end
+end

data/lib/aether/version.rb

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

data/spec/aether/chef_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Aether::Chef do
+  # TODO: mock the response; right now the tests connect to a real chef server :p
+
+  describe "#new" do
+    let(:chef_server) { Aether::Chef.new(chef_server_info) }
+
+    it "sets the connection" do
+      expect(chef_server.connection).to be_an_instance_of(Ridley::Connection)
+    end
+
+    it "sets the environment" do
+      expect(chef_server.environment).to eq('staging')
+    end
+  end
+
+  describe "#find_servers" 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')
+      expect(results).to be_an_instance_of(Array)
+      expect(results.first).to be_an_instance_of(Aether::Server)
+    end
+  end
+
+end

data/spec/aether/server_spec.rb

@@ -0,0 +1,20 @@
+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

data/spec/chef_server.yml.example

@@ -0,0 +1,5 @@
+server_url: 'https://api.opscode.com/organizations/xxx'
+client_name: 'xxx_client'
+client_key: '/absolute/path/to/.chef/xxx_client.pem'
+organization: 'xxx'
+environment: 'test'

data/spec/spec_helper.rb

@@ -0,0 +1,35 @@
+require 'aether'
+
+require 'hashie'
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+
+### Helper Methods
+
+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(
+    :name => 'web01.staging.foo.com',
+    :attributes => {
+      :automatic => {
+        :fqdn => 'web01.staging.foo.com',
+        :ipaddress => '10.0.10.15'
+      }
+    }
+  )
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aether
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
@@ -51,13 +83,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - aether.gemspec
 - lib/aether.rb
+- lib/aether/chef.rb
+- lib/aether/server.rb
 - lib/aether/version.rb
+- spec/aether/chef_spec.rb
+- spec/aether/server_spec.rb
+- spec/chef_server.yml.example
+- spec/spec_helper.rb
 homepage: https://github.com/bitium/aether
 licenses: []
 post_install_message: 
@@ -72,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 57900475441158562
+      hash: 1696241638785372526
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 57900475441158562
+      hash: 1696241638785372526
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -89,4 +128,8 @@ signing_key:
 specification_version: 3
 summary: Provides helper methods to be used in Capistrano recipes to retrieve server
   info from a Chef Server
-test_files: []
+test_files:
+- spec/aether/chef_spec.rb
+- spec/aether/server_spec.rb
+- spec/chef_server.yml.example
+- spec/spec_helper.rb