rig 0.4.1 → 0.4.2

data/lib/rig/command/abstract.rb

@@ -37,6 +37,9 @@ module Rig
           r << server.flavor_id.to_s
           r << server.id.to_s
           r << server.state.to_s.downcase
+          if detailed
+            r << server.dns_name
+          end
           rows << r
         end
 
@@ -50,6 +53,7 @@ module Rig
         cols << "Size"
         cols << "Instance ID"
         cols << "State"
+        cols << "DNS" if detailed
 
         print_table(cols, rows)
       end

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

@@ -1,10 +1,37 @@
 require 'rig'
+require 'rest-client'
 
 module Rig
   module Command
     module Balancer
       class Main < Abstract
         self.default_subcommand = 'list'
+        subcommand 'test', 'test a load balancer' do
+          option %w{-c --count}, "COUNT", "number of times to loop", :default => 100
+          option %w{-p --poll}, "POLL", "poll time", :default => 10
+          parameter "NAME", "name of the load balancer to test"
+
+          def execute
+            elb = Rig::Model::Balancer.find(name)
+            raise "elb #{name} not found" unless elb
+
+            dns = elb.dns_name
+            count.times do |i|
+              puts "### loop #{i}"
+              ips = `host #{dns}`.split(/\n/).collect { |e| e.split.last }
+              ips.each do |ip|
+                val = begin
+                  RestClient.get("http://#{ip}")
+                rescue => e
+                  e.message
+                end
+                print ".. #{ip} - #{val}"
+                puts
+              end
+              sleep poll
+            end
+          end
+        end
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Rig
           records = Rig::Model::Dns.records("#{zone}")
           rows    = []
           records.each do |record|
-            rows << [zone, record.type, record.ttl, record.name, record.value]
+            rows << [zone, record.type, record.ttl, record.name, [*record.value].join(",")]
           end
           print_table(%w{Domain Type TTL Name Value}, rows)
         end

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

@@ -5,7 +5,6 @@ module Rig
   module Command
     module Environment
       class Create < Abstract
-
         parameter "NAME", "the name of the environment"
         parameter "TEMPLATE", "the template to use (solo, multi, etc)", :default => "solo"
 

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

@@ -1,15 +1,56 @@
 require 'rig'
+require 'awesome_print'
 
 module Rig
   module Command
     module Instance
       class Create < Abstract
+        option %w{-i --image}, "IMAGE", "the image / ami to use, default: your account image"
+        option %w{-f --flavor}, "FLAVOR", "the flavor / size to use"
+        option %w{-k --keypair}, "KEYPAIR", "the key pair / name to use, default: your account keypair"
+        option %w{-g --groups}, "GROUPS", "comma separated list of groups, default: your account groups"
+        option %w{-r --region}, "GROUPS", "the region, default: your account region"
+        option %w{--add}, :flag, "add this to the existing instances of this role and environment"
+        option "--[no-]chef", :flag, "use chef to bootstrap", :default => true
 
         parameter "ENVIRONMENT", "the environment this instance should belong to"
         parameter "ROLE", "the instance role", :default => 'solo'
 
         def execute
-          puts "create: env:#{environment} role:#{role}"
+          name = role
+          # figure out if there are others of this role, if there are add a number to name to distinguish.
+          n    = "#{name}.#{environment}.env"
+          chef = Rig.config[:chef] ? true : false
+
+          unless flavor
+            raise "must specify flavor"
+          end
+
+          o = {
+              :image_id  => image,
+              :flavor_id => flavor,
+              :key_name  => keypair,
+              :groups    => groups.split(','),
+              :user_data => Rig::Model::Userdata.create(n, role, environment, :chef => chef)
+          }
+          tags = {'Name' => n, 'Environment' => environment, 'Role' => role}
+          server = Rig::Model::Instance.create(o, tags)
+          puts "created: #{server.id}"
+        rescue => e
+          puts "error: #{e.message}"
+          raise Clamp::HelpWanted, self
+        end
+
+        def default_image
+          Rig.account[:image].is_a?(Hash) ? Rig.account[:image].first.last : Rig.account[:image]
+        end
+
+        def default_keypair
+          Rig.account[:keypair]
+        end
+
+        def default_groups
+          Rig.account[:groups].join(",")
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Rig
       class List < Abstract
         include Options::ShowAll
 
-        option %w{-d --detailed}, :flag, "show more information in table"
+        option %w{-l --long}, :flag, "show more information in table"
         parameter "[ENV]", "environment"
 
         def execute
@@ -16,7 +16,7 @@ module Rig
           filters["tag:Environment"] = env if env
 
           list = connection.servers.all(filters)
-          instance_list(list, detailed?)
+          instance_list(list, long?)
         end
       end
     end

data/lib/rig/command/ssh.rb

@@ -1,9 +1,10 @@
 module Rig
   module Command
     class Ssh < Abstract
+      option %w{-u --user}, "USER", "the user to login as", :default => (Rig.config[:ssh][:user] rescue nil)
       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
+        #user = Rig.config[:ssh][:user] rescue nil
         unless user
           puts "must set rig:ssh:user in configuration."
           exit(1)

data/lib/rig/model/dns.rb

@@ -23,16 +23,15 @@ module Rig
           )
         end
 
-        def create(name, value)
+        def create(name, value, options={})
           zone = zone(Rig.get_config(:dns_zone))
 
           if IPAddress.valid?(value)
             #A record
-            o = {:name => name, :value => value, :type => 'A', :ttl => 86400}
+            o = {:name => name, :value => value, :type => 'A', :ttl => 86400}.merge(options)
           else
             #CNAME record
-            #name = name.gsub(/\.#{Rig.get_config(:dns_zone)}/,'')
-            o = {:name => name, :value => value, :type => 'CNAME', :ttl => 300}
+            o = {:name => name, :value => value, :type => 'CNAME', :ttl => 300}.merge(options)
           end
           zone.records.create(o)
         end

data/lib/rig/model/environment.rb

@@ -96,22 +96,14 @@ module Rig
 
               @balancers << balancer
 
-              # set dns for balancer for this role (<role>.<env>.env.inqlabs.com)
-              # example:
-              # 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.#@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.#@zone #{balancer.attributes[:dns_name]}"
-                Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name])
+                Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name], :ttl => 30)
               end
             else
-              #TODO: handle no balancer, but primary - point to server instance
+              #TODO: need to support balancer: false, primary: true = point to server instance
               #if tmpl[:primary]
               #  puts ".. primary #{name}.env.#@zone #{}"
               #end

data/lib/rig/model/instance.rb

@@ -32,8 +32,8 @@ module Rig
         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}/ }
+          (role, env) = name.match(/(\w+)\.(\w+)/)[1..2]
+          find_by_role_and_environment(role, env).select {|s| s.tags['Name'] =~ /^#{role}/ }
         end
 
         def create(opts, tags={})

data/lib/rig/version.rb

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

metadata

@@ -1,116 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rig
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: clamp
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ipaddress
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Cloud provisioning tool built on ruby fog
-email: 
+email:
 - scatanzarite@gmail.com
-executables: 
+executables:
 - rig
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -171,37 +175,26 @@ files:
 - rig.gemspec
 homepage: https://github.com/shawncatz/rig
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Cloud provisioning tool built on ruby fog
 test_files: []
-
-has_rdoc: