rna 0.2.2 → 0.2.3

data/README.md

@@ -1,5 +1,4 @@
-Rna gem
-===========
+# Rna gem
 
 [![Build History][2]][1]
 
@@ -8,15 +7,13 @@ Rna gem
 
 Rna is a ruby gem that provides simple DSL for generating node.json files required by chef-solo.
 
-Requirements
-------------
+## Requirements
 
 <pre>
 $ gem install rna
 </pre>
 
-Usage
-------------
+## Usage
 
 <pre>
 $ mkdir rna_project
@@ -26,8 +23,9 @@ $ rna init
 
 This will sets starter config/rna.rb and config/s3.yml files.
 
-Example rna.rb file
-------------
+### Example:
+
+#### config/rna.rb file
 
 ```ruby
 # This is starter example rna template.
@@ -184,6 +182,8 @@ output/stag-api-resque.json:
 }
 ```
 
+#### Uploading to S3
+
 <pre>
 $ rna build -o s3 # saves s3 based on config/s3.yml settings
 </pre>
@@ -195,4 +195,13 @@ access_key_id: hocuspocus
 secret_access_key: opensesame
 bucket: my-bucket
 folder: chef/rna
-```
+```
+
+#### Breaking up config/rna.rb
+
+If you have a lot of roles, the config/rna.rb file can get unwieldy long.  You can break up the rna.rb file and put role defintions in the config/rna directory.  Any file in this directory will be automatically loaded. 
+
+An example is in the spec/project folder:
+
+* config/rna/api.rb
+* config/rna/masta.rb

data/lib/rna/dsl.rb

@@ -13,6 +13,14 @@ module Rna
 
     def evaluate
       instance_eval(File.read(@path), @path)
+      load_roles
+    end
+
+    # load any roles defined in project/config/rna/*
+    def load_roles
+      Dir.glob("#{File.dirname(@path)}/rna/*").each do |path|
+        instance_eval(File.read(path), path)
+      end
     end
 
     def global(options={},&block)

data/lib/rna/version.rb

@@ -1,3 +1,3 @@
 module Rna
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/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
+  inherits 'prod-api-app'
+  set '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
+        }
+      }
+end

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

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

data/spec/project/config/rna.rb

@@ -21,36 +21,6 @@ end
 role 'base' do
   role_list ['base']
 end
-# api
-role 'prod-api-redis', 'stag-api-redis'
-role 'prod-api-resque', 'stag-api-resque' do
-  inherits 'prod-api-app'
-  set '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
-        }
-      }
-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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -188,6 +188,8 @@ files:
 - 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
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1637596285023883731
+      hash: 2001643032789055325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1637596285023883731
+      hash: 2001643032789055325
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -225,6 +227,8 @@ summary: Rna is a ruby gem that provides simple DSL for generating node.json fil
 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