rna 0.3.5 → 0.3.6

data/README.md

@@ -45,9 +45,7 @@ pre_rule do
   node[:chef_branch] = 'master' if role =~ /^stag/
 end
 
-settings do
-  node[:sendgrid][:relayhost] = "smtp.sendgrid.net"
-end
+settings[:sendgrid][:relayhost] = "smtp.sendgrid.net"
 
 # Roles
 role 'base' do
@@ -62,6 +60,10 @@ 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
@@ -91,24 +93,23 @@ end
 You might want a shared settings hash that you can use in only some of your roles.
 
 ```ruby
-settings do
-  node[:foo] = 1
-end
+settings[:foo][:bar] = 1
+settings[:foo][:baz] = 2
 ```
 
 You can use this any where in your roles.
 
 ```ruby
 role 'role1' do
-  node[:foo] = settings[:foo]
+  node[:foo][:bar] = settings[:foo][:bar]
 end
 
 role 'role2' do
-  node[:foo] = settings[:foo]
+  node[:foo][:bar] = settings[:foo][:bar]
 end
 
 role 'role3' do
-  # dont set foo here
+  node[:foo][:baz] = settings[:foo][:baz]
 end
 ```
 
@@ -129,7 +130,7 @@ $ rna generate
 
 Here is the example of the output looks like:
 
-output/base.json:
+base.json:
 
 ```json
 {
@@ -142,7 +143,7 @@ output/base.json:
 }
 ```
 
-output/prod-api-app.json:
+prod-api-app.json:
 
 ```json
 {
@@ -154,13 +155,19 @@ output/prod-api-app.json:
   ],
   "application": "api",
   "deploy_code": true,
+  "database": {
+    "adapter": "mysql",
+    "host": "127.0.0.1",
+    "user": "user",
+    "pass": "pass"
+  },
   "repository": "git@github.com:owner/repo.git/api.git",
   "post_rule": 2,
   "framework_env": "production"
 }
 ```
 
-output/prod-api-redis.json:
+prod-api-redis.json:
 
 ```json
 {
@@ -176,7 +183,7 @@ output/prod-api-redis.json:
 }
 ```
 
-output/prod-api-resque.json:
+prod-api-resque.json:
 
 ```json
 {
@@ -188,6 +195,12 @@ output/prod-api-resque.json:
   ],
   "application": "api",
   "deploy_code": true,
+  "database": {
+    "adapter": "mysql",
+    "host": "127.0.0.1",
+    "user": "user",
+    "pass": "pass"
+  },
   "repository": "git@github.com:owner/repo.git/api.git",
   "workers": 8,
   "post_rule": 2,
@@ -195,7 +208,7 @@ output/prod-api-resque.json:
 }
 ```
 
-output/stag-api-app.json:
+stag-api-app.json:
 
 ```json
 {
@@ -207,13 +220,19 @@ output/stag-api-app.json:
   ],
   "application": "api",
   "deploy_code": true,
+  "database": {
+    "adapter": "mysql",
+    "host": "127.0.0.1",
+    "user": "user",
+    "pass": "pass"
+  },
   "repository": "git@github.com:owner/repo.git/api.git",
   "post_rule": 2,
   "framework_env": "staging"
 }
 ```
 
-output/stag-api-redis.json:
+stag-api-redis.json:
 
 ```json
 {
@@ -229,7 +248,7 @@ output/stag-api-redis.json:
 }
 ```
 
-output/stag-api-resque.json:
+stag-api-resque.json:
 
 ```json
 {
@@ -241,6 +260,12 @@ output/stag-api-resque.json:
   ],
   "application": "api",
   "deploy_code": true,
+  "database": {
+    "adapter": "mysql",
+    "host": "127.0.0.1",
+    "user": "user",
+    "pass": "pass"
+  },
   "repository": "git@github.com:owner/repo.git/api.git",
   "workers": 8,
   "post_rule": 2,

data/lib/files/rna.rb

@@ -15,9 +15,7 @@ pre_rule do
   node[:chef_branch] = 'master' if role =~ /^stag/
 end
 
-settings do
-  node[:sendgrid][:relayhost] = "smtp.sendgrid.net"
-end
+settings[:sendgrid][:relayhost] = "smtp.sendgrid.net"
 
 # Roles
 role 'base' do
@@ -32,6 +30,10 @@ 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

data/lib/node.rb

@@ -6,10 +6,6 @@ class Node < Hash
     def initialize(value)
       @value = value
     end
-    def [](key)
-      puts "Node::Attribute key #{key}"
-      nil
-    end
   end
 
   def initialize
@@ -26,16 +22,16 @@ class Node < Hash
 
   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]
+    case @data[key]
+    when nil
+      @data[key] = Node.new
+    when Node::Attribute
+      @data[key].value
+    when Node
+      @data[key]
     else
       raise "should never happen"
     end
-    result
   end
 
   def to_hash

data/lib/rna/dsl.rb

@@ -1,6 +1,6 @@
 module Rna
   class DSL
-    attr_reader :data, :jsons, :settings_node
+    attr_reader :data, :jsons
     def initialize(options={})
       @options = options
 
@@ -22,15 +22,12 @@ module Rna
       end
     end
 
-    def settings_node
-      @settings_node ||= Node.new
-    end
-    alias_method :set, :settings_node
-    alias_method :node, :settings_node
-
-    def settings(&block)
-      instance_eval(&block)
+    def settings
+      @settings ||= Node.new
     end
+    alias_method :set, :settings
+    alias_method :node, :settings
+    alias_method :default, :settings
 
     def default_includes(role)
       Role.default_includes = role
@@ -131,7 +128,7 @@ module Rna
 
       # http://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
       def settings
-        @dsl.settings_node.to_mash
+        @dsl.settings.to_mash
       end
 
       def node

data/lib/rna/version.rb

@@ -1,3 +1,3 @@
 module Rna
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/spec/lib/rna_spec.rb

@@ -78,7 +78,7 @@ describe Rna do
     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'
+    json['database']['host'].should == '127.0.0.1'
   end
 
   it "prod-api-app.json should contain pre and post rules" do

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

@@ -9,11 +9,11 @@ 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]
-
-  node[:database][:user] = 'user'
-  node[:database][:pass] = 'pass'
-  node[:database][:host] = 'host'
 end

data/spec/project/config/rna.rb

@@ -1,3 +1,5 @@
+# This is starter example rna template.
+# This is meant be be modified to your needs.
 default_includes 'base'
 # Pre processing rules that run at the beginning
 pre_rule do
@@ -13,9 +15,7 @@ pre_rule do
   node[:chef_branch] = 'master' if role =~ /^stag/
 end
 
-settings do
-  node[:sendgrid][:relayhost] = "smtp.sendgrid.net"
-end
+settings[:sendgrid][:relayhost] = "smtp.sendgrid.net"
 
 # Roles
 role 'base' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake