rivet 1.0.8 → 1.1.0

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Rivet CHANGELOG
 ===
 
+1.1.0 - Released 11/12/13
+---
+  * Rivet no allows you to specify a directory with the -d [--definitions-directory] option
+  * Rivet no longer creates the autoscale directory if it does not exist
+
 1.0.8 - Released 11/12/13
 ---
   * Fixes the unit tests which were incorrect.

data/bin/rivet

@@ -12,7 +12,8 @@ INFO  = Logger::INFO
 # Default option values
 options = {
   :log_level => INFO,
-  :profile => 'default'
+  :profile => 'default',
+  :definitions_directory => './autoscale'
 }
 
 OptionParser.new do |o|
@@ -33,6 +34,10 @@ OptionParser.new do |o|
     options[:sync] = s
   end
 
+  o.on('-d', '--definitions-directory [PATH]', "The autoscale definitions directory to use (default is ./autoscale)") do |d|
+    options[:definitions_directory] = d
+  end
+
   o.on('-h') { puts o; exit }
   o.parse!
 end

data/lib/rivet/client.rb

@@ -6,11 +6,18 @@ module Rivet
     def run(options)
       AwsUtils.set_aws_credentials(options[:profile])
       Rivet::Log.level(options[:log_level])
-      Rivet::Utils.ensure_minimum_setup
 
-      group_def = Rivet::Utils.get_definition(options[:group])
+      unless Dir.exists?(options[:definitions_directory])
+        Rivet::Utils.die("The autoscale definitions directory doesn't exist")
+      end
+
+      group_def = Rivet::Utils.get_definition(
+        options[:group],
+        options[:definitions_directory])
 
-      Rivet::Utils.die "The #{options[:group]} definition doesn't exist" unless group_def
+      unless group_def
+        Rivet::Utils.die "The #{options[:group]} definition doesn't exist"
+      end
 
       Rivet::Log.info("Checking #{options[:group]} autoscaling definition")
       autoscale_def = Rivet::Autoscale.new(options[:group],group_def)

data/lib/rivet/utils.rb

@@ -1,26 +1,17 @@
 module Rivet
   module Utils
-    AUTOSCALE_DIR = "autoscale"
 
     def self.die(level = 'fatal',message)
       Rivet::Log.write(level,message)
       exit
     end
 
-    def self.ensure_minimum_setup
-      if Dir.exists?(AUTOSCALE_DIR)
-        true
-      else
-        Rivet::Log.info("Creating #{AUTOSCALE_DIR}")
-        Dir.mkdir(AUTOSCALE_DIR)
-      end
-    end
-
     # This returns the merged definition given a group
 
-    def self.get_definition(group)
-      defaults = consume_defaults
-      group_def = load_definition(group)
+    def self.get_definition(group,directory)
+      defaults = consume_defaults(directory)
+      group_def = load_definition(group,directory)
+
       if defaults && group_def
         group_def = defaults.deep_merge(group_def)
       end
@@ -29,7 +20,7 @@ module Rivet
 
     # Gobbles up the defaults file from YML, returns the hash or false if empty
 
-    def self.consume_defaults(autoscale_dir = AUTOSCALE_DIR)
+    def self.consume_defaults(autoscale_dir)
       defaults_file = File.join(autoscale_dir,"defaults.yml")
       if File.exists?(defaults_file)
         parsed = begin
@@ -47,8 +38,8 @@ module Rivet
     # This loads the given definition from it's YML file, returns the hash or
     # false if empty
 
-    def self.load_definition(name)
-      definition_dir = File.join(AUTOSCALE_DIR,name)
+    def self.load_definition(name,directory)
+      definition_dir = File.join(directory,name)
       conf_file      = File.join(definition_dir,"conf.yml")
       if Dir.exists?(definition_dir) && File.exists?(conf_file)
         Rivet::Log.debug("Loading definition for #{name} from #{conf_file}")

data/lib/rivet/version.rb

@@ -1,4 +1,4 @@
 module Rivet
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end
 

data/spec/rivet_bootstrap_spec.rb

@@ -8,33 +8,33 @@ describe 'rivet bootstrap' do
 
   tempdir_context 'with all necessary files in place' do
     before do
-
+      FileUtils.mkdir_p(bootstrap_def['config_dir'])
 
       validator_file = File.join(
         bootstrap_def['config_dir'],
         "#{bootstrap_def['environment']}-validator.pem")
 
+      FileUtils.touch(validator_file)
+
       template_dir = File.join(
         bootstrap_def['config_dir'],
         Rivet::Bootstrap::TEMPLATE_SUB_DIR)
 
-      template_file = File.join(template_dir,bootstrap_def['template'])
-
-      FileUtils.mkdir_p(bootstrap_def['config_dir'])
       FileUtils.mkdir_p(template_dir)
+
+      template_file = File.join(template_dir,bootstrap_def['template'])
       File.open(template_file,'w') { |f| f.write(SpecHelpers::BOOTSTRAP_TEMPLATE) }
-      FileUtils.touch(validator_file)
     end
 
     describe "#user_data" do
       it 'returns a string that contains the chef organization' do
         org = bootstrap_def['organization']
-        bootstrap.user_data.should =~ /chef_server_url\s*.*#{org}.*/
+        bootstrap.user_data.should =~ /chef_server_url\s+.*#{org}.*/
       end
 
       it 'returns a string that contains the environment' do
         env = bootstrap_def['env']
-        bootstrap.user_data.should =~ /environment\s*.*#{env}.*/
+        bootstrap.user_data.should =~ /environment\s+.*#{env}.*/
       end
 
       it 'returns a string that contains the run_list as json' do
@@ -45,9 +45,9 @@ describe 'rivet bootstrap' do
       it 'returns a string that contains each gem to install' do
         bootstrap_def['gems'].each do |g|
           if g.size > 1
-            gem_regexp = /gem\s*install\s*#{g[0]}.*#{g[1]}/
+            gem_regexp = /gem\s+install\s+#{g[0]}.+#{g[1]}/
           else
-            gem_regexp = /gem\s*install\s*#{g[0]}/
+            gem_regexp = /gem\s+install\s+#{g[0]}/
           end
           bootstrap.user_data.should =~ gem_regexp
         end
@@ -59,11 +59,3 @@ describe 'rivet bootstrap' do
 
 end
 
-
-
-
-
-
-
-
-

data/spec/rivet_util_spec.rb

@@ -2,9 +2,10 @@ require_relative './rivet_spec_setup'
 
 include SpecHelpers
 
-definition_name = "unit_test"
-definition_dir  = File.join(Rivet::Utils::AUTOSCALE_DIR,definition_name)
-launch_config_params = ['ssh_key','instance_size','security_groups','ami','bootstrap']
+AUTOSCALE_DIR   = "."
+DEFINITION_NAME = "unit_test"
+DEFINITION_DIR  = File.join(AUTOSCALE_DIR,DEFINITION_NAME)
+LAUNCH_CONFIG_PARAMS = ['ssh_key','instance_size','security_groups','ami','bootstrap']
 
 defaults_hash = {
   'min_size' => 0,
@@ -29,85 +30,70 @@ unit_test_definition_hash = {
 }
 
 describe "rivet utils" do
-  tempdir_context "without an autoscaling directory" do
-    describe "ensure_minimum_setup" do
-      it "creates the autoscale directory if it doesn't exist" do
-        Rivet::Utils.ensure_minimum_setup
-        Dir.exists?(Rivet::Utils::AUTOSCALE_DIR).should be_true
-      end
-    end
-  end
-
   tempdir_context "with an autoscaling directory" do
     before do
-      FileUtils.mkdir_p(Rivet::Utils::AUTOSCALE_DIR)
-    end
-
-    describe "ensure_minimum_setup" do
-      it "should return true" do
-        Rivet::Utils.ensure_minimum_setup.should be_true
-      end
+      FileUtils.mkdir_p(AUTOSCALE_DIR)
     end
 
     describe "consume_defaults" do
       it "should return false" do
-        Rivet::Utils.consume_defaults.should be_false
+        Rivet::Utils.consume_defaults(AUTOSCALE_DIR).should be_false
       end
     end
 
     describe "load_definition" do
       it "should return false" do
-        Rivet::Utils.load_definition("unit_test").should be_false
+        Rivet::Utils.load_definition("unit_test",AUTOSCALE_DIR).should be_false
       end
     end
 
     describe "get_definition" do
       it "should return false" do
-        Rivet::Utils.get_definition("unit_test")
+        Rivet::Utils.get_definition("unit_test",AUTOSCALE_DIR)
       end
     end
 
     context "and with a group directory" do
       before do
-        FileUtils.mkdir_p definition_dir
+        FileUtils.mkdir_p DEFINITION_DIR
       end
 
       describe "load_definition" do
         it "should return false" do
-          Rivet::Utils.load_definition("unit_test").should be_false
+          Rivet::Utils.load_definition("unit_test",AUTOSCALE_DIR).should be_false
         end
       end
 
       context "and with a conf.yml" do
         before do
-          FileUtils.mkdir_p definition_dir
-          File.open(File.join(definition_dir,"conf.yml"),'w') do |f|
+          FileUtils.mkdir_p DEFINITION_DIR
+          File.open(File.join(DEFINITION_DIR,"conf.yml"),'w') do |f|
             f.write(unit_test_definition_hash.to_yaml)
           end
         end
         describe "load_definition" do
           it "returns a hash" do
-            loaded_def = Rivet::Utils.load_definition("unit_test")
+            loaded_def = Rivet::Utils.load_definition("unit_test",AUTOSCALE_DIR)
             unit_test_definition_hash.each_pair { |k,v| loaded_def.should include(k => v) }
           end
         end
         context "and with a defaults.yml" do
           before do
-            File.open(File.join(Rivet::Utils::AUTOSCALE_DIR,"defaults.yml"),'w') do |f|
+            File.open(File.join(AUTOSCALE_DIR,"defaults.yml"),'w') do |f|
               f.write(defaults_hash.to_yaml)
             end
           end
 
           describe "consume_defaults" do
             it "consume defaults returns a hash" do
-              results = Rivet::Utils.consume_defaults
+              results = Rivet::Utils.consume_defaults(AUTOSCALE_DIR)
               defaults_hash.each_pair { |k,v| results.should include(k => v) }
             end
           end
 
          describe "get_definition" do
            it "returns a merged hash" do
-            result = Rivet::Utils.get_definition(definition_name)
+            result = Rivet::Utils.get_definition(DEFINITION_NAME,AUTOSCALE_DIR)
             merged_hash = defaults_hash.merge(unit_test_definition_hash)
             result.should == defaults_hash.merge(unit_test_definition_hash)
            end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivet
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: