rna 0.3.8 → 0.4.0

data/.gitignore

@@ -17,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 output
+spec/project

data/Guardfile

@@ -4,7 +4,6 @@ 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/rna_spec.rb" }
   # watch('spec/spec_helper.rb')  { "spec" }

data/README.md

@@ -16,8 +16,8 @@ $ gem install rna
 ## Usage
 
 <pre>
-$ mkdir rna_project
-$ cd rna_project
+$ mkdir rna
+$ cd rna
 $ rna init
 </pre>
 
@@ -32,7 +32,7 @@ This will create starter config/rna.rb and config/s3.yml files.
 # This is meant be be modified to your needs.
 default_includes 'base'
 # Pre processing rules that run at the beginning
-pre_rule do
+before do
   if role != 'base'
     node[:application] = nil
     node[:deploy_code] = false
@@ -40,7 +40,7 @@ pre_rule do
     node[:repository] = nil
   end
 
-  node[:pre_rule] = 1
+  node[:before] = 1
   node[:chef_branch] = 'prod' if role =~ /^prod/
   node[:chef_branch] = 'master' if role =~ /^stag/
 end
@@ -74,8 +74,8 @@ end
 
 
 # Post processing rules that run at the end
-post_rule do
-  node[:post_rule] = 2
+after do
+  node[:after] = 2
   node[:framework_env] = 'production' if role =~ /^prod/
   node[:framework_env] = 'staging' if role =~ /^stag/
 
@@ -120,7 +120,7 @@ If you have a lot of roles, the config/rna.rb file can get unwieldy long.  You c
 An example is in the spec/project folder:
 
 * config/rna/api.rb
-* config/rna/masta.rb
+* config/rna/blog.rb
 
 #### Generating the json files
 
@@ -134,12 +134,12 @@ base.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "base",
   "run_list": [
     "role[base]"
   ],
-  "post_rule": 2
+  "after": 2
 }
 ```
 
@@ -147,7 +147,7 @@ prod-api-app.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "prod-api-app",
   "run_list": [
     "role[base]",
@@ -162,7 +162,7 @@ prod-api-app.json:
     "pass": "pass"
   },
   "repository": "git@github.com:owner/repo.git/api.git",
-  "post_rule": 2,
+  "after": 2,
   "framework_env": "production"
 }
 ```
@@ -171,13 +171,13 @@ prod-api-redis.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "prod-api-redis",
   "run_list": [
     "role[base]",
     "role[api_redis]"
   ],
-  "post_rule": 2,
+  "after": 2,
   "framework_env": "production",
   "application": "api"
 }
@@ -187,7 +187,7 @@ prod-api-resque.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "prod-api-resque",
   "run_list": [
     "role[base]",
@@ -203,7 +203,7 @@ prod-api-resque.json:
   },
   "repository": "git@github.com:owner/repo.git/api.git",
   "workers": 8,
-  "post_rule": 2,
+  "after": 2,
   "framework_env": "production"
 }
 ```
@@ -212,7 +212,7 @@ stag-api-app.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "stag-api-app",
   "run_list": [
     "role[base]",
@@ -227,7 +227,7 @@ stag-api-app.json:
     "pass": "pass"
   },
   "repository": "git@github.com:owner/repo.git/api.git",
-  "post_rule": 2,
+  "after": 2,
   "framework_env": "staging"
 }
 ```
@@ -236,13 +236,13 @@ stag-api-redis.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "stag-api-redis",
   "run_list": [
     "role[base]",
     "role[api_redis]"
   ],
-  "post_rule": 2,
+  "after": 2,
   "framework_env": "staging",
   "application": "api"
 }
@@ -252,7 +252,7 @@ stag-api-resque.json:
 
 ```json
 {
-  "pre_rule": 1,
+  "before": 1,
   "role": "stag-api-resque",
   "run_list": [
     "role[base]",
@@ -268,7 +268,7 @@ stag-api-resque.json:
   },
   "repository": "git@github.com:owner/repo.git/api.git",
   "workers": 8,
-  "post_rule": 2,
+  "after": 2,
   "framework_env": "staging"
 }
 ```

data/{spec/project/config → config}/rna.rb

@@ -2,7 +2,7 @@
 # This is meant be be modified to your needs.
 default_includes 'base'
 # Pre processing rules that run at the beginning
-pre_rule do
+before do
   if role != 'base'
     node[:application] = nil
     node[:deploy_code] = false
@@ -10,7 +10,7 @@ pre_rule do
     node[:repository] = nil
   end
 
-  node[:pre_rule] = 1
+  node[:before] = 1
   node[:chef_branch] = 'prod' if role =~ /^prod/
   node[:chef_branch] = 'master' if role =~ /^stag/
 end
@@ -23,8 +23,8 @@ role 'base' do
 end
 
 # Post processing rules that run at the end
-post_rule do
-  node[:post_rule] = 2
+after do
+  node[:after] = 2
   node[:framework_env] = 'production' if role =~ /^prod/
   node[:framework_env] = 'staging' if role =~ /^stag/
 

data/{spec/project/config → config}/rna/api.rb

@@ -5,7 +5,6 @@ role 'prod-api-resque', 'stag-api-resque' do
   node[:workers] = 8
 end
 role 'prod-api-app', 'stag-api-app' do
-  role_list ['base','api_app']
   node[:application] = 'api'
   node[:deploy_code] = true
   node[:repository] = 'git@github.com:owner/repo.git/api.git'

data/config/rna/blog.rb

@@ -0,0 +1,13 @@
+# blog
+role 'blog-app' do
+  output false
+  node[:blog_app] = 123
+end
+role 'prod-blog-redis', 'stag-blog-redis'
+role 'prod-blog-app', 'stag-blog-app' do
+  includes 'blog-app'
+  node[:application] = 'blog'
+  node[:deploy_code] = true
+  node[:repository] = 'git@github.com:arockwell/blog_blasta.git'
+  node[:relayhost] = settings[:sendgrid][:relayhost]
+end

data/config/s3.yml

@@ -0,0 +1,4 @@
+access_key_id: 0JABDCSHH7HR4CEMM6G2
+secret_access_key: eQavuSsZRfmSiY1noIFDBy29jARbsqjHBWvPFtDK
+bucket: br-testing
+folder: chef/rna

data/lib/rna.rb

@@ -3,6 +3,7 @@ require 'thor'
 require 'yaml'
 require 'aws-sdk'
 require 'pp'
+require 'deep_merge'
 
 $:.unshift File.expand_path('../', __FILE__)
 require 'node'

data/lib/rna/cli.rb

@@ -3,8 +3,11 @@ module Rna
 
     desc "init", "Setup rna project"
     long_desc "Sets up config/rna.rb"
+    method_option :force, :type => :boolean, :aliases => "-f", :desc => "override existing starter files"
+    method_option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
+    method_option :quiet, :type => :boolean, :aliases => "-q", :desc => "silence the output"
     def init
-      Rna::Task.init
+      Rna::Task.init(options)
     end
 
     desc "generate", "Builds node.json files"
@@ -12,16 +15,18 @@ module Rna
 Examples:
 
 1. rna generate
+2. rna g -c  # shortcut
 
 Builds the node.json files based on config/rna.rb and writes them to the ouput folder on the filesystem.
 
-2. rna generate -o s3 
+3. 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'
     method_option :clean, :type => :boolean, :aliases => "-c", :desc => "remove all output files before generating"
     method_option :verbose, :type => :boolean, :aliases => "-v", :desc => "show files being generated"
+    method_option :project_root, :default => ".", :aliases => "-r", :desc => "project root"
     def generate
       Rna::Task.generate(options)
       puts "Rna files generated"

data/lib/rna/dsl.rb

@@ -2,11 +2,13 @@ module Rna
   class DSL
     attr_reader :data, :jsons
     def initialize(options={})
-      @options = options
+      @options = options.dup
+      @project_root = options[:project_root] || '.'
+      @path = "#{@project_root}/config/rna.rb"
+      @options[:output_path] = "#{@project_root}/output"
 
-      @path = options[:config_path] || 'config/rna.rb'
-      @pre_rule = nil
-      @post_rule = nil
+      @before = nil
+      @after = nil
       @roles = []
     end
 
@@ -33,12 +35,12 @@ module Rna
       Role.default_includes = role
     end
 
-    def pre_rule(&block)
-      @pre_rule = {:block => block}
+    def before(&block)
+      @before = {:block => block}
     end
 
-    def post_rule(&block)
-      @post_rule = {:block => block}
+    def after(&block)
+      @after = {:block => block}
     end
 
     def role(*names, &block)
@@ -50,6 +52,7 @@ module Rna
     end
 
     def run
+      puts "Generating rna files" unless @options[:quiet]
       evaluate
       build
       process
@@ -85,18 +88,18 @@ module Rna
         json = process_role(includes, depth+1)
       else
         json = {}
-        if @pre_rule
-          pre_data = Rule.new(role, @pre_rule[:block]).build
-          json.merge!(pre_data[:attributes])
+        if @before
+          pre_data = Rule.new(role, @before[:block]).build
+          json.deep_merge!(pre_data[:attributes])
         end
       end
 
       attributes = role_data[:attributes] || {}
-      json.merge!(attributes)
+      json.deep_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])
+      if @after and depth == 1
+        post_data = Rule.new(role, @after[:block]).build
+        json.deep_merge!(post_data[:attributes])
       end
       json
     end
@@ -122,7 +125,7 @@ module Rna
           @dsl = eval "self", @block.binding
           instance_eval(&@block)
         end        
-        @data[:attributes].merge!(set.to_mash)
+        @data[:attributes].deep_merge!(set.to_mash)
         @data
       end
 

data/lib/rna/outputers.rb

@@ -8,7 +8,6 @@ module Rna
   
   class Filesystem < Outputer
     def run(jsons)
-      # options[:output_path] only used for specs
       output_path = options[:output_path] || "output"
       FileUtils.rm_rf(output_path) if options[:clean]
       FileUtils.mkdir(output_path) unless File.exist?(output_path)

data/lib/rna/task.rb

@@ -1,19 +1,25 @@
 module Rna
   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")
-      %w/rna.rb s3.yml Guardfile/.each do |name|
-        source = File.expand_path("../../files/#{name}", __FILE__)
-        dest = "#{project_root}/config/#{File.basename(source)}"
-        dest = "#{project_root}/#{File.basename(source)}" if name == 'Guardfile'
-        if File.exist?(dest)
+    def self.init(options={})
+      project_root = options[:project_root] || '.'
+      puts "Setting up lono project" unless options[:quiet]
+      source_root = File.expand_path("../../starter_project", __FILE__)
+      paths = Dir.glob("#{source_root}/**/*").
+                select {|p| File.file?(p) }
+      paths.each do |src|
+        dest = src.gsub(%r{.*starter_project/},'')
+        dest = "#{project_root}/#{dest}"
+
+        if File.exist?(dest) and !options[:force]
           puts "already exists: #{dest}" unless options[:quiet]
         else
           puts "creating: #{dest}" unless options[:quiet]
-          FileUtils.cp(source, dest)
+          dirname = File.dirname(dest)
+          FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
+          FileUtils.cp(src, dest)
         end
       end
+      puts "Starter lono project created"
     end
     def self.generate(options)
       new(options).generate

data/lib/rna/version.rb

@@ -1,3 +1,3 @@
 module Rna
-  VERSION = '0.3.8'
+  VERSION = '0.4.0'
 end

data/lib/{files → starter_project/config}/rna.rb

@@ -2,7 +2,7 @@
 # This is meant be be modified to your needs.
 default_includes 'base'
 # Pre processing rules that run at the beginning
-pre_rule do
+before do
   if role != 'base'
     node[:application] = nil
     node[:deploy_code] = false
@@ -10,7 +10,7 @@ pre_rule do
     node[:repository] = nil
   end
 
-  node[:pre_rule] = 1
+  node[:before] = 1
   node[:chef_branch] = 'prod' if role =~ /^prod/
   node[:chef_branch] = 'master' if role =~ /^stag/
 end
@@ -22,30 +22,9 @@ role 'base' do
   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']
-  node[:application] = 'api'
-  node[:deploy_code] = true
-  node[:database][:adapter] = "mysql"
-  node[:database][:host] = "127.0.0.1"
-  node[:database][:user] = "user"
-  node[:database][:pass] = "pass"
-  node[:repository] = 'git@github.com:owner/repo.git/api.git'
-end
-role 'prod-api-resque', 'stag-api-resque' do
-  includes 'prod-api-app'
-  run_list ['base','api_resque']
-  node[:workers] = 8
-end
-
-
 # Post processing rules that run at the end
-post_rule do
-  node[:post_rule] = 2
+after do
+  node[:after] = 2
   node[:framework_env] = 'production' if role =~ /^prod/
   node[:framework_env] = 'staging' if role =~ /^stag/
 

data/lib/starter_project/config/rna/api.rb

@@ -0,0 +1,18 @@
+# api
+role 'prod-api-redis', 'stag-api-redis'
+role 'prod-api-resque', 'stag-api-resque' do
+  includes 'prod-api-app'
+  node[:workers] = 8
+end
+role 'prod-api-app', 'stag-api-app' do
+  node[:application] = 'api'
+  node[:deploy_code] = true
+  node[:repository] = 'git@github.com:owner/repo.git/api.git'
+  node[:database][:adapter] = "mysql"
+  node[:database][:host] = "127.0.0.1"
+  node[:database][:user] = "user"
+  node[:database][:pass] = "pass"
+  node[:scout][:key] = 'abc'
+  node[:scout][:gems] = {'redis' => nil}
+  node[:relayhost] = settings[:sendgrid][:relayhost]
+end

data/rna.gemspec

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

data/spec/lib/rna_spec.rb

@@ -1,165 +1,184 @@
-require 'rna'
-require 'rspec'
-require 'pp'
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe Rna do
   before(:each) do
-    @project_root = File.expand_path("../../project", __FILE__)
-    @project2_root = File.expand_path("../../project2", __FILE__)
-    @dsl = Rna::DSL.new(
-      :config_path => "#{@project_root}/config/rna.rb",
-      :output_path => "#{@project_root}/output"
-    )
+    @project = File.expand_path("../../project", __FILE__)
+    FileUtils.mkdir(@project) unless File.exist?(@project)
+    execute("./bin/rna init -f -q --project-root #{@project}")
   end
 
   after(:each) do
-    FileUtils.rm_rf("#{@project_root}/output")
+    FileUtils.rm_rf("#{@project}/output")
   end
 
-  # uncomment to look a data deeper
-  # 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.run
-    Dir.glob("#{@project_root}/output/*").size.should > 0
+  describe "cli specs" do
+    it "should generate templates" do
+      out = execute("./bin/rna generate -c --project-root #{@project}")
+      out.should match /Generating rna files/
+    end
   end
 
-  # complete end to end tests
-  it "base.json should contain correct attributes" do
-    @dsl.run
-    base = JSON.load(IO.read("#{@project_root}/output/base.json"))
-    base['role'].should == 'base'
-    base['run_list'].should == ["role[base]"]
-  end
+  describe "ruby specs" do
+    before(:each) do
+      @dsl = Rna::DSL.new(
+        :quiet => true,
+        :project_root => @project
+      ) 
+    end
 
-  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 "should build attributes" do
+      @dsl.evaluate
+      @dsl.build
+      pp @dsl.data
+      @dsl.process
+      pp @dsl.jsons
+    end if ENV['DEBUG']
 
-  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 == nil
-  end
+    it "should write json files to outputs folder" do
+      @dsl.run
+      Dir.glob("#{@project}/output/*").size.should > 0
+    end
 
-  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 == nil
-    json['framework_env'].should == 'staging' # this is tests the rule
-  end
+    # complete end to end tests
+    it "base.json should contain correct attributes" do
+      @dsl.run
+      base = JSON.load(IO.read("#{@project}/output/base.json"))
+      base['role'].should == 'base'
+      base['run_list'].should == ["role[base]"]
+    end
 
-  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'
-    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)
-  end
+    it "base.json should not contain settings attributes" do
+      @dsl.run
+      base = JSON.load(IO.read("#{@project}/output/base.json"))
+      base['framework_env'].should be_nil
+      base['deploy_code'].should be_nil
+    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 == '127.0.0.1'
-  end
+    it "prod-api-redis.json should contain base and settings attributes" do
+      @dsl.run
+      json = JSON.load(IO.read("#{@project}/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 == nil
+    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 "prod-api-resque should contain inherited attributes" do
+      @dsl.run
+      json = JSON.load(IO.read("#{@project}/output/prod-api-resque.json"))
+      json['role'].should == 'prod-api-resque'
+      json['run_list'].should == ["role[base]","role[api_resque]"]
+      json['deploy_code'].should == true
+      json['framework_env'].should == 'production'
+      json['scout'].should be_a(Hash)
+      json['database']['adapter'].should == "mysql"
+      json['scout'].should be_a(Hash)
+    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
+    it "stag-api-redis.json should contain base and settings attributes and apply rules" do
+      @dsl.run
+      json = JSON.load(IO.read("#{@project}/output/stag-api-redis.json"))
+      json['role'].should == 'stag-api-redis'
+      json['run_list'].should == ["role[base]", "role[api_redis]"]
+      json['deploy_code'].should == nil
+      json['framework_env'].should == 'staging' # this is tests the rule
+    end
 
-  it "should be able to read shared settings" 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['relayhost'].should == "smtp.sendgrid.net"
-    json = JSON.load(IO.read("#{@project_root}/output/prod-api-app.json"))
-    json['relayhost'].should == "smtp.sendgrid.net"
-  end
-  ###################
-
-  # only run when S3=1, will need to setup spec/project/config/s3.yml
-  it "should upload to s3" do
-    @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
-    bucket = s3.buckets[config['bucket']]
-    raw = bucket.objects["#{config['folder']}/prod-api-app.json"].read
-
-    json = JSON.load(raw)
-    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)
-    # clean up
-    tree = bucket.as_tree(:prefix => config['folder'])
-    tree.children.select(&:leaf?).each do |leaf|
-      leaf.object.delete
-    end 
-  end if ENV['S3'] == '1'
-
-  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::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 "prod-api-app.json should contain base and settings attributes" do
+      @dsl.run
+      json = JSON.load(IO.read("#{@project}/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)
+    end
 
-  it "task build should generate node.json files" do
-    Rna::Task.generate(
-      :config_path => "#{@project_root}/config/rna.rb", 
-      :output_path => "#{@project_root}/output"
-    )
-    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)
+    it "prod-api-app.json should contain attributes from node" do
+      @dsl.run
+      json = JSON.load(IO.read("#{@project}/output/prod-api-app.json"))
+      json['database']['user'].should == 'user'
+      json['database']['pass'].should == 'pass'
+      json['database']['host'].should == '127.0.0.1'
+    end
+
+    it "prod-api-app.json should contain pre and post rules" do
+      @dsl.run
+      json = JSON.load(IO.read("#{@project}/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['before'].should == 1
+      json['after'].should == 2
+    end
+
+    it "masta-app should not generate output file" do
+      @dsl.run
+      File.exist?("#{@project}/output/masta-app.json").should be_false
+      File.exist?("#{@project}/output/prod-masta-android.json").should be_true
+      json = JSON.load(IO.read("#{@project}/output/prod-masta-android.json"))
+      json['masta_app'].should == 123
+    end
+
+    it "should be able to read shared settings" do
+      @dsl.run
+      File.exist?("#{@project}/output/masta-app.json").should be_false
+      File.exist?("#{@project}/output/prod-masta-android.json").should be_true
+      json = JSON.load(IO.read("#{@project}/output/prod-masta-android.json"))
+      json['relayhost'].should == "smtp.sendgrid.net"
+      json = JSON.load(IO.read("#{@project}/output/prod-api-app.json"))
+      json['relayhost'].should == "smtp.sendgrid.net"
+    end
+    ###################
+
+    # only run when S3=1, will need to setup spec/project/config/s3.yml
+    it "should upload to s3" do
+      @dsl = Rna::DSL.new(
+        :output => 's3', 
+        :s3_config_path => "#{@project}/config/s3.yml",
+        :project_root => @project
+      )
+      outputer = @dsl.run
+
+      config = outputer.config
+      s3 = outputer.s3
+      bucket = s3.buckets[config['bucket']]
+      raw = bucket.objects["#{config['folder']}/prod-api-app.json"].read
+
+      json = JSON.load(raw)
+      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)
+      # clean up
+      tree = bucket.as_tree(:prefix => config['folder'])
+      tree.children.select(&:leaf?).each do |leaf|
+        leaf.object.delete
+      end 
+    end if ENV['S3'] == '1'
+
+    it "task init should set up project" do
+      File.exist?("#{@project}/config/s3.example.yml").should be_true
+      File.exist?("#{@project}/config/rna.rb").should be_true
+    end
+
+    it "task build should generate node.json files" do
+      Rna::Task.generate(
+        :quiet => true,
+        :project_root => @project
+      )
+      json = JSON.load(IO.read("#{@project}/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)
+    end
   end
+
 end
 
 describe Node do

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+require "pp"
+require "bundler"
+
+Bundler.require(:development)
+
+$root = File.expand_path('../../', __FILE__)
+
+require "#{$root}/lib/rna"
+
+module Helpers
+  def execute(cmd)
+    puts "Running: #{cmd}" if ENV['DEBUG']
+    out = `#{cmd}`
+    puts out if ENV['DEBUG']
+    out
+  end
+end
+
+RSpec.configure do |c|
+  c.include Helpers
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  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
@@ -190,10 +206,12 @@ files:
 - README.md
 - Rakefile
 - bin/rna
+- config/rna.rb
+- config/rna/api.rb
+- config/rna/blog.rb
+- config/s3.example.yml
+- config/s3.yml
 - lib/ext/hash.rb
-- lib/files/Guardfile
-- lib/files/rna.rb
-- lib/files/s3.yml
 - lib/mash.rb
 - lib/node.rb
 - lib/rna.rb
@@ -202,14 +220,15 @@ files:
 - lib/rna/outputers.rb
 - lib/rna/task.rb
 - lib/rna/version.rb
+- lib/starter_project/config/rna.rb
+- lib/starter_project/config/rna/api.rb
+- lib/starter_project/config/rna/masta.rb
+- lib/starter_project/config/s3.example.yml
 - rna.gemspec
 - spec/lib/rna_spec.rb
-- spec/project/config/rna.rb
-- spec/project/config/rna/api.rb
-- spec/project/config/rna/masta.rb
-- spec/project/config/s3.example.yml
 - spec/project2/.gitkeep
 - spec/project2/Guardfile
+- spec/spec_helper.rb
 homepage: http://github.com/tongueroo/rna
 licenses: []
 post_install_message: 
@@ -236,9 +255,6 @@ specification_version: 3
 summary: Rna is a simple DSL for generating node.json files required by chef-solo.
 test_files:
 - spec/lib/rna_spec.rb
-- spec/project/config/rna.rb
-- spec/project/config/rna/api.rb
-- spec/project/config/rna/masta.rb
-- spec/project/config/s3.example.yml
 - spec/project2/.gitkeep
 - spec/project2/Guardfile
+- spec/spec_helper.rb

data/lib/files/Guardfile

@@ -1,3 +0,0 @@
-guard "rna" do
-  watch(%r{^config/rna.rb$})
-end