toquen 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833edeed8ec76c60048f4f5492c70824f2faefb1
-  data.tar.gz: c2fb59966d84c4c5da4fc5acf4af62d83df3249d
+  metadata.gz: a28059029b69454a045b609eb532ee6ae6c915b5
+  data.tar.gz: 90b6749d1f029af3c84a5a0bc8d73d4412e0a266
 SHA512:
-  metadata.gz: de3d318ee334a66cdd7bdc42ce37dc84f4d0fc47d5a4632223accf821f35002f81055fefa94b244962294e290e683e2c3fe6c709ad1fd071bf42e2fdbc46c142
-  data.tar.gz: 0e7b0556f75f879d39fc6c56e6ee49c51dc1bec3f0af88ba15d092e0c27c9646f9d757605f6fe481eb5128b440326ea8208784f8e47e45560453eb9b072b5049
+  metadata.gz: dab2f916dea92ea6ea56bb0b70abd5b6429c84ba8d542529b79638b66bde3499cb4ea5459bd48b13657db7ac38b86a7390222828a5f6782dad63a0625561eb03
+  data.tar.gz: 3734a36573be44c2d0c6cea9883b9fff820a812b76058bdc75608c0f6c0bebc45db82c79eee3c09336e68cb334aa36a2432032ae00f130f7cea6de65d1970193

data/README.md

@@ -96,13 +96,6 @@ cap update_nodes
 This will update the local node information cache 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/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:
 

data/Rakefile

@@ -1,9 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rdoc/task'
 
-RDoc::Task.new("doc") { |rdoc|
-  rdoc.title = "Toquen: Capistrano + AWS + Chef-Solo"
+RDoc::Task.new('doc') do |rdoc|
+  rdoc.title = 'Toquen: Capistrano + AWS + Chef-Solo'
   rdoc.rdoc_dir = 'docs'
   rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
-}
+end

data/lib/toquen.rb

@@ -1,22 +1,7 @@
-require "toquen/version"
-require "toquen/stunning"
-require "toquen/aws"
-require "toquen/local_writer"
-require "toquen/bootstrapper"
-require "toquen/capistrano"
-require "toquen/details_table"
-
-module Toquen
-  class Config
-    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
-
-  def self.config
-    @config ||= Config.new
-  end
-end
+require 'toquen/version'
+require 'toquen/stunning'
+require 'toquen/aws'
+require 'toquen/local_writer'
+require 'toquen/bootstrapper'
+require 'toquen/capistrano'
+require 'toquen/details_table'

data/lib/toquen/aws.rb

@@ -1,5 +1,6 @@
-require 'aws'
+require 'aws-sdk'
 
+# Top level module namespace
 module Toquen
   def self.servers_with_role(role)
     Toquen::AWSProxy.new.server_details.select do |details|
@@ -7,109 +8,101 @@ module Toquen
     end
   end
 
+  # Class to handle all interaction with AWS
   class AWSProxy
     attr_reader :regions
 
     def initialize
-      @key_id = fetch(:aws_access_key_id)
-      @key = fetch(:aws_secret_access_key)
       @regions = fetch(:aws_regions, ['us-east-1'])
-      AWS.config(:access_key_id => @key_id, :secret_access_key => @key)
+      key = fetch(:aws_access_key_id)
+      key_id = fetch(:aws_secret_access_key)
+      creds = Aws::Credentials.new(key, key_id)
+      Aws.config.update(credentials: creds) if creds.set?
     end
 
-    def server_details
-      filter @regions.map { |region| server_details_in(region) }.flatten
+    def server_details(running = true, regions = nil)
+      each_instance(running, regions) { |inst| extract_details(inst) }
     end
 
-    def filter(details)
-      details.select { |detail|
-        not detail[:name].nil? and detail[:roles].length > 0
-      }
+    def each_instance(running = true, regions = nil)
+      filters = []
+      filters << { name: 'instance-state-name', values: ['running'] } if running
+
+      results = []
+      (regions || @regions).each do |region|
+        resource = Aws::EC2::Resource.new(region: region)
+        results += resource.instances.map { |i| yield(i) }
+      end
+      results
     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
+      each_instance do |i|
+        roles = extract_details(i)[:roles]
+        next unless !roles.include?(role) && ivips.include?(i.public_ip_address)
+        roles << role
+        tag = { key: 'Roles', value: roles.uniq.sort.join(' ') }
+        i.create_tags(tags: [tag])
       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
+      each_instance do |i|
+        roles = extract_details(i)[:roles]
+        next unless roles.include?(role) && ivips.include?(i.public_ip_address)
+        roles.reject! { |r| r == role }
+        tag = { key: 'Roles', value: roles.uniq.sort.join(' ') }
+        i.create_tags(tags: [tag])
       end
     end
 
     def get_security_groups(ids)
-      result = []
       @regions.map do |region|
-        AWS.config(:access_key_id => @key_id, :secret_access_key => @key, :region => region)
-        AWS.memoize do
-          ectwo = AWS::EC2.new
-          ectwo.security_groups.each { |sg| result << sg if ids.include? sg.id }
-        end
-      end
-      result
+        sgs = Aws::EC2::Resource.new(region: region).security_groups
+        sgs.select { |sg| ids.include? sg.group_id }
+      end.flatten
     end
 
     def authorize_ingress(secgroup, protocol, port, ip)
       # test if exists first
-      return false if secgroup.ingress_ip_permissions.to_a.select { |p|
-        p.protocol == protocol and p.port_range.include?(port) and p.ip_ranges.include?(ip)
-      }.length > 0
+      return false unless secgroup.ip_permissions.to_a.select do |p|
+        port_match = ((p.from_port)..(p.to_port)).cover? port
+        ip_match = p.ip_ranges.map(&:cidr_ip).include?(ip)
+        p.ip_protocol == protocol && port_match && ip_match
+      end.empty?
 
-      secgroup.authorize_ingress(protocol, port, ip)
+      secgroup.authorize_ingress(ip_protocol: protocol, from_port: port,
+                                 to_port: port, cidr_ip: ip)
       true
     end
 
     def revoke_ingress(secgroup, protocol, port, ip)
       # test if exists first
-      return false unless secgroup.ingress_ip_permissions.to_a.select { |p|
-        p.protocol == protocol and p.port_range.include?(port) and p.ip_ranges.include?(ip)
-      }.length > 0
+      return false if secgroup.ip_permissions.to_a.select do |p|
+        port_match = ((p.from_port)..(p.to_port)).cover? port
+        ip_match = p.ip_ranges.map(&:cidr_ip).include?(ip)
+        p.ip_protocol == protocol && port_match && ip_match
+      end.empty?
 
-      secgroup.revoke_ingress(protocol, port, ip)
+      secgroup.revoke_ingress(ip_protocol: protocol, from_port: port,
+                              to_port: port, cidr_ip: ip)
       true
     end
 
-    def server_details_in(region)
-      AWS.config(:access_key_id => @key_id, :secret_access_key => @key, :region => region)
-      AWS.memoize do
-        AWS::EC2.new.instances.filter("instance-state-name", "running").map do |i|
-          {
-            :id => i.tags["Name"],
-            :internal_ip => i.private_ip_address,
-            :external_ip => i.public_ip_address,
-            :name => i.tags["Name"],
-            :roles => Toquen.config.aws_roles_extractor.call(i),
-            :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),
-            :environment => i.tags["Environment"] || nil
-          }
-        end
-      end
+    def extract_details(instance)
+      tags = instance.tags.each_with_object({}) { |t, h| h[t.key] = t.value }
+      {
+        id: tags['Name'],
+        name: tags['Name'],
+        type: instance.instance_type,
+        environment: tags['Environment'],
+        internal_ip: instance.private_ip_address,
+        external_ip: instance.public_ip_address,
+        external_dns: instance.public_dns_name,
+        internal_dns: instance.private_dns_name,
+        roles: tags.fetch('Roles', '').split,
+        security_groups: instance.security_groups.map(&:group_id)
+      }
     end
-
   end
 end

data/lib/toquen/bootstrapper.rb

@@ -6,7 +6,7 @@ module Toquen
       # host is available via the binding
       hosttype = fetch(:hosttype, 'ubuntu')
       path = File.expand_path("../templates/#{hosttype}_bootstrap.erb", __FILE__)
-      raise "Bootstrap process for #{hosttype} does not exist!" unless File.exists?(path)
+      raise "Bootstrap process for #{hosttype} does not exist!" unless File.exist?(path)
       user = fetch(:ssh_options)[:user]
       StringIO.new ERB.new(File.read(path)).result(binding)
     end

data/lib/toquen/capistrano.rb

@@ -5,14 +5,14 @@ require 'json'
 
 set :chef_upload_location, -> { "/home/#{fetch(:ssh_options)[:user]}" }
 
-desc "update local cache of nodes and roles"
+desc 'update local cache of nodes and roles'
 task :update_nodes do
   load Pathname.new fetch(:deploy_config_path, 'config/deploy.rb')
   roles = Hash.new([])
   servers = []
 
   aws = Toquen::AWSProxy.new
-  aws.server_details.each do |details|
+  aws.server_details.reject { |d| d[:roles].empty? }.each do |details|
     details[:roles].each { |role| roles[role] += [details] }
     roles['all'] += [details]
     Toquen::LocalWriter.create_node details
@@ -26,7 +26,7 @@ task :update_nodes do
   Toquen::LocalWriter.superfluous_check!(servers, roles.keys)
 end
 
-desc "SSH into a specific server"
+desc 'SSH into a specific server'
 task :ssh do
   hosts = []
   on roles(:all) do |host|
@@ -34,10 +34,10 @@ task :ssh do
   end
 
   run_locally do
-    if hosts.length == 0
-      warn "No server matched that role"
+    if hosts.empty?
+      warn 'No server matched that role'
     elsif hosts.length > 1
-      warn "More than one server matched that role"
+      warn 'More than one server matched that role'
     else
       keys = fetch(:ssh_options)[:keys]
       keyoptions = keys.map { |key| "-i #{key}" }.join(' ')
@@ -48,11 +48,11 @@ task :ssh do
   end
 end
 
-desc "send up apps.json config file"
+desc 'send up apps.json config file'
 task :update_appconfig do
-  if File.exists?('config/apps.json')
+  if File.exist?('config/apps.json')
     apps = JSON.parse(File.read('config/apps.json'))
-    config = { "_description" => "Dropped off by Toquen/Chef.", "servers" => [] }.merge(apps['default'] || {})
+    config = { '_description' => 'Dropped off by Toquen/Chef.', 'servers' => [] }.merge(apps['default'] || {})
     Dir.glob("#{fetch(:chef_nodes_path)}/*.json") do |fname|
       open(fname, 'r') { |f| config['servers'] << JSON.parse(f.read) }
     end
@@ -67,18 +67,18 @@ task :update_appconfig do
         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"
+      upload! StringIO.new(JSON.pretty_generate(appconfig)), '/tmp/apps.json'
       sudo "mv /tmp/apps.json #{dest}"
       sudo "chmod 755 #{dest}"
     end
   else
-    run_locally {
-      error "No config/apps.json file found."
-    }
+    run_locally do
+      error 'No config/apps.json file found.'
+    end
   end
 end
 
-desc "bootstrap a server so that it can run chef"
+desc 'bootstrap a server so that it can run chef'
 task :bootstrap do
   on roles(:all), in: :parallel do |host|
     info "Bootstrapping #{host}..."
@@ -88,24 +88,24 @@ task :bootstrap do
   end
 end
 
-desc "Update cookbooks/data bags/roles on server"
+desc 'Update cookbooks/data bags/roles on server'
 task :update_kitchen do
   kitchen = "#{fetch(:chef_upload_location)}/kitchen"
-  lkitchen = "/tmp/toquen/kitchen"
+  lkitchen = '/tmp/toquen/kitchen'
   user = fetch(:ssh_options)[:user]
   keys = fetch(:ssh_options)[:keys]
 
   run_locally do
-    info "Building kitchen locally..."
-    execute :rm, "-rf", lkitchen
-    execute :mkdir, "-p", lkitchen
-    %W(cookbooks data_bags roles environments nodes).each do |dname|
+    info 'Building kitchen locally...'
+    execute :rm, '-rf', lkitchen
+    execute :mkdir, '-p', lkitchen
+    %w(cookbooks data_bags roles environments nodes).each do |dname|
       source = File.expand_path fetch("chef_#{dname}_path".intern)
-      execute :ln, "-s", source, File.join(lkitchen, dname)
+      execute :ln, '-s', source, File.join(lkitchen, dname)
     end
   end
 
-  open("#{lkitchen}/chef_config.rb", 'w') { |f|
+  open("#{lkitchen}/chef_config.rb", 'w') do |f|
     f.write("cookbook_path '#{kitchen}/cookbooks'\n")
     f.write("role_path '#{kitchen}/roles'\n")
     f.write("data_bag_path '#{kitchen}/data_bags'\n")
@@ -114,7 +114,7 @@ task :update_kitchen do
     f.write("log_level :#{fetch(:chef_log_level)}\n")
     f.write("cache_path '/tmp/chef_cache'\n")
     f.write("local_mode 'true'\n")
-  }
+  end
 
   on roles(:all), in: :parallel do |host|
     sudo "chown -R #{user} #{fetch(:chef_upload_location)}"
@@ -126,7 +126,7 @@ task :update_kitchen do
   end
 end
 
-desc "Run chef for servers"
+desc 'Run chef for servers'
 task :cook do
   on roles(:all), in: :parallel do |host|
     info "Chef is now cooking on #{host}..."
@@ -138,11 +138,11 @@ task :cook do
 end
 before :cook, :update_kitchen
 
-desc "Add given role to machines"
-task :add_role, :role do |t, args|
+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"
+    if args[:role].nil? || args[:role].empty?
+      error 'You must give the role to add'
     else
       aws = Toquen::AWSProxy.new
       aws.add_role roles(:all), args[:role]
@@ -150,11 +150,11 @@ task :add_role, :role do |t, args|
   end
 end
 
-desc "Remove given role from machines"
-task :remove_role, :role do |t, args|
+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"
+    if args[:role].nil? || args[:role].empty?
+      error 'You must give the role to remove'
     else
       aws = Toquen::AWSProxy.new
       aws.remove_role roles(:all), args[:role]
@@ -162,102 +162,102 @@ task :remove_role, :role do |t, args|
   end
 end
 
-desc "Open a port of ingress to the current machine"
-task :open_port, :port do |t, args|
+desc 'Open a port of ingress to the current machine'
+task :open_port, :port do |_t, args|
   port = (args[:port] || 22).to_i
   run_locally do
     ivip = StunClient.get_ip
     if ivip.nil?
-      error "Could not fetch internet visible IP of this host."
+      error 'Could not fetch internet visible IP of this host.'
       return
     end
 
     ivip = "#{ivip}/32"
     aws = Toquen::AWSProxy.new
     aws.get_security_groups(fetch(:filter)[:secgroups]).each do |sg|
-      if aws.authorize_ingress sg, :tcp, port, ivip
-        info "Opened port tcp:#{port} on security group '#{sg.name}' (#{sg.id}) to #{ivip}"
+      if aws.authorize_ingress sg, 'tcp', port, ivip
+        info "Opened port tcp:#{port} on security group '#{sg.group_name}' (#{sg.id}) to #{ivip}"
       else
-        warn "Port tcp:#{port} in security group '#{sg.name}' (#{sg.id}) already open to #{ivip}"
+        warn "Port tcp:#{port} in security group '#{sg.group_name}' (#{sg.id}) already open to #{ivip}"
       end
     end
   end
 end
 
-desc "Close a port of ingress to the current machine"
-task :close_port, :port do |t, args|
+desc 'Close a port of ingress to the current machine'
+task :close_port, :port do |_t, args|
   port = (args[:port] || 22).to_i
   run_locally do
     ivip = StunClient.get_ip
     if ivip.nil?
-      error "Could not fetch internet visible IP of this host."
+      error 'Could not fetch internet visible IP of this host.'
       return
     end
 
     ivip = "#{ivip}/32"
     aws = Toquen::AWSProxy.new
     aws.get_security_groups(fetch(:filter)[:secgroups]).each do |sg|
-      if aws.revoke_ingress sg, :tcp, port, ivip
-        info "Closed port tcp:#{port} on security group '#{sg.name}' (#{sg.id}) to #{ivip}"
+      if aws.revoke_ingress sg, 'tcp', port, ivip
+        info "Closed port tcp:#{port} on security group '#{sg.group_name}' (#{sg.id}) to #{ivip}"
       else
-        warn "Port tcp:#{port} in security group '#{sg.name}' (#{sg.id}) already closed to #{ivip}"
+        warn "Port tcp:#{port} in security group '#{sg.group_name}' (#{sg.id}) already closed to #{ivip}"
       end
     end
   end
 end
 
-desc "Open SSH ingress to current machine"
+desc 'Open SSH ingress to current machine'
 task :open_ssh do
-  invoke "open_port", "22"
+  invoke 'open_port', '22'
 end
 
-desc "Close SSH ingress to current machine"
+desc 'Close SSH ingress to current machine'
 task :close_ssh do
-  invoke "close_port", "22"
+  invoke 'close_port', '22'
 end
 
-desc "install toquen capistrano setup to current directory"
+desc 'install toquen capistrano setup to current directory'
 task :toquen_install do
-  unless Dir.exists?('config')
-    puts "Creating config directory..."
+  unless Dir.exist?('config')
+    puts 'Creating config directory...'
     Dir.mkdir('config')
   end
-  unless Dir.exists?('config/deploy')
-    puts "Creating config/deploy directory..."
+  unless Dir.exist?('config/deploy')
+    puts 'Creating config/deploy directory...'
     Dir.mkdir('config/deploy')
   end
-  if not File.exists?('config/deploy.rb')
-    puts "Initializing config/deploy.rb configuration file..."
-    FileUtils.cp File.expand_path("../templates/deploy.rb", __FILE__), 'config/deploy.rb'
+  unless File.exist?('config/deploy.rb')
+    puts 'Initializing config/deploy.rb configuration file...'
+    FileUtils.cp File.expand_path('../templates/deploy.rb', __FILE__), 'config/deploy.rb'
   end
-  gipath = File.expand_path("../templates/gitignore", __FILE__)
-  if not File.exists?('.gitignore')
-    puts "Initializing .gitignore file..."
+  gipath = File.expand_path('../templates/gitignore', __FILE__)
+  if !File.exist?('.gitignore')
+    puts 'Initializing .gitignore file...'
     FileUtils.cp gipath, '.gitignore'
   else
-    puts "You already have a .gitignore, consider adding these files to it:"
+    puts 'You already have a .gitignore, consider adding these files to it:'
     puts File.read(gipath)
   end
 end
 
-desc "Show all information about EC2 instances"
+desc 'Show all information about EC2 instances'
 task :details do
   filter_roles = Set.new fetch(:filter)[:roles]
   aws = Toquen::AWSProxy.new
   aws.regions.each do |region|
-    instances = aws.server_details_in(region).reject do |instance|
-      instance_roles = instance[:roles] + ["all", "server-#{instance[:name]}"]
+    instances = aws.server_details(true, [region]).reject do |instance|
+      instance_roles = instance[:roles] + ['all', "server-#{instance[:name]}"]
       (filter_roles.intersection instance_roles.to_set).empty?
     end
     Toquen::DetailsTable.new(instances, region).output unless instances.empty?
   end
 end
-  
+
 module Capistrano
   module TaskEnhancements
-    alias_method :original_default_tasks, :default_tasks
+    alias original_default_tasks default_tasks
     def default_tasks
-      original_default_tasks + %w{toquen_install update_nodes}
+      original_default_tasks + %w(toquen_install update_nodes)
     end
   end
 end

data/lib/toquen/details_table.rb

@@ -3,7 +3,6 @@ require 'term/ansicolor'
 
 module Toquen
   class DetailsTable
-
     def initialize(instances, region)
       @instances = instances
       @region = region
@@ -12,14 +11,14 @@ module Toquen
 
     def output
       table = Terminal::Table.new(
-        :style => {
-          :border_x => "",
-          :border_i => "",
-          :border_y => ""
+        style: {
+          border_x: '',
+          border_i: '',
+          border_y: ''
         }
       )
       table.title = @color.bold { "Instances in #{@region}" }
-      header = [ "Name", "Roles", "Env", "Public", "Private", "Type" ]
+      header = %w(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)
@@ -30,10 +29,10 @@ module Toquen
     def instance_to_row(instance)
       [
         @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.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] }
       ]
     end

data/lib/toquen/local_writer.rb

@@ -3,7 +3,7 @@ module Toquen
     def self.create_node(details)
       FileUtils.mkdir_p fetch(:chef_nodes_path)
       path = File.join(fetch(:chef_nodes_path), "#{details[:name]}.json")
-      existing = File.exists?(path) ? JSON.parse(File.read(path)) : {}
+      existing = File.exist?(path) ? JSON.parse(File.read(path)) : {}
       open(path, 'w') do |f|
         node = {
           'name' => details[:name],
@@ -21,14 +21,14 @@ module Toquen
         f.write("# This file will be overwritten by toquen!  Don't put anything here.\n")
         f.write("set :stage, '#{name}'.intern\n")
         secgroups = []
-        servers.each { |details|
-          rstring = (details[:roles] + [ "all", "server-#{details[:name]}" ]).join(' ')
+        servers.each do |details|
+          rstring = (details[:roles] + ['all', "server-#{details[:name]}"]).join(' ')
           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]
-        }
+        end
         secstring = secgroups.uniq.join(' ')
         f.write("set :filter, roles: %w{#{name}}, secgroups: %w{#{secstring}}\n")
       end
@@ -37,18 +37,18 @@ module Toquen
     def self.superfluous_check!(servers, roles)
       # check for superflous stages / data bag items and warn if found
       run_locally do
-        Dir["#{fetch(:chef_data_bags_path)}/servers/*.json"].each { |path|
-          unless servers.include? File.basename(path, ".json")
+        Dir["#{fetch(:chef_data_bags_path)}/servers/*.json"].each do |path|
+          unless servers.include? File.basename(path, '.json')
             warn "Data bag item #{path} does not represent an active server. You should delete it."
           end
-        }
+        end
 
         stages = roles + servers.map { |n| "server-#{n}" }
-        Dir["config/deploy/*.rb"].each { |path|
-          unless stages.include? File.basename(path, ".rb")
+        Dir['config/deploy/*.rb'].each do |path|
+          unless stages.include? File.basename(path, '.rb')
             warn "Stage #{path} does not represent an active server. You should delete it."
           end
-        }
+        end
       end
     end
   end

data/lib/toquen/stunning.rb

@@ -8,37 +8,35 @@ class StunClient
   end
 
   def get_ip
-    begin
-      Timeout::timeout(0.5) {
-        socket = UDPSocket.new
-        data = [0x0001,0].pack("nn") + Random.new.bytes(16)
-        socket.send(data, 0, @host, @port)
-        data, _ = socket.recvfrom(1000)
-        type, length = data.unpack("nn")
+    Timeout.timeout(0.5) do
+      socket = UDPSocket.new
+      data = [0x0001, 0].pack('nn') + Random.new.bytes(16)
+      socket.send(data, 0, @host, @port)
+      data, = socket.recvfrom(1000)
+      type, length = data.unpack('nn')
 
-        # if not a message binding response
-        return nil unless type == 0x0101
+      # if not a message binding response
+      return nil unless type == 0x0101
 
-        data = data[20..-1]
-        while data.size > 0
-          type, length = data.unpack("nn")
-          # if attr type is ATTR_MAPPED_ADDRESS, return it
-          if type == 0x0001
-            values = data[4...4+length].unpack("CCnCCCC")
-            return values[3..-1]*"."
-          end
-          data = data[4+length..-1]
+      data = data[20..-1]
+      until data.empty?
+        type, length = data.unpack('nn')
+        # if attr type is ATTR_MAPPED_ADDRESS, return it
+        if type == 0x0001
+          values = data[4...4 + length].unpack('CCnCCCC')
+          return values[3..-1] * '.'
         end
+        data = data[4 + length..-1]
+      end
 
-        return nil
-      }
-    rescue Timeout::Error
       return nil
     end
+  rescue Timeout::Error
+    return nil
   end
 
   def self.get_ip
-    servers = [["stun.l.google.com", 19302], ["stun.ekiga.net", 3478], ["stunserver.org", 3478]]
+    servers = [['stun.l.google.com', 19_302], ['stun.ekiga.net', 3478], ['stunserver.org', 3478]]
     servers.each do |host, port|
       ip = StunClient.new(host, port).get_ip
       return ip unless ip.nil?

data/lib/toquen/templates/deploy.rb

@@ -7,7 +7,7 @@ set :aws_secret_access_key, nil
 # Set the location of your SSH key.  You can give a list of files, but
 # the first key given will be the one used to upload your chef files to
 # each server.
-set :ssh_options, { :keys => ["./mykey.pem"], :user => "ubuntu" }
+set :ssh_options, keys: ['./mykey.pem'], user: 'ubuntu'
 
 # Set the location of your cookbooks/data bags/roles/nodes for Chef
 set :chef_cookbooks_path, 'kitchen/cookbooks'

data/lib/toquen/version.rb

@@ -1,3 +1,3 @@
 module Toquen
-  VERSION = "2.0.2"
+  VERSION = '2.0.3'.freeze
 end

data/toquen.gemspec

@@ -4,22 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'toquen/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "toquen"
+  gem.name          = 'toquen'
   gem.version       = Toquen::VERSION
-  gem.authors       = ["Brian Muller"]
-  gem.email         = ["bamuller@gmail.com"]
-  gem.description   = "Toquen: Capistrano + AWS + Chef-Solo"
-  gem.summary       = "Toquen: Joins Capistrano + AWS + Chef-Solo into small devops ease"
-  gem.homepage      = "https://github.com/bmuller/toquen"
+  gem.authors       = ['Brian Muller']
+  gem.email         = ['bamuller@gmail.com']
+  gem.description   = 'Toquen: Capistrano + AWS + Chef-Solo'
+  gem.summary       = 'Toquen: Joins Capistrano + AWS + Chef-Solo into small devops ease'
+  gem.homepage      = 'https://github.com/bmuller/toquen'
   gem.licenses      = ['MIT']
-  
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
   gem.add_dependency('capistrano', '~> 3.0', '>= 3.0.1')
-  gem.add_dependency('aws-sdk', '~> 1')
-  gem.add_dependency('terminal-table', '~> 1.6', '>= 1.6.0')
-  gem.add_dependency('term-ansicolor', '~> 1.3', '>= 1.3.2')
-  gem.add_development_dependency('rdoc', '~> 4.2', '>= 4.2.2')
+  gem.add_dependency('aws-sdk', '~> 2')
+  gem.add_dependency('terminal-table', '~> 1.6')
+  gem.add_dependency('term-ansicolor', '~> 1.3')
+  gem.add_development_dependency('rdoc', '~> 4.2')
+  gem.add_development_dependency('rubocop')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toquen
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Brian Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -71,9 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,9 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -91,9 +79,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -101,9 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: '0'
 description: 'Toquen: Capistrano + AWS + Chef-Solo'
 email:
 - bamuller@gmail.com