rig 0.3.3 → 0.3.4

data/conf/accounts/default.yml

@@ -1,14 +1,41 @@
+# The region for this account.
+# Each account can have a different region, so you can
+# manage deployments in different regions easily.
+region: us-east-1
 
+# The DNS zone to manage.
+# Generally this will be different for each account,
+# but it is possible to have all of your accounts
+# managed under a single zone... IF you are using
+# the same DNS provider for all of your accounts.
+dns_zone: blah.com
+
+# this is the key that you will use to SSH to the server
+keypair: keyname
+
+# Common settings.
+# In most cases, you will be using the same provider
+# for all of the different components within your
+# infrastructure (Compute, DNS, Balancers, etc).
+# You can store the common keys and secrets here.
 common: &common
   aws_access_key_id: aws_key
   aws_secret_access_key: aws_secret
+
+# Compute settings
+# These are passed to Fog when creating a connection
 compute:
   <<: *common
   provider: AWS
-  region: us-east-1
+  region: *region
+
+# DNS settings
+# These are passed to Fog when creating a connection
 dns:
   <<: *common
   provider: AWS
-  zone: dns.zone.com
+
+# Balancer settings
+# These are passed to Fog when creating a connection
 balancer:
   <<: *common

data/conf/config.yml

@@ -11,7 +11,8 @@ rig:
 
   ssh:
     # user to connect as, when ssh'ing to server
-    user: root
+    # AWS defaults to the user "ubuntu"
+    user: ubuntu
 
   # the account to use if one is not specified
   default_account: default
@@ -22,6 +23,28 @@ rig:
   #  - default
   #  - production
 
+  # configuration overrides
+  # these values override those in the templates
 
-#  flavor_id: ami-8baa73e2 # ubuntu 11.10, non-ebs storage
-#  key_name:  keyname
+  # DNS zone to manage
+  # generally, this should be set in the account
+  #dns_zone: blah.com
+
+  # the default region to use
+  # accounts can specify different regions
+  # meaning you can have a different rig account
+  # file for each deployment region
+  region: us-east-1
+
+  # AWS images (AMI's) are different per region
+  # for ubuntu, go to: http://cloud.ubuntu.com/ami/
+  image:
+    us-east-1: ami-8baa73e2 # ubuntu 11.10, non-ebs storage
+
+  # this is the key that you will use to SSH to the server
+  # keypair in account takes precedence
+  keypair: keyname
+
+  # specifying a flavor here will force all instances to
+  # be that flavor, overrides flavor in template
+  #flavor: m1.large

data/lib/rig/capistrano.rb

@@ -3,7 +3,7 @@
 # host lists for capistrano to use.
 
 require 'rig'
-require 'rig/cloud'
+require 'rig/model'
 require 'capistrano'
 
 module Rig
@@ -11,12 +11,12 @@ module Rig
     def servers
       env     = ENV['ENVIRONMENT'] || Rig.config.environment
       role    = ENV['ROLE'] || Rig.config.role
-      servers = Rig::Cloud::Environment.find(env).servers
+      servers = Rig::Model::Environment.find(env).servers
       list    = servers.select { |s| s.tags['Role'] == role }
 
       raise "Rig could not find any servers matching environment=#{env} and role=#{role}" unless list && list.count > 0
       list.each do |s|
-        server "#{s.tags['Name']}.#{Rig.config.dns.zone}", :web, :app
+        server "#{s.tags['Name']}.#{Rig.get_config(:dns_zone)}", :web, :app
       end
     rescue => e
       puts "*** servers not found: #{e.message}"
@@ -34,8 +34,8 @@ configuration.load do
 
   puts "  * reading rig information..."
 
-  set :environments, Rig::Cloud::Environment.list
-  set :servers, Rig::Cloud::Instance.running
+  set :environments, Rig::Model::Environment.list
+  set :servers, Rig::Model::Instance.running
   set :rigroles, servers.collect { |s| s.tags['Role'] }.compact
 
   Rig.config.environment = ARGV[0]

data/lib/rig/command.rb

@@ -3,7 +3,7 @@ require 'clamp'
 require 'fog'
 require 'yaml'
 
-require 'rig/cloud'
+require 'rig/model'
 
 require 'rig/command/abstract'
 require 'rig/command/options'

data/lib/rig/command/balancer/destroy.rb

@@ -6,7 +6,7 @@ module Rig
       class Destroy < Abstract
         parameter "NAME", "name of load balancer"
         def execute
-          Rig::Cloud::Balancer.destroy(name)
+          Rig::Model::Balancer.destroy(name)
         end
       end
     end

data/lib/rig/command/balancer/list.rb

@@ -5,7 +5,7 @@ module Rig
     module Balancer
       class List < Abstract
         def execute
-          list = Rig::Cloud::Balancer.all
+          list = Rig::Model::Balancer.all
           list.each do |lb|
             puts lb.id
             lb.instances.each do |inst|

data/lib/rig/command/balancer/view.rb

@@ -9,7 +9,7 @@ module Rig
         parameter "NAME", "name of instance"
 
         def execute
-          item = Rig::Cloud::Balancer.find(name)
+          item = Rig::Model::Balancer.find(name)
           puts item.attributes.to_yaml
         end
       end

data/lib/rig/command/dns/create.rb

@@ -9,7 +9,7 @@ module Rig
         parameter 'VALUE', 'where the name points to'
 
         def execute
-          Rig::Cloud::Dns.create(name, value)
+          Rig::Model::Dns.create(name, value)
         end
       end
     end

data/lib/rig/command/dns/destroy.rb

@@ -6,7 +6,7 @@ module Rig
       class Destroy < Abstract
         parameter "NAME", "name of load balancer"
         def execute
-          Rig::Cloud::Dns.destroy(name)
+          Rig::Model::Dns.destroy(name)
         end
       end
     end

data/lib/rig/command/dns/edit.rb

@@ -9,8 +9,8 @@ module Rig
         parameter 'VALUE', 'where the name points to'
 
         def execute
-          Rig::Cloud::Dns.destroy(name)
-          Rig::Cloud::Dns.create(name, value)
+          Rig::Model::Dns.destroy(name)
+          Rig::Model::Dns.create(name, value)
         end
       end
     end

data/lib/rig/command/dns/list.rb

@@ -5,8 +5,8 @@ module Rig
     module Dns
       class List < Abstract
         def execute
-          zone    = Rig.config.dns.zone
-          records = Rig::Cloud::Dns.records("#{zone}")
+          zone    = Rig.get_config(:dns_zone)
+          records = Rig::Model::Dns.records("#{zone}")
           rows    = []
           records.each do |record|
             rows << [zone, record.type, record.ttl, record.name, record.value]

data/lib/rig/command/environment/create.rb

@@ -12,8 +12,8 @@ module Rig
         parameter "TEMPLATE", "the template to use (solo, multi, etc)", :default => "solo"
 
         def execute
-          #connection = Rig::Cloud.compute
-          env = Rig::Cloud::Environment.create(name, template.to_sym)
+          #connection = Rig::Connection.compute
+          env = Rig::Model::Environment.create(name, template.to_sym)
           #ap env.servers
         end
       end

data/lib/rig/command/environment/destroy.rb

@@ -8,7 +8,7 @@ module Rig
         parameter "NAME", "name of the environment to destroy"
 
         def execute
-          Rig::Cloud::Environment.destroy(name)
+          Rig::Model::Environment.destroy(name)
         end
       end
     end

data/lib/rig/command/environment/list.rb

@@ -9,14 +9,14 @@ module Rig
         option %w{-s --simple}, :flag, "just show list of names"
 
         def execute
-          envs = Rig::Cloud::Environment.list
+          envs = Rig::Model::Environment.list
 
           if simple?
             print_table(%w{Name}, envs)
           else
             rows = []
             envs.each do |e|
-              env = Rig::Cloud::Environment.find(e)
+              env = Rig::Model::Environment.find(e)
               rows << [env.name, env.template, env.region, env.servers.count, env.balancers.count]
             end
             print_table(%w{Name Template Region Servers# Balancers#}, rows)

data/lib/rig/command/instance/destroy.rb

@@ -9,8 +9,8 @@ module Rig
       parameter "NAME", "the name of the instance to connect to"
 
       def execute
-        list = Rig::Cloud::Instance.find(name)
-        Rig::Cloud::Instance.destroy(list)
+        list = Rig::Model::Instance.find(name)
+        Rig::Model::Instance.destroy(list)
       end
     end
     end

data/lib/rig/command/instance/list.rb

@@ -9,7 +9,7 @@ module Rig
         parameter "[ENV]", "environment"
 
         def execute
-          connection = Rig::Cloud.compute
+          connection = Rig::Connection.compute
           filters = {}
           filters["instance-state-name"] = "running" unless showall?
           filters["tag:Environment"] = env if env

data/lib/rig/command/instance/tag/get.rb

@@ -12,7 +12,7 @@ module Rig
               raise "Must set either instance name or instance id (-iname or -iid)"
             end
 
-            connection = Rig::Cloud.compute
+            connection = Rig::Connection.compute
             if iid
               instance = connection.servers.get(iid)
             else

data/lib/rig/command/instance/tag/remove.rb

@@ -15,7 +15,7 @@ module Rig
               raise "Must set either instance name or instance id (-iname or -iid)"
             end
 
-            connection = Rig::Cloud.compute
+            connection = Rig::Connection.compute
             if iid
               instance = connection.servers.get(iid)
             else

data/lib/rig/command/instance/tag/set.rb

@@ -14,7 +14,7 @@ module Rig
               raise "Must set either instance name or instance id (-iname or -iid)"
             end
 
-            connection = Rig::Cloud.compute
+            connection = Rig::Connection.compute
             if iid
               instance = connection.servers.get(iid)
             else

data/lib/rig/command/instance/view.rb

@@ -7,7 +7,7 @@ module Rig
         parameter "NAME", "name of instance"
 
         def execute
-          list = Rig::Cloud::Instance.find(name)
+          list = Rig::Model::Instance.find(name)
           list.each do |item|
             puts item.attributes.to_yaml
             puts

data/lib/rig/command/keypair/list.rb

@@ -3,7 +3,7 @@ module Rig
     module Keypair
       class List < Abstract
         def execute
-          connection = Rig::Cloud.compute
+          connection = Rig::Connection.compute
           list = connection.key_pairs.all
           puts list.inspect
         end

data/lib/rig/command/main.rb

@@ -11,13 +11,21 @@ module Rig
 
       subcommand "accounts", "show account list" do
         def execute
-          list = Rig.account_list
+          list = Rig::Model::Account.list
           list.each do |n, f|
             puts " #{n} => #{f}"
           end
         end
       end
 
+      def merge_file(src, dest)
+        old = YAML.load_file(dest)
+        FileUtils.mv(dest, "#{dest}.bak.#{Time.now.to_i}")
+        new = YAML.load_file(src)
+        new.merge!(old)
+        File.open(dest, "w") {|f| f.write(new.to_yaml)}
+      end
+
       subcommand "init", "initialize configuration directory" do
         option %w{-f --force}, :flag, "force creation of files", :default => false
         option %w{-d --directory}, "DIRECTORY", "configuration directory", :default => "~/.rig"

data/lib/rig/command/ssh.rb

@@ -9,7 +9,7 @@ module Rig
           exit(1)
         end
 
-        list = Rig::Cloud::Instance.find_by_nick(name)
+        list = Rig::Model::Instance.find_by_nick(name)
         if list.count == 0
           puts "server not found."
         elsif list.count > 1

data/lib/rig/config.rb

@@ -1,6 +1,10 @@
 
 module Rig
   class << self
+    @templates = []
+    @accounts = []
+    @cache_config = []
+
     def configdir
       @configdir ||= File.expand_path(ENV["RIG_CONFIG"] || "~/.rig")
     end
@@ -15,26 +19,16 @@ module Rig
       end
     end
 
-    def account_list
-      @account_list ||= begin
-        accountdir = "#{configdir}/accounts"
-        Dir["#{accountdir}/*"].inject({}) do |h, e|
-          f = e.gsub("#{accountdir}/", "")
-          f = File.basename(f, ".yml")
-          h[f.to_sym] = e
-          h
-        end
-      end
+    def account(name=get_account)
+      Rig::Model::Account.load(name)
     end
 
-    def account
-      @account ||= begin
-        Oconfig.load_yaml_file("#{configdir}/accounts/#{get_account}.yml")
-      end
+    def get_config(name)
+      Rig.account[name] || Rig.config[name] || nil
     end
 
-    def template(name)
-      #TODO: implement getting template data from file
+    def get_template(name)
+      Rig::Model::Template.load(name)
     end
 
     def get_account
@@ -52,7 +46,7 @@ module Rig
         raise "Configuration not found: #{path} (#{file})" unless File.exists?(file)
         yaml = YAML.load_file(file)
         yaml = yaml[yaml.keys.first] if yaml.keys.count == 1
-        Rig::Oconfig.new(yaml)
+        self.new(yaml)
       end
     end
 

data/lib/rig/model.rb

@@ -0,0 +1,3 @@
+require 'rig'
+
+Dir["#{File.dirname(__FILE__)}/model/*.rb"].each {|file| require file.gsub(/\.rb/,'')}

data/lib/rig/model/account.rb

@@ -0,0 +1,25 @@
+module Rig
+  module Model
+    class Account < Rig::Oconfig
+      class << self
+        def load(name)
+          self.load_yaml_file("#{dir}/#{name}.yml")
+        end
+
+        def list
+          Dir["#{dir}/*"].inject({ }) do |h, e|
+            f           = e.gsub("#{dir}/", "")
+            f           = File.basename(f, ".yml")
+            h[f.to_sym] = e
+            h
+          end
+        end
+
+        private
+        def dir
+          "#{Rig.configdir}/accounts"
+        end
+      end
+    end
+  end
+end

data/lib/rig/{cloud → model}/balancer.rb

@@ -1,14 +1,14 @@
 
 module Rig
-  module Cloud
+  module Model
     class Balancer
       class << self
         def all
-          Rig::Cloud.balancer.load_balancers.all
+          Rig::Connection.balancer.load_balancers.all
         end
 
         def new(name)
-          Rig::Cloud.balancer.load_balancers.new({ :id => name })
+          Rig::Connection.balancer.load_balancers.new({ :id => name })
         end
 
         def create(name)
@@ -19,7 +19,7 @@ module Rig
         end
 
         def find(name)
-          Rig::Cloud.balancer.load_balancers.get(name)
+          Rig::Connection.balancer.load_balancers.get(name)
         end
 
         def find_by_environment(name)

data/lib/rig/{cloud → model}/connection.rb

@@ -2,7 +2,7 @@ require 'rig'
 require 'fog'
 
 module Rig
-  module Cloud
+  module Connection
     class << self
       def compute
         @compute ||= begin

data/lib/rig/{cloud → model}/dns.rb

@@ -2,15 +2,15 @@ require 'rig'
 require 'ipaddress'
 
 module Rig
-  module Cloud
+  module Model
     class Dns
       class << self
         def all
-          Rig::Cloud.dns.zones.all
+          Rig::Connection.dns.zones.all
         end
 
         def zone(zone)
-          Rig::Cloud.dns.zones.find(zone).first
+          Rig::Connection.dns.zones.find(zone).first
         end
 
         def records(zone)
@@ -18,27 +18,27 @@ module Rig
         end
 
         def zone_create(name)
-          Rig::Cloud.dns.zones.create(
+          Rig::Connection.dns.zones.create(
               :domain => name
           )
         end
 
         def create(name, value)
-          zone = zone(Rig.config.dns.zone)
+          zone = zone(Rig.get_config(:dns_zone))
 
           if IPAddress.valid?(value)
             #A record
             o = {:name => name, :value => value, :type => 'A', :ttl => 86400}
           else
             #CNAME record
-            #name = name.gsub(/\.#{Rig.config.dns.zone}/,'')
+            #name = name.gsub(/\.#{Rig.get_config(:dns_zone)}/,'')
             o = {:name => name, :value => value, :type => 'CNAME', :ttl => 300}
           end
           zone.records.create(o)
         end
 
         def destroy(name)
-          zone = zone(Rig.config.dns.zone)
+          zone = zone(Rig.get_config(:dns_zone))
           name = name.gsub(/\.$/, '')
           # cant seem to make zone.records#get or zone.records#find work correctly
           list = zone.records.all.select {|e| e.attributes[:name] == "#{name}."}

data/lib/rig/{cloud → model}/environment.rb

@@ -1,10 +1,11 @@
 module Rig
-  module Cloud
+  module Model
     class Environment
       attr_reader :servers
       attr_reader :balancers
       attr_reader :name
       attr_reader :template
+      attr_reader :template_name
       attr_reader :image
       attr_reader :region
       attr_reader :flavor
@@ -36,7 +37,7 @@ module Rig
         def list
           filters = { }
 
-          list = Rig::Cloud.compute.servers.all(filters)
+          list = Rig::Connection.compute.servers.all(filters)
           list.inject([]) { |a, e| a << e.tags["Environment"] }.compact.uniq.sort
         end
 
@@ -70,51 +71,53 @@ module Rig
             :region => Rig.config.region,
         }.merge(opts)
 
-        @name      = name
-        @template  = template
-        @region    = @options[:region]
-        #TODO: allow global config setting for image (in AWS, the ami)
-        @image     = @options[:image] # || Rig.config.compute.image[@region] || Rig.config.compute.image
-        #TODO: allow global config setting for flavor (in AWS, the size, like: m1.large)
-        @flavor    = @options[:flavor] # || Rig.config.flavor[@region] || Rig.config.flavor
-        @servers   = []
-        @balancers = []
+        @name          = name
+        @template_name = template
+        #@region    = @options[:region]
+        ##TODO: allow global config setting for image (in AWS, the ami)
+        #@image     = @options[:image] # || Rig.config.compute.image[@region] || Rig.config.compute.image
+        ##TODO: allow global config setting for flavor (in AWS, the size, like: m1.large)
+        #@flavor    = @options[:flavor] # || Rig.config.flavor[@region] || Rig.config.flavor
+        @servers       = []
+        @balancers     = []
       end
 
       def save
         puts "creating instances"
 
-        template_name = @template.to_sym
-        template      = TEMPLATES[template_name]
-        raise "unknown template #{template}" unless template
+        #@template      = TEMPLATES[@template_name]
+        @template = Rig.get_template(@template_name)
+        raise "unknown template #{template}" unless @template
+        load_config
 
-        template[:instances].each do |inst|
+        @template[:instances].each do |inst|
           setinstances = []
           inst.each do |role, tmpl|
-            count   = tmpl[:count]
-            image   = tmpl[:image] || @image
-            flavor  = tmpl[:flavor] || @flavor
-            keypair = Rig.config.keypair
+            count = tmpl[:count] || 1
             count.times do |i|
               n    = "#{role}#{i+1}.#{name}.env"
               chef = Rig.config.chef ? true : false
 
               o = {
-                  :image_id  => image,
-                  :flavor_id => flavor,
-                  :key_name  => keypair,
-                  :groups    => tmpl[:groups] || template[:groups],
-                  :user_data => Rig::Cloud.userdata(n, role, name, :chef => chef)
+                  :image_id  => tmpl[:image] || @image,
+                  :flavor_id => tmpl[:flavor] || @flavor,
+                  :key_name  => tmpl[:keypair] || @keypair,
+                  :groups    => tmpl[:groups] || @template[:groups] || @groups,
+                  :user_data => Rig::Model::Userdata.create(n, role, name, :chef => chef)
               }
 
-              server = Rig::Cloud::Instance.create(o, 'Name' => n, 'Environment' => name, 'Role' => role)
+              # throw this error, because Fog and AWS don't care if you don't set a keypair
+              # but you won't be able to easily connect to it
+              raise "No key_name (keypair) set." unless o[:key_name]
+
+              server = Rig::Model::Instance.create(o, 'Name' => n, 'Environment' => name, 'Role' => role)
               @servers << server
               setinstances << server
             end
 
             if tmpl[:balance]
               puts "creating balancer"
-              balancer = Rig::Cloud::Balancer.create("#{name}-#{role}")
+              balancer = Rig::Model::Balancer.create("#{name}-#{role}")
               balancer.register_instances(setinstances.collect { |e| e.id })
               balancer.save
 
@@ -125,14 +128,14 @@ module Rig
               # if there are 3 servers with the harvester role
               # in the environment test
               # then the dns would be harvester.test.env.inqlabs.com
-              puts ".. dns: #{role}.#{name}.env.#{Rig.config.dns.zone} #{balancer.attributes[:dns_name]}"
-              Rig::Cloud::Dns.create("#{role}.#{name}.env.#{Rig.config.dns.zone}", balancer.attributes[:dns_name])
+              puts ".. dns: #{role}.#{name}.env.#@zone #{balancer.attributes[:dns_name]}"
+              Rig::Model::Dns.create("#{role}.#{name}.env.#@zone", balancer.attributes[:dns_name])
 
               # set primary dns for environment (<name>.env.inqlabs.com)
               # to point to this load balancer
               if tmpl[:primary]
-                puts ".. primary: #{name}.env.#{Rig.config.dns.zone} #{balancer.attributes[:dns_name]}"
-                Rig::Cloud::Dns.create("#{name}.env.#{Rig.config.dns.zone}", balancer.attributes[:dns_name])
+                puts ".. primary: #{name}.env.#@zone #{balancer.attributes[:dns_name]}"
+                Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name])
               end
             end
           end
@@ -155,43 +158,43 @@ module Rig
 
         puts "associating servers' DNS"
         @servers.each do |server|
-          record = "#{server.tags['Name']}.#{Rig.config.dns.zone}"
+          record = "#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}"
           dns    = server.attributes[:dns_name]
           ip     = server.attributes[:public_ip_address]
 
           puts ".. #{record} dns=#{dns} ip=#{ip}"
           if dns
-            Rig::Cloud::Dns.create(record, dns)
+            Rig::Model::Dns.create(record, dns)
           else
             puts "server #{server.id} doesn't have public_ip_address"
           end
         end
       rescue => e
-        puts "error creating environment: #{e.message}"
+        puts "error creating environment:\n#{e.message} at #{e.backtrace.join("\n")}"
         destroy
-        raise "error creating environment: #{e.message}"
+        raise "error creating environment: #{e.message} at #{e.backtrace.first}"
       end
 
       def destroy
         puts "removing dns from servers"
         @servers.each do |server|
-          Rig::Cloud::Dns.destroy("#{server.tags['Name']}.#{Rig.config.dns.zone}") if server.tags['Name']
+          Rig::Model::Dns.destroy("#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}") if server.tags['Name']
         end
 
-        roles = @servers.collect {|s| s.tags['Role'] }.compact
+        roles = @servers.collect { |s| s.tags['Role'] }.compact
         roles.each do |r|
           puts "removing role balancer dns"
-          Rig::Cloud::Dns.destroy("#{r}.#{name}.env.#{Rig.config.dns.zone}")
+          Rig::Model::Dns.destroy("#{r}.#{name}.env.#{Rig.get_config(:dns_zone)}")
         end
 
         puts "removing primary dns"
-        Rig::Cloud::Dns.destroy("#{name}.env.#{Rig.config.dns.zone}")
+        Rig::Model::Dns.destroy("#{name}.env.#{Rig.get_config(:dns_zone)}")
 
         puts "destroying servers"
-        Rig::Cloud::Instance.destroy(@servers)
+        Rig::Model::Instance.destroy(@servers)
 
         puts "destroying balancers"
-        Rig::Cloud::Balancer.destroy(@balancers)
+        Rig::Model::Balancer.destroy(@balancers)
 
         if Rig.config.chef
           puts "destroying chef environment"
@@ -205,12 +208,35 @@ module Rig
       end
 
       private
+
+      def load_config
+        @region  = @options[:region] ||
+            Rig.get_config(:region) ||
+            nil
+        @image   = @options[:image] ||
+            Rig.account.image ||
+            Rig.config.image.kind_of?(Oconfig) ? Rig.config.image[@region] : Rig.config.image ||
+            nil
+        @flavor  = @options[:flavor] ||
+            Rig.get_config(:flavor) ||
+            nil
+        @zone    = @options[:dns_zone] ||
+            Rig.get_config(:dns_zone) ||
+            nil
+        @keypair = @options[:keypair] ||
+            Rig.get_config(:keypair) ||
+            nil
+        @groups = @options[:groups] ||
+            Rig.get_config(:groups) ||
+            nil
+      end
+
       def find_servers
-        @servers = Rig::Cloud::Instance.find_by_environment(@name) || []
+        @servers = Rig::Model::Instance.find_by_environment(@name) || []
       end
 
       def find_balancers
-        @balancers = Rig::Cloud::Balancer.find_by_environment(@name) || []
+        @balancers = Rig::Model::Balancer.find_by_environment(@name) || []
       end
     end
   end

data/lib/rig/{cloud → model}/instance.rb

@@ -1,11 +1,11 @@
 require 'fog'
 
 module Rig
-  module Cloud
+  module Model
     class Instance
       class << self
         def all(filters={})
-          Rig::Cloud.compute.servers.all(filters)
+          Rig::Connection.compute.servers.all(filters)
         end
 
         def running
@@ -14,18 +14,18 @@ module Rig
 
         def find(id)
           if id =~ /^i-/
-            Rig::Cloud.compute.servers.find(id)
+            Rig::Connection.compute.servers.find(id)
           else
             # must be tag:Name
-            Rig::Cloud.compute.servers.all({"tag:Name"=>id})
+            Rig::Connection.compute.servers.all({"tag:Name"=>id})
           end
         end
 
         def find_by_environment(env)
-          Rig::Cloud.compute.servers.all({"tag:Environment"=>env})
+          Rig::Connection.compute.servers.all({"tag:Environment"=>env})
         end
         def find_by_role_and_environment(role, env)
-          Rig::Cloud.compute.servers.all({"tag:Environment"=> env, "tag:Role" => role})
+          Rig::Connection.compute.servers.all({"tag:Environment"=> env, "tag:Role" => role})
         end
 
         def find_by_nick(name)
@@ -34,7 +34,7 @@ module Rig
         end
 
         def create(opts, tags={})
-          fog = Rig::Cloud.compute
+          fog = Rig::Connection.compute
           server = fog.servers.create(opts)
           fog.create_tags(server.id, tags) if tags.count > 0
           puts ".. created: #{server.id}"
@@ -45,7 +45,7 @@ module Rig
           list = [*list]
 
           if list.count > 0
-            compute = Rig::Cloud.compute
+            compute = Rig::Connection.compute
             ids = list.map {|e| e.kind_of?(String) ? e : e.id}
             puts ".. destroying: #{ids.inspect}"
 

data/lib/rig/model/template.rb

@@ -0,0 +1,34 @@
+module Rig
+  module Model
+    class Template
+      class << self
+        def load(name)
+          self.load_yaml_file("#{dir}/#{name}.yml")
+        end
+
+        def load_yaml_file(path)
+          file = File.expand_path(path)
+          raise "Configuration not found: #{path} (#{file})" unless File.exists?(file)
+          yaml = YAML.load_file(file)
+          yaml = yaml[yaml.keys.first] if yaml.keys.count == 1
+
+          yaml
+        end
+
+        def list
+          Dir["#{dir}/*"].inject({ }) do |h, e|
+            f           = e.gsub("#{dir}/", "")
+            f           = File.basename(f, ".yml")
+            h[f.to_sym] = e
+            h
+          end
+        end
+
+        private
+        def dir
+          "#{Rig.configdir}/templates"
+        end
+      end
+    end
+  end
+end

data/lib/rig/{cloud → model}/userdata.rb

@@ -1,20 +1,21 @@
 require 'erubis'
 
 module Rig
-  module Cloud
-    class << self
-      def userdata(name, role, environment, opts={ })
-        data = {
-            :name         => name,
-            :role         => role,
-            :environment  => environment,
-            :zone         => Rig.config.dns.zone,
-            :dependencies => %w{ ruby1.9.3 ruby1.9.1-dev rubygems ruby-switch libopenssl-ruby1.9.1 rdoc1.9.1 ri1.9.1 irb1.9.1
+  module Model
+    class Userdata
+      class << self
+        def create(name, role, environment, opts={ })
+          data     = {
+              :name         => name,
+              :role         => role,
+              :environment  => environment,
+              :zone         => Rig.get_config(:dns_zone),
+              :dependencies => %w{ ruby1.9.3 ruby1.9.1-dev rubygems ruby-switch libopenssl-ruby1.9.1 rdoc1.9.1 ri1.9.1 irb1.9.1
                                  build-essential wget ssl-cert curl },
-            :gems         => %w{chef},
-            :chef         => false,
-        }.merge(opts)
-        template  = <<-EOF
+              :gems         => %w{chef},
+              :chef         => false,
+          }.merge(opts)
+          template = <<-EOF
 #!/bin/bash
 set -e -x
 exec > ~/userdata.log 2>&1
@@ -102,9 +103,10 @@ tRv2ngXlc2sYh9RbnlWSdaK0g+U7V8l2wSsQjcPQ1J2vbIGjwBHDSzjc
 VALID
 
 chef-client -N <%= @name %> <%= @chef && @environment ? "-E " + @environment : "" %> --once -j /etc/chef/bootstrap.json 2>&1
-        EOF
-        erb           = Erubis::Eruby.new(template)
-        out = erb.evaluate(data)
+          EOF
+          erb = Erubis::Eruby.new(template)
+          out = erb.evaluate(data)
+        end
       end
     end
   end

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 3
-      TINY  = 3
+      TINY  = 4
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rig
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Shawn Catanzarite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-25 00:00:00 Z
+date: 2012-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clamp
@@ -124,13 +124,6 @@ files:
 - lib/rig.rb
 - lib/rig/capistrano.rb
 - lib/rig/chef.rb
-- lib/rig/cloud.rb
-- lib/rig/cloud/balancer.rb
-- lib/rig/cloud/connection.rb
-- lib/rig/cloud/dns.rb
-- lib/rig/cloud/environment.rb
-- lib/rig/cloud/instance.rb
-- lib/rig/cloud/userdata.rb
 - lib/rig/command.rb
 - lib/rig/command/abstract.rb
 - lib/rig/command/balancer/destroy.rb
@@ -161,6 +154,15 @@ files:
 - lib/rig/command/options.rb
 - lib/rig/command/ssh.rb
 - lib/rig/config.rb
+- lib/rig/model.rb
+- lib/rig/model/account.rb
+- lib/rig/model/balancer.rb
+- lib/rig/model/connection.rb
+- lib/rig/model/dns.rb
+- lib/rig/model/environment.rb
+- lib/rig/model/instance.rb
+- lib/rig/model/template.rb
+- lib/rig/model/userdata.rb
 - lib/rig/version.rb
 - rig.gemspec
 homepage: https://github.com/shawncatz/rig

data/lib/rig/cloud.rb

@@ -1,3 +0,0 @@
-require 'rig'
-
-Dir["#{File.dirname(__FILE__)}/cloud/*.rb"].each {|file| require file.gsub(/\.rb/,'')}