rig 0.3.1 → 0.3.2

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rig.gemspec
 gemspec
+
+gem 'chef', '~> 0.10.8'
+gem 'net-ssh', '~> 2.1.4'

data/conf/accounts/default.yml

@@ -0,0 +1,14 @@
+
+common: &common
+  aws_access_key_id: aws_key
+  aws_secret_access_key: aws_secret
+compute:
+  <<: *common
+  provider: AWS
+  region: us-east-1
+dns:
+  <<: *common
+  provider: AWS
+  zone: dns.zone.com
+balancer:
+  <<: *common

data/conf/config.yml

@@ -0,0 +1,27 @@
+
+rig:
+
+  # if you're using chef, set this to the knife.rb configuration file
+  # this will allow Rig to manage the chef nodes, environments and such.
+  #
+  #chef:
+  #   knife: /path/to/chef/knife.rb
+  #
+  # TODO: Figure out the same thing for puppet
+
+  ssh:
+    # user to connect as, when ssh to server
+    user: root
+
+  # the account to use if one is not specified
+  default_account: default
+
+  # uncomment this and specify the accounts you want to support
+  # all others will be filtered from use.
+  #accounts:
+  #  - default
+  #  - production
+
+
+#  flavor_id: ami-8baa73e2 # ubuntu 11.10, non-ebs storage
+#  key_name:  keyname

data/conf/templates/multi.yml

@@ -0,0 +1,16 @@
+---
+:instances:
+- :memcache:
+    :count: 1
+    :flavor: m1.large
+  :appserver:
+    :count: 3
+    :flavor: c1.large
+    :balance: true
+  :webserver:
+    :count: 3
+    :flavor: c1.large
+    :balance: true
+    :primary: true
+:groups:
+- default

data/conf/templates/solo.yml

@@ -0,0 +1,9 @@
+---
+:instances:
+- :solo:
+    :count: 1
+    :flavor: c1.medium
+    :balance: true
+    :primary: true
+:groups:
+- default

data/lib/rig/cloud.rb

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

data/lib/rig/cloud/connection.rb

@@ -6,33 +6,18 @@ module Rig
     class << self
       def compute
         @compute ||= begin
-          Fog::Compute.new(
-              :provider => Rig.config.provider,
-              :aws_access_key_id => Rig.config.key,
-              :aws_secret_access_key => Rig.config.secret,
-              :region => Rig.config.region
-          )
+          Fog::Compute.new(Rig.account.compute.to_hash)
         end
       end
       def balancer
         @balancer ||= begin
           #Fog::Compute.new(
-          Fog::AWS::ELB.new(
-              #:provider => Rig.config.provider,
-              :aws_access_key_id => Rig.config.key,
-              :aws_secret_access_key => Rig.config.secret,
-              :region => Rig.config.region
-          )
+          Fog::AWS::ELB.new(Rig.account.balancer.to_hash)
         end
       end
       def dns
         @dns ||= begin
-          Fog::DNS.new(
-              :provider => Rig.config.provider,
-              :aws_access_key_id => Rig.config.key,
-              :aws_secret_access_key => Rig.config.secret
-              #:region => Rig.config.region
-          )
+          Fog::DNS.new(Rig.account.dns.to_hash)
         end
       end
     end

data/lib/rig/cloud/instance.rb

@@ -24,6 +24,14 @@ module Rig
         def find_by_environment(env)
           Rig::Cloud.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})
+        end
+
+        def find_by_nick(name)
+          (role, num, env) = name.match(/(\w+)(\d+)\.(\w+)/)[1..3]
+          find_by_role_and_environment(role, env).select {|s| s.tags['Name'] =~ /^#{role}#{num}/ }
+        end
 
         def create(opts, tags={})
           fog = Rig::Cloud.compute

data/lib/rig/command.rb

@@ -9,6 +9,7 @@ require 'rig/command/abstract'
 require 'rig/command/options'
 
 require 'rig/command/main'
+require 'rig/command/ssh'
 
 require 'rig/command/environment/main'
 require 'rig/command/environment/list'
@@ -27,7 +28,6 @@ require 'rig/command/dns/edit'
 require 'rig/command/dns/destroy'
 
 require 'rig/command/instance/main'
-require 'rig/command/instance/ssh'
 require 'rig/command/instance/list'
 require 'rig/command/instance/create'
 require 'rig/command/instance/destroy'

data/lib/rig/command/abstract.rb

@@ -3,9 +3,10 @@ require 'terminal-table/import'
 module Rig
   module Command
     class Abstract < Clamp::Command
-      option ["-n","--test"], :flag, "use Fog.mock! to test command without creating / destroying cloud resources" do |o|
+      option ["-n", "--test"], :flag, "use Fog.mock! to test command without creating / destroying cloud resources" do |o|
         Fog.mock!
       end
+      option ["-a", "--account"], "ACCOUNT", "set the rig account to use", :default => "default"
 
       def print_table(columns, rows)
         puts table(columns, *rows)
@@ -14,18 +15,19 @@ module Rig
       def instance_list(list)
         rows = []
         list.each do |server|
-          name = server.tags['Name']
-          env = server.tags['Environment']
-          role = server.tags['Role']
-          ip = server.public_ip_address.to_s
-          flavor = server.flavor_id.to_s
-          id = server.id.to_s
-          state = server.state.to_s.downcase
-
-          rows << [name, env, role, ip, flavor, id, state]
+          r = []
+          r << server.tags['Name']
+          r << server.tags['Environment']
+          r << server.tags['Role']
+          r << server.public_ip_address.to_s
+          r << server.private_ip_address.to_s
+          r << server.flavor_id.to_s
+          r << server.id.to_s
+          r << server.state.to_s.downcase
+          rows << r
         end
 
-        print_table(%w{Name Environment Role PublicIP Size InstanceID State}, rows)
+        print_table(%w{Name Environment Role PublicIP PrivateIP Size InstanceID State}, rows)
       end
 
       def execute

data/lib/rig/command/main.rb

@@ -1,3 +1,4 @@
+require 'awesome_print'
 
 module Rig
   module Command
@@ -8,40 +9,54 @@ module Rig
         exit(0)
       end
 
-      option %w{--init}, :flag, "initialize the ~/.rig configuration file" do |o|
-        dir = ENV['RIG_CONFIG'] ? File.dirname(ENV['RIG_CONFIG']) : ENV['HOME']
-
-        unless dir
-          puts "directory could not be found: tried environment variables RIG_CONFIG (#{ENV['RIG_CONFIG']}) and HOME (#{ENV['HOME']}"
-          exit(1)
+      subcommand "accounts", "show account list" do
+        def execute
+          list = Rig.account_list
+          list.each do |n, f|
+            puts " #{n} => #{f}"
+          end
         end
+      end
 
-        file = "#{dir}/.rig"
-        puts "[initializing] #{file}"
-        data = <<-EOF
-rig:
-  provider: AWS
-  key: AKIAIWUGNGSUZWW5XVCQ
-  secret: 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
-  ami: ami-8baa73e2
-  region: us-east-1
-  keypair: inqcloud-dev
-
-  dns:
-    zone: inqlabs.com
-
-  # if you're using chef, set this to the knife.rb configuration file
-  # this will allow Rig to manage the chef nodes, environments and such.
-  #chef:
-  #   knife: ~/work/chef/.chef/knife.rb
-  # TODO: Figure out the same thing for puppet
-
-  # eventually we should be able to put default options and such in the config file
-
-        EOF
-        #puts data
-        File.open(file, 'w') { |f| f.write(data) }
-        exit(0)
+      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"
+
+        def execute
+          dir = File.expand_path(ENV['RIG_CONFIG'] ? ENV['RIG_CONFIG'] : directory)
+          back = "#{dir}.bak.#{Time.now.to_i}"
+          conf = File.expand_path("../../../../conf", __FILE__)
+
+          files = ["config.yml", "accounts/default.yml", "templates/solo.yml", "templates/multi.yml"]
+
+          unless dir
+            puts "directory could not be found: tried environment variables RIG_CONFIG (#{ENV['RIG_CONFIG']}) and HOME (#{ENV['HOME']}"
+            exit(1)
+          end
+
+          if File.exists?(dir)
+            unless File.directory?(dir)
+              puts "moving old config #{dir} to #{back}"
+              FileUtils.mv(dir, new)
+            end
+          end
+
+          puts "[create] #{dir}/"
+          FileUtils.mkdir_p(dir)
+          FileUtils.mkdir_p("#{dir}/accounts")
+          FileUtils.mkdir_p("#{dir}/templates")
+
+          files.each do |file|
+            src  = "#{conf}/#{file}"
+            dest = "#{dir}/#{file}"
+            if File.exists?(dest) && !force?
+              puts "[skip] #{dest}"
+            else
+              puts "[create] #{dest}"
+              FileUtils.copy(src, dest)
+            end
+          end
+        end
       end
     end
   end

data/lib/rig/command/ssh.rb

@@ -0,0 +1,27 @@
+module Rig
+  module Command
+    class Ssh < Abstract
+      parameter "NAME", "name of the host. <role><#>.<env>, eg: solo1.stable for the first solo role in environment stable"
+      def execute
+        user = Rig.config.ssh.user rescue nil
+        unless user
+          puts "must set rig:ssh:user in configuration."
+          exit(1)
+        end
+
+        list = Rig::Cloud::Instance.find_by_nick(name)
+        if list.count == 0
+          puts "server not found."
+        elsif list.count > 1
+          puts "query returned more than one server:"
+          instance_list(list)
+        else
+          server = list.first
+          puts "connecting as #{user} to: #{server.tags['Name']} (#{server.public_ip_address})"
+          exec("ssh #{user}@#{server.public_ip_address}")
+        end
+      end
+    end
+  end
+end
+Rig::Command::Main.subcommand 'ssh', 'ssh to server', Rig::Command::Ssh

data/lib/rig/config.rb

@@ -1,19 +1,57 @@
 
 module Rig
   class << self
+    def configdir
+      @configdir ||= File.expand_path(ENV["RIG_CONFIG"] || "~/.rig")
+    end
+
     def config
       @configuration ||= begin
-        f = ENV["RIG_CONFIG"] || "~/.rig"
-        file = File.expand_path(f)
-        #puts "loading file: #{f}"
-        raise "Configuration not found: #{f} (#{file})" unless File.exists?(file)
-        yaml = YAML.load_file(file)
-        Rig::Oconfig.new(yaml['rig'])
+        c = Rig::Oconfig.load_yaml_file("#{configdir}/config.yml")
+        if c.chef
+          require 'rig/chef'
+        end
+        c
       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
+    end
+
+    def account
+      @account ||= begin
+        Oconfig.load_yaml_file("#{configdir}/accounts/#{get_account}.yml")
+      end
+    end
+
+    def get_account
+      return ENV['RIG_ACCOUNT'] if ENV['RIG_ACCOUNT']
+      return Rig.config.default_account if Rig.config.default_account
+      return Rig.config.accounts.first if Rig.config.accounts.count > 0
+      "default"
+    end
   end
 
   class Oconfig
+    class << self
+      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
+        Rig::Oconfig.new(yaml)
+      end
+    end
+
     def initialize(data={})
       @data = {}
       update!(data)
@@ -53,7 +91,7 @@ module Rig
     def to_hash
       out = {}
       @data.each do |k, v|
-        out[k.to_s] = v.kind_of?(Oconfig) ? v.to_hash : v
+        out[k] = v.kind_of?(Oconfig) ? v.to_hash : v
       end
       out
     end

data/lib/rig/version.rb

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

data/rig.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/rig/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Shawn Catanzarite"]
-  gem.email         = ["xenonsoul@gmail.com"]
+  gem.email         = ["scatanzarite@gmail.com"]
   gem.description   = %q{Cloud provisioning tool built on ruby fog}
   gem.summary       = %q{Cloud provisioning tool built on ruby fog}
   gem.homepage      = "https://github.com/shawncatz/rig"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rig
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Shawn Catanzarite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clamp
@@ -103,7 +103,7 @@ dependencies:
   version_requirements: *id006
 description: Cloud provisioning tool built on ruby fog
 email: 
-- xenonsoul@gmail.com
+- scatanzarite@gmail.com
 executables: 
 - rig
 extensions: []
@@ -117,6 +117,10 @@ files:
 - README.md
 - Rakefile
 - bin/rig
+- conf/accounts/default.yml
+- conf/config.yml
+- conf/templates/multi.yml
+- conf/templates/solo.yml
 - lib/rig.rb
 - lib/rig/capistrano.rb
 - lib/rig/chef.rb
@@ -146,7 +150,6 @@ files:
 - lib/rig/command/instance/destroy.rb
 - lib/rig/command/instance/list.rb
 - lib/rig/command/instance/main.rb
-- lib/rig/command/instance/ssh.rb
 - lib/rig/command/instance/tag/get.rb
 - lib/rig/command/instance/tag/main.rb
 - lib/rig/command/instance/tag/remove.rb
@@ -156,6 +159,7 @@ files:
 - lib/rig/command/keypair/main.rb
 - lib/rig/command/main.rb
 - lib/rig/command/options.rb
+- lib/rig/command/ssh.rb
 - lib/rig/config.rb
 - lib/rig/version.rb
 - rig.gemspec

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

@@ -1,32 +0,0 @@
-require 'rig'
-
-module Rig
-  module Command
-    module Instance
-    class Ssh < Abstract
-      include Options::Config
-
-      parameter "NAME", "the name of the instance to connect to"
-
-      def execute
-        connection = Rig::Cloud.compute
-
-        filters = {}
-        filters["tag:Name"] = name if name
-
-        list = connection.servers.all(filters)
-        if list.count > 1
-          puts "there is more than one instance that matches:"
-          instance_list(list)
-          return
-        end
-
-        server = list.first
-        puts "ssh root@#{server.public_ip_address}"
-      end
-    end
-    end
-  end
-end
-
-Rig::Command::Instance::Main.subcommand 'ssh', 'Connect to instance', Rig::Command::Instance::Ssh