aether 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1ee8c6e6ee1b73062554844d29c67941a3d0ef31
+  data.tar.gz: c835460e7b5da9aefc8b1612f3ab77a6d649f6aa
+SHA512:
+  metadata.gz: ab1bb6be9cc862d4109cc0ef009c626a07d9b7f3978325f409fdc672831aa6df4ca40b72622bd0b61fb0258c4436fb6293787049cd91a89eab14c5ff2011cdf1
+  data.tar.gz: d261406ad10e3fd1e07cf18190d07cb4fa67e482ba905d5afc391ede008885a7618750d6fa3bca9ae5e053aa9dfbb2a69b6c1cdb018205d1b8f368549c738dcd

data/README.md

@@ -1,15 +1,14 @@
 # Aether
 
 Aether is a simple wrapper over the [Ridley Rubygem](http://rubygems.org/gems/ridley) that returns
-server information from a Hosted Chef Server.
+server information from a Chef Server.
 
 The `Aether::Chef` class is mainly used in Capistrano recipes.
 
 
 ## Disclaimer
 
-This was built when the Ridley interface was in flux and we needed a consistent way to access node attributes.
-Ridley has since added most of the same node related methods so you should probably use Ridley directly.
+This is a thin wrapper over the Ridley interface that adds some Node level convenience methods.
 
 
 ## Usage

data/aether.gemspec

@@ -4,12 +4,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 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.6.3')
-
   gem.name          = "aether"
   gem.version       = Aether::VERSION
   gem.authors       = ["Bitium, Inc"]
@@ -22,4 +16,10 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency('rake', '>= 0.8')
+  gem.add_development_dependency('rspec', '~> 2.14')
+  gem.add_development_dependency('hashie', '~> 2.0')
+
+  gem.add_dependency('ridley', '~> 2.4')
 end

data/lib/aether.rb

@@ -2,4 +2,5 @@ require 'ridley'
 
 require 'aether/version'
 require 'aether/node'
+require 'aether/data_bag_item'
 require 'aether/chef'

data/lib/aether/chef.rb

@@ -3,15 +3,14 @@ module Aether
 
     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]
+    def initialize(opts = {})
+      @connection = Ridley.new(
+        server_url: opts[:server_url],
+        client_name: opts[:client_name],
+        client_key: opts[:client_key]
       )
 
-      @environment = options[:environment]
+      @environment = opts[:environment]
     end
 
     def find_nodes(options = {}, include_environment = true)
@@ -27,7 +26,8 @@ module Aether
     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
+      data_bag_item = connection.data_bag.all.find{ |bag| bag.name == bag_name }.item.find(item_name)
+      Aether::DataBagItem.new(data_bag_item)
     end
 
     def build_search_query(options = {})

data/lib/aether/data_bag_item.rb

@@ -0,0 +1,11 @@
+module Aether
+  class DataBagItem
+
+    attr_reader :attributes
+
+    def initialize(data_bag_item)
+      @attributes = data_bag_item.attributes
+    end
+
+  end
+end

data/lib/aether/node.rb

@@ -1,21 +1,20 @@
 module Aether
   class Node
 
-    attr_reader :name, :attributes, :raw
+    attr_reader :name, :attributes
 
     def initialize(node)
       @name = node.name
-      @attributes = node.attributes
-      @raw = node
+      @attributes = node.chef_attributes
     end
 
     def ipaddress
-      @ipaddress ||= attributes[:automatic][:ipaddress]
+      @ipaddress ||= attributes.ipaddress
     end
     alias_method :local_ipv4, :ipaddress
 
     def hostname
-      @hostname ||= attributes[:automatic][:fqdn]
+      @hostname ||= attributes.fqdn
     end
     alias_method :fqdn, :hostname
 

data/lib/aether/version.rb

@@ -1,3 +1,3 @@
 module Aether
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/aether/chef_spec.rb

@@ -7,7 +7,7 @@ describe Aether::Chef 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)
+      expect(chef_server.connection).to be_an_instance_of(Ridley::Client)
     end
 
     it "sets the environment" do
@@ -50,11 +50,10 @@ describe Aether::Chef do
   describe "#find_nodes" do
     let(:chef_server) { Aether::Chef.new(chef_server_info) }
 
-    it "returns an array of Chef::Server" do
+    it "returns an array of Aether::Node" do
       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::Node)
     end
   end
-
 end

data/spec/aether/data_bag_item_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Aether::DataBagItem do
+  let(:data_bag_item) { Aether::DataBagItem.new(mock_data_bag_item) }
+
+  describe "#attributes" do
+    it "returns the data bag item attributes" do
+      expect(data_bag_item.attributes.primary_hostname.integration).to eq(mock_data_bag_item.attributes.primary_hostname.integration)
+    end
+  end
+end

data/spec/aether/node_spec.rb

@@ -6,28 +6,28 @@ describe Aether::Node do
   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)
+      expect(node.ipaddress).to eq(mock_node.chef_attributes.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)
+      expect(node.local_ipv4).to eq(mock_node.chef_attributes.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)
+      expect(node.hostname).to eq(mock_node.chef_attributes.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)
+      expect(node.fqdn).to eq(mock_node.chef_attributes.fqdn)
     end
   end
 end

data/spec/spec_helper.rb

@@ -25,11 +25,18 @@ end
 def mock_node
   @mock_node ||= Hashie::Mash.new(
     :name => 'web01.staging.foo.com',
+    :public_hostname => 'web01.staging.foo.com',
+    :chef_attributes => {
+      :fqdn => 'web01.staging.foo.com',
+      :ipaddress => '10.0.10.15'
+    }
+  )
+end
+
+def mock_data_bag_item
+  @mock_data_bag_item ||= Hashie::Mash.new(
     :attributes => {
-      :automatic => {
-        :fqdn => 'web01.staging.foo.com',
-        :ipaddress => '10.0.10.15'
-      }
+      :primary_hostname => Hashie::Mash.new(:integration => 'integration.foo.com', :staging => 'staging.foo.com')
     }
   )
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: aether
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Bitium, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !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'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '2.4'
 description: Simple wrapper over Ridley gem (a Chef API client)
 email:
 - devops@bitium.com
@@ -85,51 +76,47 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- LICENSE.txt
+- MIT-LICENSE
 - README.md
 - Rakefile
 - aether.gemspec
 - lib/aether.rb
 - lib/aether/chef.rb
+- lib/aether/data_bag_item.rb
 - lib/aether/node.rb
 - lib/aether/version.rb
 - spec/aether/chef_spec.rb
+- spec/aether/data_bag_item_spec.rb
 - spec/aether/node_spec.rb
 - spec/chef_server.yml.example
 - spec/spec_helper.rb
 homepage: https://github.com/bitium/aether
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4399038687224913869
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4399038687224913869
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides helper methods to be used in Capistrano recipes to retrieve server
   info from a Chef Server
 test_files:
 - spec/aether/chef_spec.rb
+- spec/aether/data_bag_item_spec.rb
 - spec/aether/node_spec.rb
 - spec/chef_server.yml.example
 - spec/spec_helper.rb