toquen 0.2.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37992871b208407c2654c023d1aa5c170c606310
-  data.tar.gz: 525c9bd60e41fab5593654aad4decaaea0127937
+  metadata.gz: 579e6f22363537bfbfb76e7f656af174e30aae2a
+  data.tar.gz: 511050a12e16cf24c25e73b1a4b31d4d96f39ac7
 SHA512:
-  metadata.gz: 7620d4539651e18d663093bb27c7e51d2514a3bed656f0dc4c6005f6a63a022d4c8d74389f9cc7ee748adfb32832e315ec8e809fc3416e4508247fb035ecc319
-  data.tar.gz: 2454c2e59f8a6677877bb8f8c3c6a1aa6cb57e18cbd13aa233fad5bdd8d7b31aa841656ab12bc8956048e28a9ef0f0fd5976c49f58ac57703128774c81364574
+  metadata.gz: 7d44a635acd6dd55c8fdfbc9ccb9f19e2f046423d543df0b5b8e6884094f0cd29299873789fb23327371766e27715c911109648410a8d8d3f56b75f51cde6d56
+  data.tar.gz: 8e227a65db4d5f382583377a737e2ad112b336396d62607ca715032e9d4da1d4a985645b50f3ad201321a3690c9639c728fc25e36da155c1f754469599d19ce3

data/README.md

@@ -26,9 +26,9 @@ 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).
+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/environments.  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).
 
-Then, in AWS, create an [AWS instance tag](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) named "Roles" for each instance, using a space separated list of chef roles as the value.  The "Name" tag must also be set or the instance will be ignored.
+Then, in AWS, create an [AWS instance tag](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) named "Roles" for each instance, using a space separated list of chef roles as the value.  The "Name" tag must also be set or the instance will be ignored.  You can optionally set an "Environment" tag as well if you'd like chef [to use an environment](https://docs.chef.io/environments.html) for that server.
 
 Then, run:
 
@@ -167,8 +167,8 @@ cap databases open_ssh cook close_ssh
 Toquen can also drop off a config file meant for use by applications on your system.  Here's how that works:
 
 1. Toquen creates a hash that contains a list of all of your servers and all of their details (based on your servers data_bag)
-1. Toquen looks for a file named "apps.json" in your config folder, and if it's found, Toquen pulls out all of the keys that correspond with the server's roles and merges them together with the hash it's building (if this file contains secrets, consider *not* including in revision control)
-1. The resulting hash is dropped off in your user's home directory (this can be overridden with the apps_config_path config variable) with the filename "apps.json".
+1. Toquen looks for a file named "apps.json" in your config folder, and if it's found, Toquen pulls out all of the keys that correspond with the server's roles and environments, and then it merges them together with the hash it's building (if this file contains secrets, consider *not* including in revision control)
+1. The resulting hash is dropped off in your user's home directory (this can be overridden with the `apps_config_path` config variable) with the filename "apps.json".
 
 Most likely, you'll want to add this line to your deploy.rb:
 

data/lib/toquen/aws.rb

@@ -104,7 +104,8 @@ module Toquen
             :type => i.instance_type,
             :external_dns => i.public_dns_name,
             :internal_dns => i.private_dns_name,
-            :security_groups => i.security_groups.to_a.map(&:id)
+            :security_groups => i.security_groups.to_a.map(&:id),
+            :environment => i.tags["Environment"] || nil
           }
         end
       end

data/lib/toquen/capistrano.rb

@@ -63,6 +63,9 @@ task :update_appconfig do
       host.properties.roles.each do |role|
         appconfig.merge!(apps[role.to_s] || {})
       end
+      if host.properties.environment
+        appconfig.merge!(apps[host.properties.environment.to_s] || {})
+      end
       debug "Uploading app config file to #{dest}"
       upload! StringIO.new(JSON.pretty_generate(appconfig)), "/tmp/apps.json"
       sudo "mv /tmp/apps.json #{dest}"
@@ -95,12 +98,13 @@ task :update_kitchen do
   run_locally do
     info "Building kitchen locally..."
     execute [
-             "rm -rf #{lkitchen}", 
-             "mkdir -p #{lkitchen}",
-             "ln -s #{File.expand_path(fetch(:chef_cookbooks_path))} #{lkitchen}",
-             "ln -s #{File.expand_path(fetch(:chef_data_bags_path))} #{lkitchen}",
-             "ln -s #{File.expand_path(fetch(:chef_roles_path))} #{lkitchen}"
-            ].join(" && ")
+      "rm -rf #{lkitchen}",
+      "mkdir -p #{lkitchen}",
+      "ln -s #{File.expand_path(fetch(:chef_cookbooks_path))} #{lkitchen}",
+      "ln -s #{File.expand_path(fetch(:chef_data_bags_path))} #{lkitchen}",
+      "ln -s #{File.expand_path(fetch(:chef_roles_path))} #{lkitchen}",
+      "ln -s #{File.expand_path(fetch(:chef_environments_path))} #{lkitchen}"
+    ].join(" && ")
   end
 
   open("#{lkitchen}/chef_config.rb", 'w') { |f|
@@ -124,13 +128,17 @@ desc "Run chef for servers"
 task :cook do
   on roles(:all), in: :parallel do |host|
     info "Chef is now cooking on #{host}..."
+    env = host.properties.environment
     roles = host.properties.roles.reject { |r| r.to_s.start_with?('server-') or r == :all }
     roles = roles.map { |r| "\"role[#{r}]\"" }.join(',')
     info "Roles for #{host}: #{roles}"
     tfile = "chef.json"
     upload! StringIO.new("{ \"run_list\": [ #{roles} ] }"), tfile
     within fetch(:chef_upload_location) do
-      execute "sudo chef-solo -c #{fetch(:chef_upload_location)}/kitchen/chef_config.rb -j #{tfile}"
+      args = ["-c #{fetch(:chef_upload_location)}/kitchen/chef_config.rb"]
+      args += ["-j #{tfile}"]
+      args += ["--environment #{env}"] unless env.nil?
+      execute "sudo chef-solo #{args.join(' ')}"
     end
   end
 end

data/lib/toquen/details_table.rb

@@ -19,7 +19,7 @@ module Toquen
         }
       )
       table.title = @color.bold { "Instances in #{@region}" }
-      header = [ "Name", "Roles", "Public", "Private", "Type" ]
+      header = [ "Name", "Roles", "Env", "Public", "Private", "Type" ]
       table.add_row header.map { |h| @color.underline @color.bold h }
       @instances.each do |instance|
         table.add_row instance_to_row(instance)
@@ -31,6 +31,7 @@ module Toquen
       [
         @color.green { instance[:name] },
         @color.yellow { instance[:roles].join(",") },
+        @color.magenta { instance[:environment] || "" },
         instance[:external_dns].nil? ? "(N/A)" : @color.cyan(instance[:external_dns]) + " (#{instance[:external_ip]})",
         instance[:internal_dns].nil? ? "(N/A)" : @color.cyan(instance[:internal_dns]) + " (#{instance[:internal_ip]})",
         @color.red { instance[:type] }

data/lib/toquen/local_writer.rb

@@ -16,7 +16,10 @@ module Toquen
         secgroups = []
         servers.each { |details|
           rstring = (details[:roles] + [ "all", "server-#{details[:name]}" ]).join(' ')
-          f.write("server '#{details[:external_ip]}', roles: %w{#{rstring}}, awsname: '#{details[:name]}'\n")
+          f.write("server '#{details[:external_ip]}', ")
+          f.write("roles: %w{#{rstring}}, ")
+          f.write("environment: \"#{details[:environment]}\", ") unless details[:environment].nil?
+          f.write("awsname: '#{details[:name]}'\n")
           secgroups += details[:security_groups]
         }
         secstring = secgroups.uniq.join(' ')

data/lib/toquen/templates/deploy.rb

@@ -13,3 +13,6 @@ set :ssh_options, { :keys => ["./mykey.pem"], :user => "ubuntu" }
 set :chef_cookbooks_path, 'kitchen/cookbooks'
 set :chef_data_bags_path, 'kitchen/data_bags'
 set :chef_roles_path, 'kitchen/roles'
+
+# this directory should exist, even if empty
+set :chef_environments_path, 'kitchen/environment'

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "0.2.7"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano