rig 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -0,0 +1,110 @@
+# Changelog
+
+## v0.6.0:
+* add changelog task
+* fix smarter_templates merge conflict
+* smarter templates:
+* use a ruby dsl instead of yaml
+* clean up environment handling of templates
+* changes required for supporting new template framework
+* remove old yaml template examples
+* add a duo template as a basis for new multi-instance templates
+
+## v0.5.2:
+* fix bug with 'rig init', do not fail if config file does not exist
+
+## v0.5.1:
+* copy paste bug was causing commands not to load
+
+## v0.5.0:
+* refactor commands down to single class each
+* refactor commands
+* remove database command in favor of plugin
+* clean up plugin framework and add support for commands
+* clean up account and configuration handling
+* clean up log configuration handling
+* clean up chef and scout plugins
+* tweaks for chef userdata package
+* change name hooks -> plugins. cleaned up code. chef and scout plugins working. changed configuration to be part of the plugins configuration block, rather than a separate block.
+* hook framework working. supports event hooks and adding commands to the CLI
+* getting hooks set up
+
+## v0.4.5:
+* userdata refactor.
+* userdata packages allow customization of userdata scripts
+* default userdata shouldn't call apt-get upgrade
+* availability zones should be shown in ouput. make sure balancers only add zones that have instances
+* missed updating the accounts default file with example database info
+
+## v0.4.4:
+* rvm integration. add mongo support to CLI.
+
+## v0.4.3:
+* fix bug in Instance#find_by_nick
+
+## v0.4.2:
+* additional info in instance lists
+* fixes for ruby 1.9.3
+* balancer test command, should do something similar to the elb test script
+* get 'instance create' command working
+* support user switch for 'rig ssh'
+* set balancer DNS ttl to 30, to deal with timeout issues
+* clean up Instance#find_by_nick: was more complicated than it needed to be
+
+## v0.4.1:
+* bump version again. remove 1.9.3 dependency
+
+## v0.4.0:
+* merge feature/config_refactor
+* refactor configuration
+* config.yml
+  * this file should only contain rig configuration, nothing related to accounts
+  * don't use redundant rig node at top level of this file
+* accounts
+  * change the solo template to use a more standardized role name (appserver)
+* clean up rig capistrano integration, don't need to pull environments and servers before we know what environment we're working with
+* clean up configuration usage, use a standard Hash rather than Oconfig object
+  * this should make everything more standardized
+  * and solve the ruby 1.9.3 issues
+* remove commented ribbon dependency
+* get rid of unused command options
+* bug fixes
+* capistrano integration fix for handling environments
+* clean up fog dependencies for balancer
+
+## v0.3.8:
+* config cleanup
+* need to refactor config a bit, should remove global values from config, should be in account or template. config should be just for rig, nothing else
+* removed some debug statements
+* Listener Management from the CLI
+* added listener subcommand for balancer
+* added add subcommand for listener
+* added rm subcommand for listener
+* clean up configuration files
+
+## v0.3.7:
+
+## v0.3.6:
+
+## v0.3.5:
+* environment protection: now prevents environment#destroy if environment#protected?
+* some bug fixes. capistrano / chef / rig conflicts worked out (makes it easier to run cap with rig). instance#find was using wrong fog call (should be #get, not #find). configuration clean up. account handling working better now. some minor console ui stuff. environment protection implemented, need to add the check before destroy
+
+## v0.3.4:
+* refactor complete. environments build successfully. still so much to do
+* major refactor should be done. Moved 'cloud' classes to 'model'. worked out configuration overrides / precedence
+* major refactor
+* massive refactor
+* some config and init changes, cleanup
+
+## v0.3.3:
+* fixes for stupid bugs. ami vs. image, should use generic term. bad configuration overrides, need a cleaner way to handle this
+
+## v0.3.2:
+* don't load chef until after configuration is loaded (was causing config to load much earlier than intended). clean up way we get account
+* add account support, refactor configuration.
+* refactor SSH support
+* instance list shows private ip. Gemfile development dependencies
+
+## v0.3.1:
+

data/Gemfile

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

data/Rakefile

@@ -1,11 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-task :changelog do
+def changelog(last=nil, single=false)
   command="git --no-pager log --format='%an::::%h::::%s'"
 
   list = `git tag`
-  last = nil
 
   puts "# Changelog"
   puts
@@ -20,8 +19,11 @@ task :changelog do
       log.lines.each do |line|
         (who, hash, msg) = line.split('::::')
         unless check[msg]
-          unless msg =~ /^Merge branch/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
-            out << "#{msg.gsub(" *", "\n*")}"
+          unless msg =~ /^Merge branch/ || msg =~ /CHANGELOG/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
+            msg.gsub(" *", "\n*").gsub(/^\*\*/, "  *").lines.each do |l|
+              line = l =~ /^(\s+)*\*/ ? l : "* #{l}"
+              out << line
+            end
             check[msg] = hash
           end
         end
@@ -33,5 +35,16 @@ task :changelog do
     end
 
     last = tag
+    exit if single
   end
 end
+
+desc "generate changelog output"
+task :changelog do
+  changelog
+end
+
+desc "show current changes (changelog output from HEAD to most recent tag)"
+task :current do
+  changelog("HEAD",true)
+end

data/bin/rig

@@ -3,13 +3,3 @@ require 'rig'
 require 'rig/command'
 
 Rig::Command::Main.run
-
-#begin
-#  Rig::Command::Main.run
-#rescue Exception => e
-#  puts e.message
-#  if $DEBUG
-#    puts $!
-#    puts $@
-#  end
-#end

data/conf/plugins/chef.rb

@@ -23,10 +23,10 @@ module Rig
         self.environment_destroy(name)
       end
 
-      on "instance:create" do |args|
-        # do nothing
-        # the instance will add itself through the chef-client call in userdata package
-      end
+      #on "instance:create" do |args|
+      #  # do nothing
+      #  # the instance will add itself through the chef-client call in userdata package
+      #end
 
       on "instance:destroy" do |args|
         instance = args.shift
@@ -65,7 +65,7 @@ module Rig
           env.save
           true
         rescue => e
-          puts "*** chef exception: #{e.message}"
+          Rig::Log.error "*** chef exception: #{e.message}"
           false
         end
 
@@ -75,7 +75,7 @@ module Rig
           env.destroy if env
           true
         rescue => e
-          puts "*** chef exception: #{e.message}"
+          Rig::Log.error "*** chef exception: #{e.message}"
           false
         end
 

data/conf/plugins/mongo.rb

@@ -81,7 +81,7 @@ module Rig
             raise unless auth_admin
             connect.database_info
           rescue => e
-            puts "exception: <#{e.class}> #{e.message} at #{e.backtrace.first}"
+            Rig::Log.error "exception: <#{e.class}> #{e.message} at #{e.backtrace.first}"
           end
         end
 

data/lib/rig/config.rb

@@ -30,10 +30,10 @@ module Rig
         yaml = @config.to_yaml
         file = "#@dir/config.yml"
         back = "#{file}.#{Time.now.to_i}"
-        puts "backing up configuration -> #{back}"
+        Rig::Log.info "backing up configuration -> #{back}"
         FileUtils.cp(file, back)
         File.open(file, "w") { |f| f.write(yaml+"\n") }
-        puts "new configuration saved."
+        Rig::Log.info "new configuration saved."
       end
     end
   end

data/lib/rig/log.rb

@@ -15,6 +15,15 @@ module Rig
       def load(logging)
         logging ||= {}
         begin
+          console = Logger.new(STDOUT)
+          console_level = nil
+          console_config = logging.delete(:console)
+          if console_config && console_config[:level]
+            console_level = LEVELS[console_config[:level].to_sym]
+          end
+          console.level = console_level || Logger::INFO
+          add(console, proc {|s, _, _, m| "#{m}\n"})
+
           logging.each do |name, data|
             level = data[:level]
             opts  = [*data[:opts]].flatten
@@ -42,8 +51,8 @@ module Rig
         end
       end
 
-      def add(logger)
-        logger.formatter = proc { |severity, datetime, progname, msg| "#{$$}:#{datetime.strftime("%s")} #{severity[0]} #{msg}\n" }
+      def add(logger, formatter=nil)
+        logger.formatter = formatter || proc { |severity, datetime, progname, msg| "#{$$}:#{datetime.strftime("%s")} #{severity[0]} #{msg}\n" }
         @loggers << logger
       end
 

data/lib/rig/model/account.rb

@@ -19,10 +19,10 @@ module Rig
           yaml = data.to_yaml
           file = "#{dir}/#{name}.yml"
           back = "#{file}.#{Time.now.to_i}"
-          puts "backing up configuration -> #{back}"
+          Rig::Log.info "backing up configuration -> #{back}"
           FileUtils.cp(file, back)
           File.open(file, "w") {|f| f.write(yaml+"\n")}
-          puts "new configuration saved."
+          Rig::Log.info "new configuration saved."
         end
 
         private

data/lib/rig/model/balancer.rb

@@ -1,4 +1,3 @@
-require 'awesome_print'
 
 module Rig
   module Model
@@ -22,7 +21,7 @@ module Rig
         def create(name, listeners=[], zones=[])
           b = self.new(name, listeners, zones)
           b.save if b
-          puts ".. created: #{name}"
+          Rig::Log.info ".. created: #{name}"
           b
         end
 
@@ -38,7 +37,7 @@ module Rig
           list = [*list]
           lbs  = list.map { |e| e.kind_of?(String) ? self.find(e) : e }
           lbs.each do |lb|
-            puts ".. destroying: #{lb.id}"
+            Rig::Log.info ".. destroying: #{lb.id}"
             lb.destroy if lb
           end
         end
@@ -69,8 +68,9 @@ module Rig
           elb = find(name)
           (from_proto, from_port) = from.split(':')
           match = elb.listeners.select {|l| l.protocol == from_proto && l.lb_port == from_port.to_i }
+          #TODO: handle output in command, not here
           if match.count > 1
-            puts "more than one listener matched"
+            Rig::Log.info "more than one listener matched"
             match.each do |l|
               ap l.attributes
             end

data/lib/rig/model/dns.rb

@@ -43,10 +43,10 @@ module Rig
           list = zone.records.all.select {|e| e.attributes[:name] == "#{name}."}
           record = list.first
           if record
-            puts ".. destroying zone: #{name}"
+            Rig::Log.info ".. destroying zone: #{name}"
             record.destroy
           else
-            puts "record not found: #{name}"
+            Rig::Log.info "record not found: #{name}"
           end
         end
       end

data/lib/rig/model/environment.rb

@@ -33,7 +33,7 @@ module Rig
         def destroy(name, template=nil, opts={ })
           env = self.find(name, template, opts)
           raise "environment has protected instances" if env.protected?
-          puts "destroying: #{name}"
+          Rig::Log.info "destroying: #{name}"
           env.destroy
           true
         rescue => e
@@ -57,7 +57,7 @@ module Rig
       end
 
       def save
-        puts "creating instances"
+        Rig::Log.info "creating instances"
         load_config
         set = { }
 
@@ -76,7 +76,7 @@ module Rig
             # but you won't be able to easily connect to it
             raise "No key_name (keypair) set." unless o[:key_name]
 
-            Rig::Log.debug "creating instance: name:#{n} environment:#@name roles:#{s.roles.inspect}"
+            Rig::Log.info "creating instance: name:#{n} environment:#@name roles:#{s.roles.inspect}"
             instance = Rig::Model::Instance.create(o, 'Name' => n, 'Environment' => name, 'Roles' => s.roles.join(","))
             set[s.balancer] ||= []
             set[s.balancer] << instance if s.balancer
@@ -104,7 +104,6 @@ module Rig
         sleep 3
         reload
 
-
         Rig::Log.info "associating servers' DNS"
         @servers.each do |server|
           record = "#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}"
@@ -115,7 +114,7 @@ module Rig
           if dns
             Rig::Model::Dns.create(record, dns)
           else
-            Rig::Log.info "server #{server.id} doesn't have public_ip_address"
+            Rig::Log.warn "server #{server.id} doesn't have public_ip_address"
           end
         end
 
@@ -123,35 +122,29 @@ module Rig
       rescue => e
         Rig::Log.error "error creating environment:\n#{e.message} at #{e.backtrace.join("\n")}"
         destroy
-        Rig::Log.error "error creating environment: #{e.message} at #{e.backtrace.first}"
       end
 
       def destroy
-        puts "removing dns from servers"
+        Rig::Log.info "removing dns from servers"
         @servers.each do |server|
           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.each do |r|
-          puts "removing role balancer dns"
+          Rig::Log.info "removing role balancer dns"
           Rig::Model::Dns.destroy("#{r}.#{name}.env.#{Rig.get_config(:dns_zone)}")
         end
 
-        puts "removing primary dns"
+        Rig::Log.info "removing primary dns"
         Rig::Model::Dns.destroy("#{name}.env.#{Rig.get_config(:dns_zone)}")
 
-        puts "destroying servers"
+        Rig::Log.info "destroying servers"
         Rig::Model::Instance.destroy(@servers)
 
-        puts "destroying balancers"
+        Rig::Log.info "destroying balancers"
         Rig::Model::Balancer.destroy(@balancers)
 
-        #if Rig.config[:chef]
-        #  puts "destroying chef environment"
-        #  Rig::Chef.environment_destroy(name)
-        #end
-
         Rig::Plugin.run "environment:destroy", self
       end
 

data/lib/rig/model/instance.rb

@@ -14,11 +14,11 @@ module Rig
 
         def find(id)
           if id =~ /^i-/
-            puts "find #{id}"
+            Rig::Log.info "find #{id}"
             Rig::Connection.compute.servers.get(id)
           else
             # must be tag:Name
-            puts "all tag:Name => #{id}"
+            Rig::Log.info "all tag:Name => #{id}"
             Rig::Connection.compute.servers.all({"tag:Name"=>id})
           end
         end
@@ -34,13 +34,15 @@ module Rig
         def find_by_nick(name)
           (role, env) = name.match(/(\w+)\.(\w+)/)[1..2]
           find_by_environment(env).select {|s| s.tags['Name'] =~ /^#{role}/ }
+        rescue => e
+          Rig::Log.error "error finding server by nickname #{name}. name should be of the form: role#.environment"
         end
 
         def create(opts, tags={})
           fog = Rig::Connection.compute
           server = fog.servers.create(opts)
           fog.create_tags(server.id, tags) if tags.count > 0
-          puts ".. created: #{server.id}"
+          Rig::Log.info ".. created: #{server.id}"
           Rig::Plugin.run "instance:create", server
           server
         end
@@ -51,7 +53,7 @@ module Rig
           if list.count > 0
             compute = Rig::Connection.compute
             ids = list.map {|e| e.kind_of?(String) ? e : e.id}
-            puts ".. destroying: #{ids.inspect}"
+            Rig::Log.info ".. destroying: #{ids.inspect}"
 
             # destroy the instances
             list.each do |e|

data/lib/rig/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rig
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md