awful 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0703571ca89556e9efc56775170d18aaab6373
-  data.tar.gz: 646f54dd08e397f6ea1ad1210ab66ab0c91a86f9
+  metadata.gz: 81ec18bc27ae6f684004db441b82b05ed0cacf2e
+  data.tar.gz: 1a573418df38eae2043626ce28805cb9cd0f23c0
 SHA512:
-  metadata.gz: 8ed049a0836cc96f60bebeed84562b1ded715cd322a0573a4c550f3d29d7e0e56cc6b63e81e06b460256ffc47489aa3c5fe5d281aac66b4df9ba8152fb6459c8
-  data.tar.gz: 667c2ad1e33fb85855a5f9e3def233cc5b45b1d9b0b800beeda9d1980190e1a893c0b3af3ae5c424156dd15928fdddf683bf9525fd36b1ab4c05ac3dd819de86
+  metadata.gz: 7fc1de9863ae692e5019ae5083bffac6c3b02f7112cfb6a7a3ac4e1f144684b8991d9a698ad1564bbb44758482e696db1a427ba7447e3a600f1cc043d75b3a03
+  data.tar.gz: 67c9693f4e02a50dd40fb97486887b779c4eb050f588981a61ab668f22415d895963e12167dfb4f495d3702769805a37b8679ea2cc22fb2772bc746b3174d832

data/awful.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
 
   spec.add_dependency('aws-sdk', '~> 2')
   spec.add_dependency('thor')
+  spec.add_dependency('dotenv')
 end

data/lib/awful.rb

@@ -4,101 +4,109 @@ require 'aws-sdk'
 require 'thor'
 require 'yaml'
 require 'erb'
+require 'dotenv'
 
 module Awful
+  class Cli < Thor
+    class_option :env, aliases: '-e', default: nil, desc: 'Load environment variables from file'
+
+    no_commands do
+      def ec2
+        @ec2 ||= Aws::EC2::Client.new
+      end
+
+      def autoscaling
+        @autoscaling ||= Aws::AutoScaling::Client.new
+      end
+
+      def elb
+        @elb ||= Aws::ElasticLoadBalancing::Client.new
+      end
+
+      def rds
+        @rds || Aws::RDS::Client.new
+      end
+
+      def symbolize_keys(thing)
+        if thing.is_a?(Hash)
+          Hash[ thing.map { |k,v| [ k.to_sym, symbolize_keys(v) ] } ]
+        elsif thing.respond_to?(:map)
+          thing.map { |v| symbolize_keys(v) }
+        else
+          thing
+        end
+      end
+
+      def stringify_keys(thing)
+        if thing.is_a?(Hash)
+          Hash[ thing.map { |k,v| [ k.to_s, stringify_keys(v) ] } ]
+        elsif thing.respond_to?(:map)
+          thing.map { |v| stringify_keys(v) }
+        else
+          thing
+        end
+      end
+
+      def load_cfg(options = {}, file = nil)
+        Dotenv.load!(options[:env]) if options[:env]
+        src = (file and File.read(file)) || ((not $stdin.tty?) and $stdin.read)
+        cfg = src ? YAML.load(::ERB.new(src).result(binding)) : {}
+        symbolize_keys(cfg).merge(symbolize_keys(options.reject{ |_,v| v.nil? }))
+      end
+
+      def only_keys_matching(hash, keylist)
+        hash.select do |key,_|
+          keylist.include?(key)
+        end
+      end
+
+      def remove_empty_strings(hash)
+        hash.reject do |_,value|
+          value.respond_to?(:empty?) and value.empty?
+        end
+      end
+
+      def tag_name(thing)
+        tn = thing.tags.find { |tag| tag.key == 'Name' }
+        tn && tn.value
+      end
+
+      ## return id for instance by name
+      def find_instance(name)
+        if name .nil?
+          nil?
+        elsif name.match(/^i-[\d[a-f]]{8}$/)
+          name
+        else
+          ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
+            tag_name(instance) == name
+          end.instance_id
+        end
+      end
+
+      ## return id for subnet by name
+      def find_subnet(name)
+        if name.match(/^subnet-[\d[a-f]]{8}$/)
+          name
+        else
+          ec2.describe_subnets.map(&:subnets).flatten.find do |subnet|
+            tag_name(subnet) == name
+          end.subnet_id
+        end
+      end
+
+      ## return id for security group by name
+      def find_sg(name)
+        if name.match(/^sg-[\d[a-f]]{8}$/)
+          name
+        else
+          ec2.describe_security_groups.map(&:security_groups).flatten.find do |sg|
+            tag_name(sg) == name
+          end.group_id
+        end
+      end
 
-  def ec2
-    @ec2 ||= Aws::EC2::Client.new
-  end
-
-  def autoscaling
-    @autoscaling ||= Aws::AutoScaling::Client.new
-  end
-
-  def elb
-    @elb ||= Aws::ElasticLoadBalancing::Client.new
-  end
-
-  def rds
-    @rds || Aws::RDS::Client.new
-  end
-
-  def symbolize_keys(thing)
-    if thing.is_a?(Hash)
-      Hash[ thing.map { |k,v| [ k.to_sym, symbolize_keys(v) ] } ]
-    elsif thing.respond_to?(:map)
-      thing.map { |v| symbolize_keys(v) }
-    else
-      thing
-    end
-  end
-
-  def stringify_keys(thing)
-    if thing.is_a?(Hash)
-      Hash[ thing.map { |k,v| [ k.to_s, stringify_keys(v) ] } ]
-    elsif thing.respond_to?(:map)
-      thing.map { |v| stringify_keys(v) }
-    else
-      thing
-    end
-  end
-
-  def load_cfg(options = {}, file = nil)
-    src = (file and File.read(file)) || ((not $stdin.tty?) and $stdin.read)
-    cfg = src ? YAML.load(::ERB.new(src).result(binding)) : {}
-    symbolize_keys(cfg).merge(symbolize_keys(options.reject{ |_,v| v.nil? }))
-  end
 
-  def only_keys_matching(hash, keylist)
-    hash.select do |key,_|
-      keylist.include?(key)
     end
   end
-
-  def remove_empty_strings(hash)
-    hash.reject do |_,value|
-      value.respond_to?(:empty?) and value.empty?
-    end
-  end
-
-  def tag_name(thing)
-    tn = thing.tags.find { |tag| tag.key == 'Name' }
-    tn && tn.value
-  end
-
-  ## return id for instance by name
-  def find_instance(name)
-    if name .nil?
-      nil?
-    elsif name.match(/^i-[\d[a-f]]{8}$/)
-      name
-    else
-      ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
-        tag_name(instance) == name
-      end.instance_id
-    end
-  end
-
-  ## return id for subnet by name
-  def find_subnet(name)
-    if name.match(/^subnet-[\d[a-f]]{8}$/)
-      name
-    else
-      ec2.describe_subnets.map(&:subnets).flatten.find do |subnet|
-        tag_name(subnet) == name
-      end.subnet_id
-    end
-  end
-
-  ## return id for security group by name
-  def find_sg(name)
-    if name.match(/^sg-[\d[a-f]]{8}$/)
-      name
-    else
-      ec2.describe_security_groups.map(&:security_groups).flatten.find do |sg|
-        tag_name(sg) == name
-      end.group_id
-    end
-  end
-
 end

data/lib/awful/auto_scaling.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class AutoScaling < Thor
-    include Awful
+  class AutoScaling < Cli
 
     desc 'ls [PATTERN]', 'list autoscaling groups with name matching PATTERN'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
@@ -86,17 +85,17 @@ module Awful
       puts YAML.dump(stringify_keys(asg))
     end
 
-    desc 'create NAME [FILE]', 'create a new auto-scaling group'
+    desc 'create [FILE]', 'create a new auto-scaling group'
+    method_option :auto_scaling_group_name,   aliases: '-n', default: nil, desc: 'Auto-scaling group name'
+    method_option :launch_configuration_name, aliases: '-l', default: nil, desc: 'Launch config name'
     method_option :desired_capacity,          aliases: '-d', default: nil, desc: 'Set desired capacity'
     method_option :min_size,                  aliases: '-m', default: nil, desc: 'Set minimum capacity'
     method_option :max_size,                  aliases: '-M', default: nil, desc: 'Set maximum capacity'
-    method_option :launch_configuration_name, aliases: '-l', default: nil, desc: 'Launch config name'
-    def create(name, file = nil)
+    def create(file = nil)
       opt = load_cfg(options, file)
       whitelist = %i[auto_scaling_group_name launch_configuration_name instance_id min_size max_size desired_capacity default_cooldown availability_zones
                      load_balancer_names health_check_type health_check_grace_period placement_group vpc_zone_identifier termination_policies tags ]
 
-      opt[:auto_scaling_group_name] = name
       opt = remove_empty_strings(opt)
       opt = only_keys_matching(opt, whitelist)
 

data/lib/awful/ec2.rb

@@ -2,8 +2,7 @@ require 'base64'
 
 module Awful
 
-  class Ec2 < Thor
-    include Awful
+  class Ec2 < Cli
 
     desc 'ls [PATTERN]', 'list EC2 instances [with id or tags matching PATTERN]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

data/lib/awful/elb.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class Elb < Thor
-    include Awful
+  class Elb < Cli
 
     desc 'ls [PATTERN]', 'list vpcs [with any tags matching PATTERN]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

data/lib/awful/launch_config.rb

@@ -2,8 +2,7 @@ require 'base64'
 
 module Awful
 
-  class LaunchConfig < Thor
-    include Awful
+  class LaunchConfig < Cli
 
     desc 'ls [PATTERN]', 'list launch configs with name matching PATTERN'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
@@ -54,9 +53,10 @@ module Awful
     end
 
     desc 'create NAME [FILE]', 'create a new launch configuration'
-    method_option :timestamp, aliases: '-t', default: false, desc: 'Add timestamp to launch config name'
-    method_option :patch,     aliases: '-p', default: false, desc: 'Add release to launch config name'
-    def create(name, file = nil)
+    method_option :timestamp,                 aliases: '-t', default: false, desc: 'Add timestamp to launch config name'
+    method_option :launch_configuration_name, aliases: '-n', default: nil,   desc: 'launch configuration name'
+    method_option :image_id,                  aliases: '-i', default: nil,   desc: 'image ID (AMI to use)'
+    def create(file = nil)
       opt = load_cfg(options, file)
 
       whitelist = %i[launch_configuration_name image_id key_name security_groups classic_link_vpc_id classic_link_vpc_security_groups user_data
@@ -64,22 +64,15 @@ module Awful
                      ebs_optimized associate_public_ip_address placement_tenancy]
 
       if options[:timestamp]
-        opt[:launch_configuration_name] = "#{name}-#{Time.now.utc.strftime('%Y%m%d%H%M%S')}"
-      elsif opt[:patch]
-        print "bumping version from latest: "
-        m = latest(name).match(/^#{name}-(\w+)\.(\w+)\.(\w+)$/)
-        raise "latest launch config does not match format #{name}-x.x.x" unless m
-        opt[:launch_configuration_name] = "#{name}-#{[m[1], m[2], m[3].to_i + 1].join('.')}"
-      else
-        opt[:launch_configuration_name] = name
+        opt[:launch_configuration_name] += "-#{Time.now.utc.strftime('%Y%m%d%H%M%S')}"
       end
 
       opt[:user_data] = Base64.encode64(opt[:user_data]) # encode user data
       opt = remove_empty_strings(opt)
       opt = only_keys_matching(opt, whitelist)
       autoscaling.create_launch_configuration(opt)
-      opt[:launch_configuration_name].tap do |lcname|
-        puts lcname
+      opt[:launch_configuration_name].tap do |name|
+        puts name
       end
     end
 

data/lib/awful/rds.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class Rds < Thor
-    include Awful
+  class Rds < Cli
 
     desc 'ls [NAME]', 'list DB instances matching NAME'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

data/lib/awful/route_table.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class RouteTable < Thor
-    include Awful
+  class RouteTable < Cli
 
     desc 'ls [PATTERN]', 'list routes'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

data/lib/awful/security_group.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class SecurityGroup < Thor
-    include Awful
+  class SecurityGroup < Cli
 
     desc 'ls [NAME]', 'list security groups [matching NAME]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

data/lib/awful/subnet.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class Subnet < Thor
-    include Awful
+  class Subnet < Cli
 
     desc 'ls [PATTERN]', 'list subnets [with any tags matching PATTERN]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/awful/vpc.rb

@@ -1,7 +1,6 @@
 module Awful
 
-  class Vpc < Thor
-    include Awful
+  class Vpc < Cli
 
     desc 'ls [PATTERN]', 'list vpcs [with any tags matching PATTERN]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AWS cmdline and yaml loader.
 email:
 - rlister+gh@gmail.com