rna 0.2.3 → 0.2.4

data/README.md

@@ -204,4 +204,30 @@ 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/masta.rb
+
+#### Shared Settings
+
+You might want a shared settings hash that you can use in only some of your roles.  
+
+```ruby
+settings(
+  'foo' => 1
+)
+```
+
+You can use this any where in your roles.
+
+```ruby
+role 'role1' do
+  set 'foo', settings['foo']
+end
+
+role 'role2' do
+  set 'foo', settings['foo']
+end
+
+role 'role3' do
+  # dont set foo here
+end
+```

data/lib/rna/dsl.rb

@@ -23,6 +23,16 @@ module Rna
       end
     end
 
+    def settings(*data)
+      # reader method
+      if data.empty?
+        @settings
+      # writer method
+      else
+        @settings = data[0]
+      end
+    end
+
     def global(options={},&block)
       @global = {:options => options, :block => block}
     end
@@ -129,10 +139,18 @@ module Rna
 
     class Builder
       def build
-        instance_eval(&@block) if @block
+        if @block
+          @dsl = eval "self", @block.binding
+          instance_eval(&@block)
+        end
         @data
       end
 
+      # http://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
+      def settings(*args, &block)
+        @dsl.settings(*args, &block)
+      end
+
       def set(key, value)
         @data['attributes'][key] = value
       end

data/lib/rna/version.rb

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

data/spec/lib/rna_spec.rb

@@ -92,6 +92,15 @@ describe Rna do
     json['masta_app'].should == 123
   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

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

@@ -15,4 +15,5 @@ role 'prod-api-app', 'stag-api-app' do
           'redis' => nil
         }
       }
+  set 'relayhost', settings['sendgrid']['relayhost']
 end

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

@@ -9,4 +9,5 @@ role 'prod-masta-android', 'stag-masta-android' do
   set 'application', 'masta'
   set 'deploy_code', true
   set 'repository', 'git@github.com:arockwell/masta_blasta.git'
+  set 'relayhost', settings['sendgrid']['relayhost']
 end

data/spec/project/config/rna.rb

@@ -22,6 +22,12 @@ role 'base' do
   role_list ['base']
 end
 
+settings(
+  'sendgrid' => {
+    "relayhost"=>"smtp.sendgrid.net"
+  }
+)
+
 ###################################
 # Post processing rules that run at the end
 post_rule do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -207,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2001643032789055325
+      hash: 3576656030338073956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2001643032789055325
+      hash: 3576656030338073956
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24