toquen 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc919b62baa61b77c95fbc37adb7cf5dd605c191
-  data.tar.gz: 36e39c1a7c4e05714e158bce508cc6e14ec820f1
+  metadata.gz: 34b63993bc1126c81404fbe874d89914614bfff5
+  data.tar.gz: c4d2634dc32e3c8536bbc23b0b897c8a743aedbd
 SHA512:
-  metadata.gz: 7d16f37d4d3b0ba4f707921b76b3cd82270ed65cdfcac00bae9814cbd2bd48b7a0a14e1bbf91cf91aa72fa60af57c2827e4e5004695257f15cd3a839bbec6d9c
-  data.tar.gz: a9228618e4e6a0e0683505e35a1d80fd6f7924302430046b45de959e6bc430ddd75eb16df366981609c536ed183d274fa37c4f68b6c89c77acd123d08cec8406
+  metadata.gz: e33a6a39783554076024a8aa06d90aaf967c1928c42e05441316524592565db98f63def6bbc8872b4c8f7f5abc1b93e72291750d09c88be7af0e4907d07fd36f
+  data.tar.gz: e3ec4ce94543cf174ecbd00cfb7e938b44167952d46dec9edc147ff9c3f878c5280d521427b9add8afd173c682e1c82ae6c076a1fd78c61698479bd785e8efc7

data/README.md

@@ -21,8 +21,10 @@ require 'toquen'
 
 And then on the command line execute:
 
-    $ bundle
-    $ cap toquen_install
+```shell
+bundle
+cap toquen_install
+```
 
 This will create a config directory with a file named *deploy.rb*.  Edit this file, setting the location of your AWS key, AWS credentials, and chef cookbooks/data bags/roles.  If your servers are in a region (or regions) other than us-east-1, then you'll need to set the region as [described below](#additional-configuration).
 
@@ -30,7 +32,9 @@ Then, in AWS, create an [AWS instance tag](http://docs.aws.amazon.com/AWSEC2/lat
 
 Then, run:
 
-    $ cap update_roles
+```shell
+cap update_roles
+```
 
 This will create a data_bag named *servers* in your data_bags path that contains one item per server name, as well as create stages per server and role for use in capistrano.
 
@@ -45,43 +49,59 @@ Bootstrapping a server will perform all of the following:
 
 You can bootstrap a single server by using:
 
-    $ cap server-<server name> bootstrap
+```shell
+cap server-<server name> bootstrap
+```
 
 Or a all the servers with a given role:
 
-    $ cap <role name> bootstrap
+```shell
+cap <role name> bootstrap
+```
 
 Or on all servers:
 
-    $ cap all bootstrap
+```shell
+cap all bootstrap
+```
 
 A lockfile is created after the first bootstrapping so that the full bootstrap process is only run once per server.
 
 ## Running Chef-Solo
 You can run chef-solo for a single server by using:
 
-    $ cap server-<server name> cook
+```shell
+cap server-<server name> cook
+```
 
 Or a all the servers with a given role with:
 
-    $ cap <role name> cook
+```shell
+cap <role name> cook
+```
 
 Or on all servers:
 
-    $ cap all cook
+```shell
+cap all cook
+```
 
 ## Updating Roles
 If you change the roles of any servers on AWS (or add any new ones) you will need to run:
 
-    $ cap update_roles
+```shell
+cap update_roles
+```
 
 This will update the *servers* data_bag as well as the capistrano stages.
 
 ## Additional Configuration
-If you want to use a different tag name (or you like commas as a delimiter) you can specify your own role extractor by placing the following in either your Capfile or config/deploy.rb:
+If you want to use a different tag name (or you like commas as a delimiter) you can specify your own role extractor/setter by placing the following in either your Capfile or config/deploy.rb:
 
 ```ruby
+# these are the default - replace with your own
 Toquen.config.aws_roles_extractor = lambda { |inst| (inst.tags["MyRoles"] || "").split(",") }
+Toquen.config.aws_roles_setter = lambda { |ec2, inst, roles| ec2.tags.create(inst, 'Roles', :value => roles.sort.join(' ')) }
 ```
 
 By default, instance information is only pulled out of the default region (us-east-1), but you can specify mutiple alternative regions:
@@ -99,27 +119,46 @@ set :chef_upload_location, "/tmp/toquen"
 ## View Instances
 To see details about your aws instances you can use the **details** cap task.
 
-    $ cap all details
+```shell
+cap all details
+```
 
 Or for a given role with:
 
-    $ cap <role name> details
+```shell
+cap <role name> details
+```
 
 Or for a given server with:
 
-    $ cap server-<server name> details
+```shell
+cap server-<server name> details
+```
 
 ## Open SSH to Current Machine
 To allow an SSH connection from your current machine (based on your internet visible IP, as determined using [this method](http://findingscience.com/internet/ruby/2014/05/17/stunning:-determining-your-public-ip.html)), use the open_ssh/close_ssh capistrano tasks.
 
-    $ cap databases open_ssh
+```shell
+cap databases open_ssh
+```
 
 And then, when you're finished:
 
-    $ cap databases close_ssh
+```shell
+cap databases close_ssh
+```
 
 Or, if you want to do everything in one step:
 
-    $ cap databases open_ssh cook close_ssh
+```shell
+cap databases open_ssh cook close_ssh
+```
+
+**Note**: You can also use the task *open_port[22]* and *close_port[22]* to open and close SSH (or any other port).
+
+## Additional Cap Tasks
+There are a few other helper cap tasks as well - to see them, run:
 
-**Note**: You can also use the task *open_port[22]* and *close_port[22]* to open and close SSH (or any other port).
+```shell
+cap -T
+```

data/lib/toquen.rb

@@ -8,10 +8,11 @@ require "toquen/details_table"
 
 module Toquen
   class Config
-    attr_accessor :aws_roles_extractor
+    attr_accessor :aws_roles_extractor, :aws_roles_setter
 
     def initialize
       @aws_roles_extractor = lambda { |inst| (inst.tags["Roles"] || "").split }
+      @aws_roles_setter = lambda { |ec2, inst, roles| ec2.tags.create(inst, 'Roles', :value => roles.sort.join(' ')) }
     end
   end
 

data/lib/toquen/aws.rb

@@ -21,6 +21,38 @@ module Toquen
       }
     end
 
+    def add_role(ivips, role)
+      @regions.each do |region|
+        AWS.config(:access_key_id => @key_id, :secret_access_key => @key, :region => region)
+        ec2 = AWS::EC2.new
+        ec2.instances.map do |i|
+          if ivips.include? i.public_ip_address
+            roles = Toquen.config.aws_roles_extractor.call(i)
+            unless roles.include? role
+              roles << role
+              ec2.tags.create(i, 'Roles', :value => roles.uniq.sort.join(' '))
+            end
+          end
+        end
+      end
+    end
+
+    def remove_role(ivips, role)
+      @regions.each do |region|
+        AWS.config(:access_key_id => @key_id, :secret_access_key => @key, :region => region)
+        ec2 = AWS::EC2.new
+        ec2.instances.map do |i|
+          if ivips.include? i.public_ip_address
+            roles = Toquen.config.aws_roles_extractor.call(i)
+            if roles.include? role
+              roles = roles.reject { |r| r == role }
+              Toquen.config.aws_roles_setter.call(ec2, i, roles.uniq)
+            end
+          end
+        end
+      end
+    end
+
     def get_security_groups(ids)
       ectwo = AWS::EC2.new
       ids.map { |id| ectwo.security_groups[id] }

data/lib/toquen/capistrano.rb

@@ -86,6 +86,30 @@ task :cook do
 end
 before :cook, :update_kitchen
 
+desc "Add given role to machines"
+task :add_role, :role do |t, args|
+  run_locally do
+    if args[:role].nil? or args[:role].empty?
+      error "You must give the role to add"
+    else
+      aws = Toquen::AWSProxy.new
+      aws.add_role roles(:all), args[:role]
+    end
+  end
+end
+
+desc "Remove given role from machines"
+task :remove_role, :role do |t, args|
+  run_locally do
+    if args[:role].nil? or args[:role].empty?
+      error "You must give the role to remove"
+    else
+      aws = Toquen::AWSProxy.new
+      aws.remove_role roles(:all), args[:role]
+    end
+  end
+end
+
 desc "Open a port of ingress to the current machine"
 task :open_port, :port do |t, args|
   port = (args[:port] || 22).to_i

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano