rna 0.1.1 → 0.1.4

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
   - 1.9.2
-  - 1.9.3
-bundler_args: --without development
+  - 1.9.3

data/README.md

@@ -1,6 +1,11 @@
 Rna gem
 ===========
 
+[![Build History][2]][1]
+
+[1]: http://travis-ci.org/tongueroo/rna
+[2]: https://secure.travis-ci.org/tongueroo/rna.png?branch=master
+
 Rna is a ruby gem that provides simple DSL for generating node.json files required by chef-solo.
 
 Requirements

data/lib/files/Guardfile

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

data/lib/rna/cli.rb

@@ -22,7 +22,7 @@ EOL
     method_option :output, :aliases => '-o', :desc => "specify where to output the generated files to", :default => 'filesystem'
     method_option :public_read, :aliases => '-p', :desc => "make s3 files readable by public, default private", :default => false, :type => :boolean
     def build
-      Rna::Tasks.build(options.dup)
+      Rna::Tasks.build(options.dup.merge(:verbose => true))
     end
   end
   

data/lib/rna/dsl.rb

@@ -65,6 +65,7 @@ module Rna
 
       outputer = options[:output] || 'filesystem'
       outputer_class = Rna.const_get(outputer.capitalize)
+      puts "Building node.json files:" if options[:verbose]
       outputer_class.new(options).run(jsons)
     end
 

data/lib/rna/outputers.rb

@@ -9,9 +9,10 @@ module Rna
   class Filesystem < Outputer
     def run(jsons)
       # options[:output_path] only used for specs
-      output_path = options[:output_path] || "nodejson"
+      output_path = options[:output_path] || "output"
       FileUtils.mkdir(output_path) unless File.exist?(output_path)
       jsons.each do |role,json|
+        puts "  #{role}.json" if options[:verbose]
         File.open("#{output_path}/#{role}.json", 'w') {|f| f.write(json) }
       end
     end
@@ -28,6 +29,7 @@ module Rna
       @s3 = AWS::S3.new
       bucket = @s3.buckets[@config['bucket']]
       jsons.each do |role,json|
+        puts "  #{role}.json" if options[:verbose]
         bucket.objects.create("#{@config['folder']}/#{role}.json", json, s3_options)
       end
       self # return outputer object for specs

data/lib/rna/tasks.rb

@@ -3,9 +3,10 @@ module Rna
     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/.each do |name|
+      %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)
           puts "already exists: #{dest}" unless options[:quiet]
         else
@@ -20,7 +21,11 @@ module Rna
 
     def initialize(options={})
       @options = options
-      @dsl = DSL.new
+      if options[:config_path]
+        @dsl = DSL.new(options[:config_path])
+      else
+        @dsl = DSL.new
+      end
     end
     def build
       @dsl.evaluate

data/lib/rna/version.rb

@@ -1,3 +1,3 @@
 module Rna
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 end

data/rna.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rna::VERSION
 
+  gem.add_dependency "rake"
   gem.add_dependency "json"
   gem.add_dependency "thor"
   gem.add_dependency "aws-sdk"

data/spec/lib/rna_spec.rb

@@ -94,14 +94,14 @@ describe Rna do
   it "should write json files to outputs folder" do
     @dsl.build
     @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/nodejson")
-    Dir.glob("#{@project_root}/nodejson/*").size.should > 0
+    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}/nodejson")
-    base = JSON.load(IO.read("#{@project_root}/nodejson/base.json"))
+    base = JSON.load(IO.read("#{@project_root}/output/base.json"))
     base['role'].should == 'base'
     base['run_list'].should == ["role[base]"]
   end
@@ -109,7 +109,7 @@ describe Rna do
   it "base.json should not contain global attributes" do
     @dsl.build
     @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/nodejson")
-    base = JSON.load(IO.read("#{@project_root}/nodejson/base.json"))
+    base = JSON.load(IO.read("#{@project_root}/output/base.json"))
     base['framework_env'].should be_nil
     base['deploy_code'].should be_nil
   end
@@ -117,7 +117,7 @@ describe Rna do
   it "prod-api-redis.json should contain base and global attributes" do
     @dsl.build
     @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/nodejson")
-    json = JSON.load(IO.read("#{@project_root}/nodejson/prod-api-redis.json"))
+    json = JSON.load(IO.read("#{@project_root}/output/prod-api-redis.json"))
     json['role'].should == 'prod-api-redis'
     json['run_list'].should == ["role[base]"]
     json['framework_env'].should == 'production'
@@ -127,7 +127,7 @@ describe Rna do
   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}/nodejson")
-    json = JSON.load(IO.read("#{@project_root}/nodejson/stag-api-redis.json"))
+    json = JSON.load(IO.read("#{@project_root}/output/stag-api-redis.json"))
     json['role'].should == 'stag-api-redis'
     json['run_list'].should == ["role[base]"]
     json['deploy_code'].should == false
@@ -137,7 +137,7 @@ describe Rna do
   it "prod-api-app.json should contain base and global attributes" do
     @dsl.build
     @dsl.output(:output => 'filesystem', :output_path => "#{@project_root}/nodejson")
-    json = JSON.load(IO.read("#{@project_root}/nodejson/prod-api-app.json"))
+    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
@@ -182,7 +182,7 @@ describe Rna do
       :config_path => "#{@project_root}/config/rna.rb", 
       :output_path => "#{@project_root}/nodejson"
     )
-    json = JSON.load(IO.read("#{@project_root}/nodejson/prod-api-app.json"))
+    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

data/spec/project/config/rna.rb

@@ -25,6 +25,7 @@ end
 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
   run_list ['base','api_app']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rna
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: json
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +176,7 @@ files:
 - README.md
 - Rakefile
 - bin/rna
+- lib/files/Guardfile
 - lib/files/rna.rb
 - lib/files/s3.yml
 - lib/rna.rb
@@ -185,12 +202,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 724117673622561747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 724117673622561747
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24