rna 0.1.7 → 0.2.0

data/Guardfile

@@ -4,6 +4,7 @@ end
 
 guard 'rspec' do
   watch(%r{^spec/.+_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('spec/spec_helper.rb')  { "spec" }
 end

data/README.md

@@ -35,15 +35,14 @@ Example rna.rb file
 ###################################
 # Settings
 default_inherits 'base'
-global_attributes(:except => ['base']) do
+global(:except => 'base') do
   set 'framework_env', 'production'
 end
 
 ###################################
-# Post processing rules that run at the end
-rule do
-  set 'framework_env', 'production' if name =~ /^prod/
-  set 'framework_env', 'staging' if name =~ /^stag/
+pre_rule do
+  set 'chef_branch', 'prod' if role =~ /^prod/
+  set 'chef_branch', 'master' if role =~ /^stag/
 end
 
 ###################################
@@ -67,21 +66,123 @@ role 'prod-api-resque', 'stag-api-resque' do
   run_list ['base','api_resque']
   set '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/
+end
 ```
 
 <pre>
-$ rna build
+$ rna generate
 </pre>
 
-If you're using the starter config/rna.rb, this should build:
+Here's the example of the output looks like:
+
+output/base.json:
+
+```json
+{
+  "role": "base",
+  "run_list": [
+    "base"
+  ]
+}
+```
+
+output/prod-api-app.json:
+
+```json
+{
+  "framework_env": "production",
+  "role": "prod-api-app",
+  "run_list": [
+    "base",
+    "api_app"
+  ],
+  "application": "api",
+  "deploy_code": true,
+  "repository": "git@github.com:br/api.git"
+}
+```
 
-* nodejson/base.json
-* nodejson/prod-api-app.json
-* nodejson/prod-api-redis.json
-* nodejson/prod-api-resque.json
-* nodejson/stag-api-app.json
-* nodejson/stag-api-redis.json
-* nodejson/stag-api-resque.json
+output/prod-api-redis.json:
+
+```json
+{
+  "framework_env": "production",
+  "role": "prod-api-redis",
+  "run_list": [
+    "base",
+    "api_redis"
+  ]
+}
+```
+
+output/prod-api-resque.json:
+
+```json
+{
+  "framework_env": "production",
+  "role": "prod-api-resque",
+  "run_list": [
+    "base",
+    "api_resque"
+  ],
+  "application": "api",
+  "deploy_code": true,
+  "repository": "git@github.com:br/api.git",
+  "workers": 8
+}
+```
+
+output/stag-api-app.json:
+
+```json
+{
+  "framework_env": "staging",
+  "role": "stag-api-app",
+  "run_list": [
+    "base",
+    "api_app"
+  ],
+  "application": "api",
+  "deploy_code": true,
+  "repository": "git@github.com:br/api.git"
+}
+```
+
+output/stag-api-redis.json:
+
+```json
+{
+  "framework_env": "staging",
+  "role": "stag-api-redis",
+  "run_list": [
+    "base",
+    "api_redis"
+  ]
+}
+```
+
+output/stag-api-resque.json:
+
+```json
+{
+  "framework_env": "staging",
+  "role": "stag-api-resque",
+  "run_list": [
+    "base",
+    "api_resque"
+  ],
+  "application": "api",
+  "deploy_code": true,
+  "repository": "git@github.com:br/api.git",
+  "workers": 8
+}
+```
 
 <pre>
 $ rna build -o s3 # saves s3 based on config/s3.yml settings
@@ -93,5 +194,5 @@ The config/s3.yml should look like this:
 access_key_id: hocuspocus
 secret_access_key: opensesame
 bucket: my-bucket
-folder: chef/nodejson
+folder: chef/rna
 ```

data/lib/files/rna.rb

@@ -3,15 +3,14 @@
 ###################################
 # Settings
 default_inherits 'base'
-global_attributes(:except => ['base']) do
+global(:except => 'base') do
   set 'framework_env', 'production'
 end
 
 ###################################
-# Post processing rules that run at the end
-rule do
-  set 'framework_env', 'production' if name =~ /^prod/
-  set 'framework_env', 'staging' if name =~ /^stag/
+pre_rule do
+  set 'chef_branch', 'prod' if role =~ /^prod/
+  set 'chef_branch', 'master' if role =~ /^stag/
 end
 
 ###################################
@@ -34,4 +33,11 @@ role 'prod-api-resque', 'stag-api-resque' do
   inherits 'prod-api-app'
   run_list ['base','api_resque']
   set '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/
 end

data/lib/rna.rb

@@ -7,6 +7,6 @@ require 'pp'
 $:.unshift File.dirname(__FILE__)
 require 'rna/version'
 require 'rna/cli'
-require 'rna/tasks'
+require 'rna/task'
 require 'rna/dsl'
 require 'rna/outputers'

data/lib/rna/cli.rb

@@ -4,24 +4,24 @@ module Rna
     desc "init", "Setup rna project"
     long_desc "Sets up config/rna.rb"
     def init
-      Rna::Tasks.init
+      Rna::Task.init
     end
 
-    desc "build", "Builds node.json files"
+    desc "generate", "Builds node.json files"
     long_desc <<EOL
 Examples:
 
-1. rna build 
+1. rna generate
 
 Builds the node.json files based on config/rna.rb and writes them to the ouput folder on the filesystem.
 
-2. rna build -o s3 
+2. rna generate -o s3 
 
 Builds the node.json files based on config/rna.rb and writes them to s3 based on the s3 settings in config/s3.yml.  
 EOL
     method_option :output, :aliases => '-o', :desc => "specify where to output the generated files to", :default => 'filesystem'
-    def build
-      Rna::Tasks.build(options.dup.merge(:verbose => true))
+    def generate
+      Rna::Task.generate(options.dup.merge(:verbose => true))
     end
   end
   

data/lib/rna/dsl.rb

@@ -1,66 +1,116 @@
 module Rna
   class DSL
-    @@default_inherits = nil
-    attr_reader :attributes, :rules, :nodejsons
-    def initialize(config_path='config/rna.rb')
-      @path = config_path
-      @scope = nil
-      @rules = []
+    attr_reader :data, :jsons
+    def initialize(options={})
+      @options = options
+
+      @path = options[:config_path] || 'config/rna.rb'
+      @global_attributes = nil
+      @pre_rule = nil
+      @post_rule = nil
       @roles = []
-      @attributes = {}
-      @nodejsons = {}
     end
 
     def evaluate
       instance_eval(File.read(@path), @path)
     end
 
+    def global(options={},&block)
+      @global = {:options => options, :block => block}
+    end
+
+    def default_inherits(role)
+      Role.default_inherits = role
+    end
+
+    def pre_rule(&block)
+      @pre_rule = {:block => block}
+    end
+
+    def post_rule(&block)
+      @post_rule = {:block => block}
+    end
+
+    def role(*names, &block)
+      names.each {|name| each_role(name, &block) }
+    end
+
+    def each_role(name, &block)
+      @roles << {:name => name, :block => block}
+    end
+
+    def run
+      evaluate
+      build
+      process
+      @options.empty? ? output : output(@options)
+    end
+
     def build
-      # process roles
-      @roles.each do |role|
-        @nodejsons[role] = process_role(role)
+      @data = {
+        'global' => nil,
+        'roles' => []
+      }
+      # build global attributes
+      @data['global'] = Global.new(@global[:options], @global[:block]).build
+
+      # build roles
+      @roles.each do |r|
+        @data['roles'] << Role.new(r[:name], r[:block], @options).build
       end
-      @nodejsons
+
+      @data
     end
-          
-    # builds node.json
+
+    def process
+      @jsons = {}
+      roles = @data['roles'].collect{|h| h['name']}
+      roles.each do |role|
+        @jsons[role] = process_role(role)
+      end
+      @jsons
+    end
+
+    # builds node.json hash
     # 1. global attributes
-    # 2. parent inherited attributes all the way up the inheritance chain
-    #    each descendent role overrides it's parent role
-    # 3. final attributes from the desired role is built last
-    def process_role(role, exclude_global=nil)
+    # 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 = @attributes['global']['except'].include?(role)
+        exclude_global = @data['global']['except'].include?(role)
       end
 
-      inherits = @attributes[role]['inherits']
+      role_data = @data['roles'].find {|h| h['name'] == role}
+      inherits = role_data['inherits']
       if inherits
-        nodejson = process_role(inherits, exclude_global)
+        json = process_role(inherits, exclude_global, depth+1)
       else
-        if exclude_global
-          nodejson = {}
-        else
-          attributes = @attributes['global']['attributes'] || {}
-          nodejson = attributes.clone
+        json = exclude_global ? {} : @data['global']['attributes'].clone
+        if @pre_rule
+          pre_data = Rule.new(role, @pre_rule[:block]).build
+          json.merge!(pre_data['attributes'])
         end
       end
 
-      # apply each rule to each role's attributes before we do the merge
-      @rules.each do |block|
-        set_scope(role)
-        self.instance_eval(&block)
+      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'])
       end
-
-      attributes = @attributes[role]['attributes'] || {}
-      nodejson.merge!(attributes)
-      nodejson
+      json
     end
 
     def output(options={})
       jsons = {}
-      nodejsons.each do |role,data|
-        jsons[role] = JSON.pretty_generate(data)
+      @jsons.each do |role,data|
+        role_data = @data['roles'].find {|h| h['name'] == role}
+        if role_data['output']
+          jsons[role] = JSON.pretty_generate(data)
+        end
       end
 
       outputer = options[:output] || 'filesystem'
@@ -69,62 +119,87 @@ module Rna
       outputer_class.new(options).run(jsons)
     end
 
-    # must be called before every instance_eval of the dsl to set the @scope
-    def set_scope(scope,type=Hash)
-      @scope = scope
-      @attributes[@scope] ||= type.new
-    end
+    class Builder
+      def build
+        instance_eval(&@block) if @block
+        @data
+      end
 
-    def global_attributes(options={},&block)
-      set_scope('global')
-      @attributes['global']['except'] = [options[:except]].flatten
-      self.instance_eval(&block)
-    end
-    def default_inherits(role)
-      @@default_inherits = role
-    end
-    # rules are stored in a different place than attributes
-    def rule(name=nil,&block)
-      @rules << block
-    end
-    def role(*names,&block)
-      names.each do |name|
-        evaluate_role(name,&block)
+      def set(key, value)
+        @data['attributes'][key] = value
       end
     end
-    def evaluate_role(name,&block)
-      @roles << name
-      set_scope(name)
-      instance_eval(&default_block)
-      instance_eval(&block) if block_given?
-    end
 
-    def default_block
-      Proc.new do
-        @attributes[@scope]['name'] = @scope
-        set 'role', name
-        inherits @@default_inherits
+    # rules get processed scoed to a specific role
+    class Rule < Builder
+      attr_reader :role
+      def initialize(role, block)
+        @role = role
+        @block = block
+        @data = {
+          'attributes' => {}
+        }
       end
-    end
 
-    # methods in blocks, right now I'm mixing all the methods from role, rule, global_attributes together, because there's not a lot and its simple this way
-    # methods rely on @scope being already via set_scope method
-    def name
-      @attributes[@scope]['name']
-    end
-    def set(key, value)
-      # puts "%%% @scope #{@scope.inspect}"
-      # pp @attributes
-      @attributes[@scope]['attributes'] ||= {}
-      @attributes[@scope]['attributes'][key] = value
+      def name
+        @role
+      end
     end
-    def inherits(role)
-      role = nil if role == @scope # can't inherit itself
-      @attributes[@scope]['inherits'] = role
+
+    class Global < Builder
+      def initialize(options, block)
+        @options = options
+        @block = block
+        @data = {
+          'except' => [options[:except]].compact,
+          'attributes' => {}
+        }
+      end
     end
-    def run_list(list)
-      list = list.collect {|i| "role[#{i}]"}
-      set('run_list', list)
+
+    class Role < Builder
+      attr_reader :name
+      def initialize(name, block, options)
+        @name = name
+        @block = block
+        @options = options
+
+        @data = {
+          'name' => name,
+          'attributes' => {
+            'role' => name
+          },
+          'inherits' => @@default_inherits != name ? @@default_inherits : nil,
+          'output' => true
+        }
+      end
+
+      def self.default_inherits=(inherits)
+        @@default_inherits = inherits
+      end
+        
+      def role
+        @name
+      end
+
+      def output(val)
+        @data['output'] = val
+      end
+
+      def inherits(role)
+        role = nil if role == @name # can't inherit itself
+        @data['inherits'] = role
+      end
+
+      def role_list(list)
+        list = list.collect {|i| "role[#{i}]"}
+        set('run_list', list)
+      end
+
+      def run_list(list)
+        set('run_list', list)
+      end
     end
+
   end
 end

data/lib/rna/{tasks.rb → task.rb}

@@ -1,5 +1,5 @@
 module Rna
-  class Tasks
+  class Task
     def self.init(project_root=".",options={})
       puts "Settin up rna project" unless options[:quiet]
       FileUtils.mkdir("#{project_root}/config") unless File.exist?("#{project_root}/config")
@@ -15,22 +15,16 @@ module Rna
         end
       end
     end
-    def self.build(options)
-      new(options).build
+    def self.generate(options)
+      new(options).generate
     end
 
     def initialize(options={})
       @options = options
-      if options[:config_path]
-        @dsl = DSL.new(options[:config_path])
-      else
-        @dsl = DSL.new
-      end
+      @dsl = options[:config_path] ? DSL.new(options) : DSL.new
     end
-    def build
-      @dsl.evaluate
-      @dsl.build
-      @dsl.output(@options)
+    def generate
+      @dsl.run
     end
   end
 end

data/lib/rna/version.rb

@@ -1,3 +1,3 @@
 module Rna
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

data/spec/lib/rna_spec.rb

@@ -6,117 +6,46 @@ describe Rna do
   before(:each) do
     @project_root = File.expand_path("../../project", __FILE__)
     @project2_root = File.expand_path("../../project2", __FILE__)
-    @dsl = Rna::DSL.new("#{@project_root}/config/rna.rb")
-    @dsl.evaluate
+    @dsl = Rna::DSL.new(
+      :config_path => "#{@project_root}/config/rna.rb",
+      :output_path => "#{@project_root}/output"
+    )
   end
 
   after(:each) do
     FileUtils.rm_rf("#{@project_root}/output")
   end
 
-  it "evaluate global attributes data to be used later to merge the nodejson structures together" do
-    attributes = @dsl.attributes
-    attributes.should be_a(Hash)
-    # pp attributes
-    attributes['global']['attributes']['application'].should be_nil
-    attributes['global']['attributes']['deploy_code'].should be_false
-    attributes['global']['attributes']['framework_env'].should == 'production'
-    attributes['global']['attributes']['repository'].should be_nil
-  end
-
-  it "evaluate base attributes data that does not include the global attributes" do
-    attributes = @dsl.attributes
-    attributes.should be_a(Hash)
-    attributes['base']['attributes'].keys.should_not include('application')
-    attributes['base']['attributes']['run_list'].should == ["role[base]"]
-  end
-
-  it "evaluate base attributes data should not inherit itself" do
-    attributes = @dsl.attributes
-    attributes.should be_a(Hash)
-    attributes['base']['inherits'].should be_nil
-  end
-
-  it "roles without blocks should run the default block" do
-    attributes = @dsl.attributes
-    # running the default block will set inherits attribute
-    attributes['prod-api-redis']['inherits'].should == 'base'
-  end
-
-  it "roles with blocks should run the default block and then their own block" do
-    attributes = @dsl.attributes
-    # hard to read test, but after the default block runs, the passed in role block rusn and overrides the default_blocks inherits attribuute
-    attributes['prod-api-resque']['inherits'].should == 'prod-api-app'
-  end
-
-  it "roles with blocks should override the global attributes" do
-    attributes = @dsl.attributes
-    attributes['prod-masta-android']['attributes']['application'].should == 'masta'
-    attributes['prod-masta-android']['attributes']['deploy_code'].should be_true
-    attributes['prod-masta-android']['attributes']['repository'].should == 'git@github.com:arockwell/masta_blasta.git'
-  end
-
-  it "base node.json should not include global attributes" do
-    @dsl.build
-    @dsl.nodejsons['base']['run_list'].should == ["role[base]"]
-    @dsl.nodejsons['base']['role'].should == 'base'
-    @dsl.nodejsons['base'].keys.should_not include('application')
-    @dsl.nodejsons['base'].keys.should_not include('repository')
-  end
-
-  it "prod-api-redis node.json should include base plus global attributes" do
-    @dsl.build
-    @dsl.nodejsons['prod-api-redis']['run_list'].should == ["role[base]"]
-    @dsl.nodejsons['prod-api-redis']['deploy_code'].should be_false
-  end
-
-  it "prod-api-app node.json should include global attributes plus additional attributes" do
-    @dsl.build
-    @dsl.nodejsons['prod-api-app']['run_list'].should == ["role[base]", "role[api_app]"]
-    @dsl.nodejsons['prod-api-app']['deploy_code'].should be_true
-    @dsl.nodejsons['prod-api-app'].keys.should include('scout')
-  end
-
-  it "prod-api-resque node.json inherit attributes from prod-api-app" do
-    @dsl.build
-    @dsl.nodejsons['prod-api-resque']['run_list'].should == @dsl.nodejsons['prod-api-app']['run_list']
-    @dsl.nodejsons['prod-api-resque']['deploy_code'].should == @dsl.nodejsons['prod-api-app']['deploy_code']
-  end
-
-  it "should respect rules and change framework_env" do
-    @dsl.build
-    @dsl.nodejsons['stag-masta-android']['application'].should == 'masta'
-    @dsl.nodejsons['stag-masta-android']['framework_env'].should == 'staging'
-    @dsl.nodejsons['prod-masta-android']['framework_env'].should == 'production'
-    @dsl.nodejsons
-  end
+  # it "should build attributes" do
+  #   @dsl.evaluate
+  #   @dsl.build
+  #   pp @dsl.data
+  #   @dsl.process
+  #   pp @dsl.jsons
+  # end
 
   it "should write json files to outputs folder" do
-    @dsl.build
-    @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/output")
+    @dsl.run
     Dir.glob("#{@project_root}/output/*").size.should > 0
   end
 
   # complete end to end tests
   it "base.json should contain correct attributes" do
-    @dsl.build
-    @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/output")
+    @dsl.run
     base = JSON.load(IO.read("#{@project_root}/output/base.json"))
     base['role'].should == 'base'
     base['run_list'].should == ["role[base]"]
   end
 
   it "base.json should not contain global attributes" do
-    @dsl.build
-    @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/output")
+    @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
-    @dsl.build
-    @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/output")
+    @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]"]
@@ -125,8 +54,7 @@ describe Rna do
   end
 
   it "stag-api-redis.json should contain base and global attributes and apply rules" do
-    @dsl.build
-    @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/output")
+    @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]"]
@@ -135,8 +63,7 @@ describe Rna do
   end
 
   it "prod-api-app.json should contain base and global attributes" do
-    @dsl.build
-    @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/output")
+    @dsl.run
     json = JSON.load(IO.read("#{@project_root}/output/prod-api-app.json"))
     json['role'].should == 'prod-api-app'
     json['run_list'].should == ["role[base]","role[api_app]"]
@@ -145,10 +72,36 @@ describe Rna do
     json['scout'].should be_a(Hash)
   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"))
+    json['role'].should == 'prod-api-app'
+    json['run_list'].should == ["role[base]","role[api_app]"]
+    json['deploy_code'].should == true
+    json['framework_env'].should == 'production'
+    json['scout'].should be_a(Hash)
+    json['pre_rule'].should == 1
+    json['post_rule'].should == 2
+  end
+
+  it "masta-app should not generate output file" do
+    @dsl.run
+    File.exist?("#{@project_root}/output/masta-app.json").should be_false
+    File.exist?("#{@project_root}/output/prod-masta-android.json").should be_true
+    json = JSON.load(IO.read("#{@project_root}/output/prod-masta-android.json"))
+    json['masta_app'].should == 123
+  end
+
+  ###################
+
   # only run when S3=1, will need to setup spec/project/config/s3.yml
   it "should upload to s3" do
-    @dsl.build
-    outputer = @dsl.output(:output => 's3', :s3_config_path => "#{@project_root}/config/s3.yml")
+    @dsl = Rna::DSL.new(
+      :output => 's3', 
+      :s3_config_path => "#{@project_root}/config/s3.yml",
+      :config_path => "#{@project_root}/config/rna.rb"
+    )
+    outputer = @dsl.run
 
     config = outputer.config
     s3 = outputer.s3
@@ -171,14 +124,14 @@ describe Rna do
   it "task init should set up project" do
     File.exist?("#{@project2_root}/config/s3.yml").should be_false
     File.exist?("#{@project2_root}/config/rna.rb").should be_false
-    Rna::Tasks.init(@project2_root, :quiet => true)
+    Rna::Task.init(@project2_root, :quiet => true)
     File.exist?("#{@project2_root}/config/s3.yml").should be_true
     File.exist?("#{@project2_root}/config/rna.rb").should be_true
     FileUtils.rm_rf("#{@project2_root}/config")
   end
 
   it "task build should generate node.json files" do
-    Rna::Tasks.build(
+    Rna::Task.generate(
       :config_path => "#{@project_root}/config/rna.rb", 
       :output_path => "#{@project_root}/output"
     )

data/spec/project/config/rna.rb

@@ -1,7 +1,7 @@
 ###################################
 # Settings
 default_inherits 'base'
-global_attributes(:except => 'base') do
+global(:except => 'base') do
   set 'application', nil
   set 'deploy_code', false
   set 'framework_env', 'production'
@@ -9,17 +9,17 @@ global_attributes(:except => 'base') do
 end
 
 ###################################
-# Post processing rules that run at the end
-rule do
-  set 'framework_env', 'production' if name =~ /^prod/
-  set 'framework_env', 'staging' if name =~ /^stag/
+pre_rule do
+  set 'pre_rule', 1
+  set 'chef_branch', 'prod' if role =~ /^prod/
+  set 'chef_branch', 'master' if role =~ /^stag/
 end
 
 ###################################
 # Roles
 # base
 role 'base' do
-  run_list ['base']
+  role_list ['base']
 end
 # api
 role 'prod-api-redis', 'stag-api-redis'
@@ -28,7 +28,7 @@ role 'prod-api-resque', 'stag-api-resque' do
   set 'workers', 8
 end
 role 'prod-api-app', 'stag-api-app' do
-  run_list ['base','api_app']
+  role_list ['base','api_app']
   set 'application', 'api'
   set 'deploy_code', true
   set 'repository', 'git@github.com:br/api.git'
@@ -40,9 +40,22 @@ role 'prod-api-app', 'stag-api-app' do
       }
 end
 # masta
+role 'masta-app' do
+  output false
+  set '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'
+end
+
+###################################
+# 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/
 end

data/spec/project/config/s3.example.yml

@@ -1,4 +1,4 @@
 access_key_id: hocuspocus
 secret_access_key: opensesame
 bucket: my-bucket
-folder: chef/nodejson
+folder: chef/rna

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -183,23 +183,12 @@ files:
 - lib/rna/cli.rb
 - lib/rna/dsl.rb
 - lib/rna/outputers.rb
-- lib/rna/tasks.rb
+- lib/rna/task.rb
 - lib/rna/version.rb
 - rna.gemspec
 - spec/lib/rna_spec.rb
 - spec/project/config/rna.rb
 - spec/project/config/s3.example.yml
-- spec/project/nodejson/base.json
-- spec/project/nodejson/prod-api-app.json
-- spec/project/nodejson/prod-api-redis.json
-- spec/project/nodejson/prod-api-resque.json
-- spec/project/nodejson/prod-masta-android.json
-- spec/project/nodejson/prod-masta-redis.json
-- spec/project/nodejson/stag-api-app.json
-- spec/project/nodejson/stag-api-redis.json
-- spec/project/nodejson/stag-api-resque.json
-- spec/project/nodejson/stag-masta-android.json
-- spec/project/nodejson/stag-masta-redis.json
 - spec/project2/.gitkeep
 - spec/project2/Guardfile
 homepage: ''
@@ -216,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1023493738404014817
+      hash: 4553005362745989703
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1023493738404014817
+      hash: 4553005362745989703
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -237,16 +226,5 @@ test_files:
 - spec/lib/rna_spec.rb
 - spec/project/config/rna.rb
 - spec/project/config/s3.example.yml
-- spec/project/nodejson/base.json
-- spec/project/nodejson/prod-api-app.json
-- spec/project/nodejson/prod-api-redis.json
-- spec/project/nodejson/prod-api-resque.json
-- spec/project/nodejson/prod-masta-android.json
-- spec/project/nodejson/prod-masta-redis.json
-- spec/project/nodejson/stag-api-app.json
-- spec/project/nodejson/stag-api-redis.json
-- spec/project/nodejson/stag-api-resque.json
-- spec/project/nodejson/stag-masta-android.json
-- spec/project/nodejson/stag-masta-redis.json
 - spec/project2/.gitkeep
 - spec/project2/Guardfile

data/spec/project/nodejson/base.json

@@ -1,6 +0,0 @@
-{
-  "role": "base",
-  "run_list": [
-    "role[base]"
-  ]
-}

data/spec/project/nodejson/prod-api-app.json

@@ -1,17 +0,0 @@
-{
-  "application": "api",
-  "deploy_code": true,
-  "framework_env": "production",
-  "repository": "git@github.com:br/api.git",
-  "role": "prod-api-app",
-  "run_list": [
-    "role[base]",
-    "role[api_app]"
-  ],
-  "scout": {
-    "key": "abc",
-    "gems": {
-      "redis": null
-    }
-  }
-}

data/spec/project/nodejson/prod-api-redis.json

@@ -1,10 +0,0 @@
-{
-  "application": null,
-  "deploy_code": false,
-  "framework_env": "production",
-  "repository": null,
-  "role": "prod-api-redis",
-  "run_list": [
-    "role[base]"
-  ]
-}

data/spec/project/nodejson/prod-api-resque.json

@@ -1,18 +0,0 @@
-{
-  "application": "api",
-  "deploy_code": true,
-  "framework_env": "production",
-  "repository": "git@github.com:br/api.git",
-  "role": "prod-api-resque",
-  "run_list": [
-    "role[base]",
-    "role[api_app]"
-  ],
-  "scout": {
-    "key": "abc",
-    "gems": {
-      "redis": null
-    }
-  },
-  "workers": 8
-}

data/spec/project/nodejson/prod-masta-android.json

@@ -1,10 +0,0 @@
-{
-  "application": "masta",
-  "deploy_code": true,
-  "framework_env": "production",
-  "repository": "git@github.com:arockwell/masta_blasta.git",
-  "role": "prod-masta-android",
-  "run_list": [
-    "role[base]"
-  ]
-}

data/spec/project/nodejson/prod-masta-redis.json

@@ -1,10 +0,0 @@
-{
-  "application": null,
-  "deploy_code": false,
-  "framework_env": "production",
-  "repository": null,
-  "role": "prod-masta-redis",
-  "run_list": [
-    "role[base]"
-  ]
-}

data/spec/project/nodejson/stag-api-app.json

@@ -1,17 +0,0 @@
-{
-  "application": "api",
-  "deploy_code": true,
-  "framework_env": "staging",
-  "repository": "git@github.com:br/api.git",
-  "role": "stag-api-app",
-  "run_list": [
-    "role[base]",
-    "role[api_app]"
-  ],
-  "scout": {
-    "key": "abc",
-    "gems": {
-      "redis": null
-    }
-  }
-}

data/spec/project/nodejson/stag-api-redis.json

@@ -1,10 +0,0 @@
-{
-  "application": null,
-  "deploy_code": false,
-  "framework_env": "staging",
-  "repository": null,
-  "role": "stag-api-redis",
-  "run_list": [
-    "role[base]"
-  ]
-}

data/spec/project/nodejson/stag-api-resque.json

@@ -1,18 +0,0 @@
-{
-  "application": "api",
-  "deploy_code": true,
-  "framework_env": "staging",
-  "repository": "git@github.com:br/api.git",
-  "role": "stag-api-resque",
-  "run_list": [
-    "role[base]",
-    "role[api_app]"
-  ],
-  "scout": {
-    "key": "abc",
-    "gems": {
-      "redis": null
-    }
-  },
-  "workers": 8
-}

data/spec/project/nodejson/stag-masta-android.json

@@ -1,10 +0,0 @@
-{
-  "application": "masta",
-  "deploy_code": true,
-  "framework_env": "staging",
-  "repository": "git@github.com:arockwell/masta_blasta.git",
-  "role": "stag-masta-android",
-  "run_list": [
-    "role[base]"
-  ]
-}

data/spec/project/nodejson/stag-masta-redis.json

@@ -1,10 +0,0 @@
-{
-  "application": null,
-  "deploy_code": false,
-  "framework_env": "staging",
-  "repository": null,
-  "role": "stag-masta-redis",
-  "run_list": [
-    "role[base]"
-  ]
-}