rna 0.2.4 → 0.3.0

data/Guardfile

@@ -4,7 +4,8 @@ end
 
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^spec/project/config/.*$}) { |m| "spec/lib/rna_spec.rb" }
   watch(%r{^lib/rna/(.+)\.rb$}) { |m| "spec/lib/rna_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/rna_spec.rb" }
   # watch('spec/spec_helper.rb')  { "spec" }
 end

data/README.md

@@ -30,46 +30,61 @@ This will sets starter config/rna.rb and config/s3.yml files.
 ```ruby
 # This is starter example rna template.
 # This is meant be be modified to your needs.
-###################################
-# Settings
-default_inherits 'base'
-global(:except => 'base') do
-  set 'framework_env', 'production'
-end
-
-###################################
+default_includes 'base'
+# Pre processing rules that run at the beginning
 pre_rule do
-  set 'chef_branch', 'prod' if role =~ /^prod/
-  set 'chef_branch', 'master' if role =~ /^stag/
+  if role != 'base'
+    node[:application] = nil
+    node[:deploy_code] = false
+    node[:framework_env] = 'production'
+    node[:repository] = nil
+  end
+
+  node[:pre_rule] = 1
+  node[:chef_branch] = 'prod' if role =~ /^prod/
+  node[:chef_branch] = 'master' if role =~ /^stag/
 end
 
-###################################
+settings(
+  :sendgrid => {
+    :relayhost => "smtp.sendgrid.net"
+  }
+)
+
 # Roles
-# base
 role 'base' do
-  run_list ['base']
+  role_list ['base']
 end
+
 # api
 role 'prod-api-redis', 'stag-api-redis' do
   run_list ['base','api_redis']
 end
 role 'prod-api-app', 'stag-api-app' do
   run_list ['base','api_app']
-  set 'application', 'api'
-  set 'deploy_code', true
-  set 'repository', 'git@github.com:br/api.git'
+  node[:application] = 'api'
+  node[:deploy_code] = true
+  node[:repository] = 'git@github.com:br/api.git'
 end
 role 'prod-api-resque', 'stag-api-resque' do
-  inherits 'prod-api-app'
+  includes 'prod-api-app'
   run_list ['base','api_resque']
-  set 'workers', 8
+  node[:workers], 8
 end
 
-###################################
+
 # Post processing rules that run at the end
 post_rule do
-  set 'framework_env', 'production' if role =~ /^prod/
-  set 'framework_env', 'staging' if role =~ /^stag/
+  node[:post_rule] = 2
+  node[:framework_env] = 'production' if role =~ /^prod/
+  node[:framework_env] = 'staging' if role =~ /^stag/
+
+  list = role.split('-')
+  if list.size == 3
+    env, repo, role = list
+    role_list ['base', "#{repo}_#{role}"]
+    node[:application] = repo
+  end
 end
 ```
 
@@ -77,16 +92,18 @@ end
 $ rna generate
 </pre>
 
-Here's the example of the output looks like:
+Here is the example of the output looks like:
 
 output/base.json:
 
 ```json
 {
+  "pre_rule": 1,
   "role": "base",
   "run_list": [
-    "base"
-  ]
+    "role[base]"
+  ],
+  "post_rule": 2
 }
 ```
 
@@ -94,15 +111,17 @@ output/prod-api-app.json:
 
 ```json
 {
-  "framework_env": "production",
+  "pre_rule": 1,
   "role": "prod-api-app",
   "run_list": [
-    "base",
-    "api_app"
+    "role[base]",
+    "role[api_app]"
   ],
   "application": "api",
   "deploy_code": true,
-  "repository": "git@github.com:br/api.git"
+  "repository": "git@github.com:br/api.git",
+  "post_rule": 2,
+  "framework_env": "production"
 }
 ```
 
@@ -110,12 +129,15 @@ output/prod-api-redis.json:
 
 ```json
 {
-  "framework_env": "production",
+  "pre_rule": 1,
   "role": "prod-api-redis",
   "run_list": [
-    "base",
-    "api_redis"
-  ]
+    "role[base]",
+    "role[api_redis]"
+  ],
+  "post_rule": 2,
+  "framework_env": "production",
+  "application": "api"
 }
 ```
 
@@ -123,16 +145,18 @@ output/prod-api-resque.json:
 
 ```json
 {
-  "framework_env": "production",
+  "pre_rule": 1,
   "role": "prod-api-resque",
   "run_list": [
-    "base",
-    "api_resque"
+    "role[base]",
+    "role[api_resque]"
   ],
   "application": "api",
   "deploy_code": true,
   "repository": "git@github.com:br/api.git",
-  "workers": 8
+  "workers": 8,
+  "post_rule": 2,
+  "framework_env": "production"
 }
 ```
 
@@ -140,15 +164,17 @@ output/stag-api-app.json:
 
 ```json
 {
-  "framework_env": "staging",
+  "pre_rule": 1,
   "role": "stag-api-app",
   "run_list": [
-    "base",
-    "api_app"
+    "role[base]",
+    "role[api_app]"
   ],
   "application": "api",
   "deploy_code": true,
-  "repository": "git@github.com:br/api.git"
+  "repository": "git@github.com:br/api.git",
+  "post_rule": 2,
+  "framework_env": "staging"
 }
 ```
 
@@ -156,12 +182,15 @@ output/stag-api-redis.json:
 
 ```json
 {
-  "framework_env": "staging",
+  "pre_rule": 1,
   "role": "stag-api-redis",
   "run_list": [
-    "base",
-    "api_redis"
-  ]
+    "role[base]",
+    "role[api_redis]"
+  ],
+  "post_rule": 2,
+  "framework_env": "staging",
+  "application": "api"
 }
 ```
 
@@ -169,16 +198,18 @@ output/stag-api-resque.json:
 
 ```json
 {
-  "framework_env": "staging",
+  "pre_rule": 1,
   "role": "stag-api-resque",
   "run_list": [
-    "base",
-    "api_resque"
+    "role[base]",
+    "role[api_resque]"
   ],
   "application": "api",
   "deploy_code": true,
   "repository": "git@github.com:br/api.git",
-  "workers": 8
+  "workers": 8,
+  "post_rule": 2,
+  "framework_env": "staging"
 }
 ```
 
@@ -211,20 +242,20 @@ An example is in the spec/project folder:
 You might want a shared settings hash that you can use in only some of your roles.  
 
 ```ruby
-settings(
-  'foo' => 1
-)
+settings do
+  node[:foo] = 1
+end
 ```
 
 You can use this any where in your roles.
 
 ```ruby
 role 'role1' do
-  set 'foo', settings['foo']
+  node[:foo] = settings[:foo]
 end
 
 role 'role2' do
-  set 'foo', settings['foo']
+  node[:foo] = settings[:foo]
 end
 
 role 'role3' do

data/lib/files/rna.rb

@@ -1,43 +1,56 @@
 # This is starter example rna template.
 # This is meant be be modified to your needs.
-###################################
-# Settings
-default_inherits 'base'
-global(:except => 'base') do
-  set 'framework_env', 'production'
+default_includes 'base'
+# Pre processing rules that run at the beginning
+pre_rule do
+  if role != 'base'
+    node[:application] = nil
+    node[:deploy_code] = false
+    node[:framework_env] = 'production'
+    node[:repository] = nil
+  end
+
+  node[:pre_rule] = 1
+  node[:chef_branch] = 'prod' if role =~ /^prod/
+  node[:chef_branch] = 'master' if role =~ /^stag/
 end
 
-###################################
-pre_rule do
-  set 'chef_branch', 'prod' if role =~ /^prod/
-  set 'chef_branch', 'master' if role =~ /^stag/
+settings do
+  node[:sendgrid][:relayhost] = "smtp.sendgrid.net"
 end
 
-###################################
 # Roles
-# base
 role 'base' do
-  run_list ['base']
+  role_list ['base']
 end
+
 # api
 role 'prod-api-redis', 'stag-api-redis' do
   run_list ['base','api_redis']
 end
 role 'prod-api-app', 'stag-api-app' do
   run_list ['base','api_app']
-  set 'application', 'api'
-  set 'deploy_code', true
-  set 'repository', 'git@github.com:br/api.git'
+  node[:application] = 'api'
+  node[:deploy_code] = true
+  node[:repository] = 'git@github.com:br/api.git'
 end
 role 'prod-api-resque', 'stag-api-resque' do
-  inherits 'prod-api-app'
+  includes 'prod-api-app'
   run_list ['base','api_resque']
-  set 'workers', 8
+  node[:workers] = 8
 end
 
-###################################
+
 # Post processing rules that run at the end
 post_rule do
-  set 'framework_env', 'production' if role =~ /^prod/
-  set 'framework_env', 'staging' if role =~ /^stag/
+  node[:post_rule] = 2
+  node[:framework_env] = 'production' if role =~ /^prod/
+  node[:framework_env] = 'staging' if role =~ /^stag/
+
+  list = role.split('-')
+  if list.size == 3
+    env, repo, role = list
+    role_list ['base', "#{repo}_#{role}"]
+    node[:application] = repo
+  end
 end

data/lib/node.rb

@@ -0,0 +1,55 @@
+class Node < Hash
+  class Attribute
+    attr_reader :value
+    def initialize(value)
+      @value = value
+    end
+    def [](key)
+      puts "Node::Attribute key #{key}"
+      nil
+    end
+  end
+
+  def initialize
+    @data = {}
+    super
+  end
+
+  def []=(key,value)
+    key = convert_key(key)
+    result = super
+    attribute = Attribute.new(result)
+    @data[key] = attribute
+  end
+
+  def [](key)
+    key = convert_key(key)
+    if @data[key].nil?
+      result = @data[key] = Node.new
+    elsif @data[key].is_a?(Node::Attribute)
+      result = @data[key].value
+    elsif @data[key].is_a?(Node)
+      result = @data[key]
+    else
+      raise "should never happen"
+    end
+    result
+  end
+
+  def to_hash
+    hash = {}
+    @data.each do |key,item|
+      if item.is_a?(Node)
+        hash[key] = item.to_hash
+      else
+        hash[key] = item.value
+      end
+    end
+    hash
+  end
+
+private
+  def convert_key(key)
+    key.to_sym
+  end
+end

data/lib/rna.rb

@@ -5,6 +5,7 @@ require 'aws-sdk'
 require 'pp'
 
 $:.unshift File.dirname(__FILE__)
+require 'node'
 require 'rna/version'
 require 'rna/cli'
 require 'rna/task'

data/lib/rna/dsl.rb

@@ -1,11 +1,10 @@
 module Rna
   class DSL
-    attr_reader :data, :jsons
+    attr_reader :data, :jsons, :settings_node
     def initialize(options={})
       @options = options
 
       @path = options[:config_path] || 'config/rna.rb'
-      @global_attributes = nil
       @pre_rule = nil
       @post_rule = nil
       @roles = []
@@ -23,22 +22,18 @@ module Rna
       end
     end
 
-    def settings(*data)
-      # reader method
-      if data.empty?
-        @settings
-      # writer method
-      else
-        @settings = data[0]
-      end
+    def settings_node
+      @settings_node ||= Node.new
     end
+    alias_method :set, :settings_node
+    alias_method :node, :settings_node
 
-    def global(options={},&block)
-      @global = {:options => options, :block => block}
+    def settings(&block)
+      instance_eval(&block)
     end
 
-    def default_inherits(role)
-      Role.default_inherits = role
+    def default_includes(role)
+      Role.default_includes = role
     end
 
     def pre_rule(&block)
@@ -65,24 +60,17 @@ module Rna
     end
 
     def build
-      @data = {
-        'global' => nil,
-        'roles' => []
-      }
-      # build global attributes
-      @data['global'] = Global.new(@global[:options], @global[:block]).build
-
+      @data = {:roles => []}
       # build roles
       @roles.each do |r|
-        @data['roles'] << Role.new(r[:name], r[:block], @options).build
+        @data[:roles] << Role.new(r[:name], r[:block], @options).build
       end
-
       @data
     end
 
     def process
       @jsons = {}
-      roles = @data['roles'].collect{|h| h['name']}
+      roles = @data[:roles].collect{|h| h[:name]}
       roles.each do |role|
         @jsons[role] = process_role(role)
       end
@@ -90,34 +78,28 @@ module Rna
     end
 
     # builds node.json hash
-    # 1. global attributes
-    # 2. pre rule
-    # 3. role, going up the inherits chain
-    # 4. post rule
-    def process_role(role, exclude_global=nil, depth=1)
-      # only compute exclude_global on on top level call and continue passing down recursive stack call
-      if exclude_global.nil?
-        exclude_global = @data['global']['except'].include?(role)
-      end
-
-      role_data = @data['roles'].find {|h| h['name'] == role}
-      inherits = role_data['inherits']
-      if inherits
-        json = process_role(inherits, exclude_global, depth+1)
+    # 1. pre rule
+    # 2. role, going up the includes chain
+    # 3. post rule
+    def process_role(role, depth=1)
+      role_data = @data[:roles].find {|h| h[:name] == role}
+      includes = role_data[:includes]
+      if includes
+        json = process_role(includes, depth+1)
       else
-        json = exclude_global ? {} : @data['global']['attributes'].clone
+        json = {}
         if @pre_rule
           pre_data = Rule.new(role, @pre_rule[:block]).build
-          json.merge!(pre_data['attributes'])
+          json.merge!(pre_data[:attributes])
         end
       end
 
-      attributes = role_data['attributes'] || {}
+      attributes = role_data[:attributes] || {}
       json.merge!(attributes)
       # only process post rule at the very last step
       if @post_rule and depth == 1
         post_data = Rule.new(role, @post_rule[:block]).build
-        json.merge!(post_data['attributes'])
+        json.merge!(post_data[:attributes])
       end
       json
     end
@@ -125,8 +107,8 @@ module Rna
     def output(options={})
       jsons = {}
       @jsons.each do |role,data|
-        role_data = @data['roles'].find {|h| h['name'] == role}
-        if role_data['output']
+        role_data = @data[:roles].find {|h| h[:name] == role}
+        if role_data[:output]
           jsons[role] = JSON.pretty_generate(data)
         end
       end
@@ -142,26 +124,28 @@ module Rna
         if @block
           @dsl = eval "self", @block.binding
           instance_eval(&@block)
-        end
+        end        
+        @data[:attributes].merge!(set.to_hash)
         @data
       end
 
       # http://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
-      def settings(*args, &block)
-        @dsl.settings(*args, &block)
+      def settings
+        @dsl.settings_node
       end
 
-      def set(key, value)
-        @data['attributes'][key] = value
+      def node
+        @node ||= Node.new
       end
+      alias_method :set, :node
 
       def role_list(list)
         list = list.collect {|i| "role[#{i}]"}
-        set('run_list', list)
+        run_list(list)
       end
 
       def run_list(list)
-        set('run_list', list)
+        node[:run_list] = list
       end
     end
 
@@ -172,7 +156,7 @@ module Rna
         @role = role
         @block = block
         @data = {
-          'attributes' => {}
+          :attributes => {}
         }
       end
 
@@ -181,17 +165,6 @@ module Rna
       end
     end
 
-    class Global < Builder
-      def initialize(options, block)
-        @options = options
-        @block = block
-        @data = {
-          'except' => [options[:except]].compact,
-          'attributes' => {}
-        }
-      end
-    end
-
     class Role < Builder
       attr_reader :name
       def initialize(name, block, options)
@@ -200,17 +173,17 @@ module Rna
         @options = options
 
         @data = {
-          'name' => name,
-          'attributes' => {
-            'role' => name
+          :name => name,
+          :attributes => {
+            :role => name
           },
-          'inherits' => @@default_inherits != name ? @@default_inherits : nil,
-          'output' => true
+          :includes => @@default_includes != name ? @@default_includes : nil,
+          :output => true
         }
       end
 
-      def self.default_inherits=(inherits)
-        @@default_inherits = inherits
+      def self.default_includes=(includes)
+        @@default_includes = includes
       end
         
       def role
@@ -218,12 +191,12 @@ module Rna
       end
 
       def output(val)
-        @data['output'] = val
+        @data[:output] = val
       end
 
-      def inherits(role)
-        role = nil if role == @name # can't inherit itself
-        @data['inherits'] = role
+      def includes(role)
+        role = nil if role == @name # can't include itself
+        @data[:includes] = role
       end
     end
 

data/lib/rna/version.rb

@@ -1,3 +1,3 @@
 module Rna
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/rna.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "json"
   gem.add_dependency "thor"
   gem.add_dependency "aws-sdk"
+  gem.add_dependency "guard-rna"
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'guard'

data/spec/lib/rna_spec.rb

@@ -16,6 +16,7 @@ describe Rna do
     FileUtils.rm_rf("#{@project_root}/output")
   end
 
+  # uncomment to look a data deeper
   # it "should build attributes" do
   #   @dsl.evaluate
   #   @dsl.build
@@ -37,32 +38,32 @@ describe Rna do
     base['run_list'].should == ["role[base]"]
   end
 
-  it "base.json should not contain global attributes" do
+  it "base.json should not contain settings attributes" do
     @dsl.run
     base = JSON.load(IO.read("#{@project_root}/output/base.json"))
     base['framework_env'].should be_nil
     base['deploy_code'].should be_nil
   end
 
-  it "prod-api-redis.json should contain base and global attributes" do
+  it "prod-api-redis.json should contain base and settings attributes" do
     @dsl.run
     json = JSON.load(IO.read("#{@project_root}/output/prod-api-redis.json"))
     json['role'].should == 'prod-api-redis'
     json['run_list'].should == ["role[base]", "role[api_redis]"]
     json['framework_env'].should == 'production'
-    json['deploy_code'].should == false
+    json['deploy_code'].should == nil
   end
 
-  it "stag-api-redis.json should contain base and global attributes and apply rules" do
+  it "stag-api-redis.json should contain base and settings attributes and apply rules" do
     @dsl.run
     json = JSON.load(IO.read("#{@project_root}/output/stag-api-redis.json"))
     json['role'].should == 'stag-api-redis'
     json['run_list'].should == ["role[base]", "role[api_redis]"]
-    json['deploy_code'].should == false
+    json['deploy_code'].should == nil
     json['framework_env'].should == 'staging' # this is tests the rule
   end
 
-  it "prod-api-app.json should contain base and global attributes" do
+  it "prod-api-app.json should contain base and settings attributes" do
     @dsl.run
     json = JSON.load(IO.read("#{@project_root}/output/prod-api-app.json"))
     json['role'].should == 'prod-api-app'
@@ -72,6 +73,14 @@ describe Rna do
     json['scout'].should be_a(Hash)
   end
 
+  it "prod-api-app.json should contain attributes from node" do
+    @dsl.run
+    json = JSON.load(IO.read("#{@project_root}/output/prod-api-app.json"))
+    json['database']['user'].should == 'user'
+    json['database']['pass'].should == 'pass'
+    json['database']['host'].should == 'host'
+  end
+
   it "prod-api-app.json should contain pre and post rules" do
     @dsl.run
     json = JSON.load(IO.read("#{@project_root}/output/prod-api-app.json"))
@@ -151,4 +160,67 @@ describe Rna do
     json['framework_env'].should == 'production'
     json['scout'].should be_a(Hash)
   end
+end
+
+describe Node do
+  before(:each) do
+    @node = Node.new
+  end
+
+  it "should be able to set multiple levels deep even" do
+    @node[:a][:b][:c] = 2
+    @node[:a][:b][:c].should == 2
+  end
+
+  it "should convert to a hash with symbols as keys" do
+    @node[:a][:b][:c] = 2
+    @node[:a][:b][:c].should == 2
+    hash = @node.to_hash
+    # uncomment to see hash structure
+    # pp hash
+    # pp hash[:a][:b]
+    hash[:a][:b][:c].should == 2
+  end
+
+  it "should raise error if namespace is a non-node value and you try to access a value below that" do
+    @node[:a][:b] = 4
+    # this errors because it will run: 4[:c]
+    expect { @node[:a][:b][:c].class.should be_a(Node) }.to raise_error(TypeError)
+  end
+
+  it "should not adjust values set in other namespaces" do
+    @node[:a][:b][:c] = 2
+    @node[:a][:b][:c].should == 2
+    @node[:a][:b2] = 3
+    @node[:a][:b2].should == 3
+    @node[:a][:b][:c].should == 2
+    @node[:a][:b2].should == 3
+    @node[:a][:b3][:c] = 5
+    @node[:a][:b3][:c].should == 5
+  end
+
+  it "should behave like a mash" do
+    @node[:a][:b] = 4
+    @node[:a][:b].should == 4
+    @node[:a]['b'].should == 4
+
+    @node[:a]['c'] = 5
+    @node[:a][:c].should == 5
+    @node[:a]['c'].should == 5
+  end
+
+  it "should default to an empty Node object if never been set" do
+    @node[:one].should be_a(Node)
+    @node[:all][:roads][:lead][:to][:nothing].should be_a(Node)
+  end
+
+  it "should be able to set nil" do
+    @node[:a][:b4][:c] = nil
+    @node[:a][:b4][:c].should == nil
+  end
+
+  it "should be able to set false" do
+    @node[:a][:b4][:c] = false
+    @node[:a][:b4][:c].should == false
+  end
 end

data/spec/project/config/rna.rb

@@ -1,44 +1,37 @@
-###################################
-# Settings
-default_inherits 'base'
-global(:except => 'base') do
-  set 'application', nil
-  set 'deploy_code', false
-  set 'framework_env', 'production'
-  set 'repository', nil
+default_includes 'base'
+# Pre processing rules that run at the beginning
+pre_rule do
+  if role != 'base'
+    node[:application] = nil
+    node[:deploy_code] = false
+    node[:framework_env] = 'production'
+    node[:repository] = nil
+  end
+
+  node[:pre_rule] = 1
+  node[:chef_branch] = 'prod' if role =~ /^prod/
+  node[:chef_branch] = 'master' if role =~ /^stag/
 end
 
-###################################
-pre_rule do
-  set 'pre_rule', 1
-  set 'chef_branch', 'prod' if role =~ /^prod/
-  set 'chef_branch', 'master' if role =~ /^stag/
+settings do
+  node[:sendgrid][:relayhost] = "smtp.sendgrid.net"
 end
 
-###################################
 # Roles
-# base
 role 'base' do
   role_list ['base']
 end
 
-settings(
-  'sendgrid' => {
-    "relayhost"=>"smtp.sendgrid.net"
-  }
-)
-
-###################################
 # Post processing rules that run at the end
 post_rule do
-  set 'post_rule', 2
-  set 'framework_env', 'production' if role =~ /^prod/
-  set 'framework_env', 'staging' if role =~ /^stag/
+  node[:post_rule] = 2
+  node[:framework_env] = 'production' if role =~ /^prod/
+  node[:framework_env] = 'staging' if role =~ /^stag/
 
   list = role.split('-')
   if list.size == 3
     env, repo, role = list
     role_list ['base', "#{repo}_#{role}"]
-    set 'application', repo
+    node[:application] = repo
   end
 end

data/spec/project/config/rna/api.rb

@@ -1,19 +1,19 @@
 # api
 role 'prod-api-redis', 'stag-api-redis'
 role 'prod-api-resque', 'stag-api-resque' do
-  inherits 'prod-api-app'
-  set 'workers', 8
+  includes 'prod-api-app'
+  node[:workers] = 8
 end
 role 'prod-api-app', 'stag-api-app' do
   role_list ['base','api_app']
-  set 'application', 'api'
-  set 'deploy_code', true
-  set 'repository', 'git@github.com:br/api.git'
-  set 'scout', {
-        'key' => 'abc',
-        'gems' => {
-          'redis' => nil
-        }
-      }
-  set 'relayhost', settings['sendgrid']['relayhost']
-end
+  node[:application] = 'api'
+  node[:deploy_code] = true
+  node[:repository] = 'git@github.com:br/api.git'
+  node[:scout][:key] = 'abc'
+  node[:scout][:gems] = {'redis' => nil}
+  node[:relayhost] = settings[:sendgrid][:relayhost]
+
+  node[:database][:user] = 'user'
+  node[:database][:pass] = 'pass'
+  node[:database][:host] = 'host'
+end

data/spec/project/config/rna/masta.rb

@@ -1,13 +1,13 @@
 # masta
 role 'masta-app' do
   output false
-  set 'masta_app', 123
+  node[:masta_app] = 123
 end
 role 'prod-masta-redis', 'stag-masta-redis'
 role 'prod-masta-android', 'stag-masta-android' do
-  inherits 'masta-app'
-  set 'application', 'masta'
-  set 'deploy_code', true
-  set 'repository', 'git@github.com:arockwell/masta_blasta.git'
-  set 'relayhost', settings['sendgrid']['relayhost']
-end
+  includes 'masta-app'
+  node[:application] = 'masta'
+  node[:deploy_code] = true
+  node[:repository] = 'git@github.com:arockwell/masta_blasta.git'
+  node[:relayhost] = settings[:sendgrid][:relayhost]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rna
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +195,7 @@ files:
 - lib/files/Guardfile
 - lib/files/rna.rb
 - lib/files/s3.yml
+- lib/node.rb
 - lib/rna.rb
 - lib/rna/cli.rb
 - lib/rna/dsl.rb
@@ -205,18 +222,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3576656030338073956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3576656030338073956
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24