awsm 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abfb98b976f8940d34a6cea53ed10ec196a25d9b
-  data.tar.gz: 01446fea54dc664592c5b3af40115cb5f737a5d1
+  metadata.gz: eebcaae0b291828f84a17fb57d59282e318fecd7
+  data.tar.gz: 450021bfc6e2ab511f174cc2909bd01c713a8e3f
 SHA512:
-  metadata.gz: f411dac4b99cd4d8d5df477d984f8031edc41975096c8cd2f0605d9fc86b9909d427cc55d067b81eb79faeb4f8fcd80cf6e8020ebd99844e74729f0a0e367584
-  data.tar.gz: 9e66e090cde43ce40a47d8647b04c6087686989e8f3b360cc674caab0cc4de552d83d41fa32e6be937eecfa5caf4be80ef1cf7d51b1d625aa4ae2b7e7114a16e
+  metadata.gz: a19ee21ce8f9743b6793425016dfb19377c89aea81ab15ac8931983423638e4238d3a33f203030b40a648168e8450258fd643cd800bf66d62d852b3b35203fb1
+  data.tar.gz: 55b976091a7193935e979b52d3fd89cf8ac269d7a254b39b04f89e07dc9f5a9b9f658440cc16c8f04bcc086814441a8d7440a59ba49b706ab9d86d07be165ba5

data/Makefile

@@ -0,0 +1,4 @@
+all:: gem
+
+gem: awsm.gemspec
+	gem build awsm.gemspec

data/README.md

@@ -25,32 +25,45 @@ Awsm is written in Ruby 2.1, so you'll need that to start with, you'll also need
 
 ## Running Awsm
 
-Awsm requires four enviornment variables to be set in order to work. I use something like this:
+Awsm requires three enviornment variables to be set in order to work. I use something like this:
 
 	#!/bin/bash
 
 	export AWS_ACCESS_KEY_ID="You do not leak keys on github."
 	export AWS_SECRET_ACCESS_KEY="You DO, NOT, LEAK, keys on github!"
 	export AWS_REGION="eu-west-1"
-	export AWSM_HOSTEDZONE="Don't leak this either."
 
 	echo -e "\033[1m\033[92mAWS Environment Set.\033[0m"
 
 ## Configuring Awsm
 
-Awsm will read configuration from `~/.awsm`. This is just used for the `spin` subcommand for now.
-An example `~/.awsm` file is shown below:
+Awsm will read configuration from `~/.awsm.rb`. An example `~/.awsm.rb` file is shown below:
 
 ```
-Spin:
-  InstanceType: t2.micro
-  KeyName: my-aws-keypair
-  Subnet: subnet-a0b1c2d3
-  SecurityGroups:
-    - sg-a0b1c2d3
-  Tags:
-    "h2g2:contact": "ford.prefect@megadodo.h2g2"
-    "h2g2:planet": kakrafoon
+Awsm::configure do |c|
+
+  c.dns do |c|
+    c.hosted_zone '/hostedzone/somethingorother'
+  end
+
+  # Default Instance Parameters
+  c.spin do |c|
+    c.instance_type 't2.micro'
+    c.key_name 'my-key'
+    c.subnet 'subnet-a0b1c2d3'
+    c.security_group 'sg-a0b1c2d3'
+    c.tag 'h2g2:contact', 'ford.prefect@megadodo.h2g2'
+    c.tag 'h2g2:planet', 'kakrafoon'
+  end
+
+  # Preset: mything
+  c.spin 'mything' do |c|
+    c.image_id 'ami-a0b1c2d3'
+    c.security_group 'sg-a1b2c3d4'
+    c.tag 'thing:environment', 'dev'
+  end
+
+end
 ```
 
 # Licence

data/awsm.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Awsm::VERSION
   spec.authors       = ["Daniel Kendell"]
   spec.email         = ["daniel@kendell.org"]
-  spec.summary       = %q{Awsm AWS queryer}
-  spec.description   = %q{Awsm AWS queryer}
-  spec.homepage      = ""
+  spec.summary       = %q{Awsm AWS tool}
+  spec.description   = %q{If you work with AWS, then Awsm wants to help make your life easier. Spin up/down ad-hoc instances as easily as `awsm spin up my_project`. Native ruby config file!}
+  spec.homepage      = "http://github.com/mduk/awsm"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'thor'
-  spec.add_dependency 'aws-sdk', '~> 2'
-  spec.add_dependency 'terminal-table', '~> 1.4.5'
+  spec.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'aws-sdk', '~> 2'
+  spec.add_runtime_dependency 'terminal-table', '~> 1.4'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency "pry", '~> 0.10'
 end

data/lib/awsm.rb

@@ -2,8 +2,10 @@ require 'yaml'
 require 'thor'
 require 'terminal-table'
 
-require 'awsm/config'
 require 'awsm/version'
+
+require 'awsm/configure'
+
 require 'awsm/loadbalancers'
 require 'awsm/autoscalinggroups'
 require 'awsm/dns'
@@ -14,6 +16,4 @@ require 'awsm/cli/unused'
 require 'awsm/cli/spin'
 require 'awsm/cli/main'
 
-
-
-require 'pry'
+require "#{ENV['HOME']}/.awsm"

data/lib/awsm/cli/spin.rb

@@ -1,153 +1,162 @@
 module Awsm
   module CLI
-  class Spin < Clibase
-
-    class_option :tables, :type => :boolean, :lazy_default => true, :default => true,
-      :desc => "Whether or not to draw ASCII tables."
-
-    desc 'up [AMI_ID]',
-      "Spin up an instance of the specified AMI"
-    def up( ami_id )
-      say "Spinning up #{ami_id}..."
-      response = ec2.run_instances(
-        image_id: ami_id,
-        min_count: 1,
-        max_count: 1,
-        key_name: configured_key_name,
-        instance_type: configured_instance_type,
-        security_group_ids: configured_security_groups,
-        subnet_id: configured_subnet
-      )
-
-      instance_id = response.instances.first.instance_id
-      say "Instance #{instance_id} is spinning up...", :green
-
-      while instance_extant?( instance_id ) == false
-        say '.', :green, false
-        sleep(3)
-      end
+    class Spin < Clibase
+
+      class_option :tables, :type => :boolean, :lazy_default => true, :default => true,
+        :desc => "Whether or not to draw ASCII tables."
+
+      desc 'up [AMI_ID]',
+        "Spin up an instance of the specified AMI"
+      option :image_id
+      option :key_name
+      def up( preset )
+        if /^ami-.+$/.match( preset )
+          c = Awsm::spin_config('default')
+          c.image_id( preset )
+        else
+          c = Awsm::spin_config( preset )
+
+          unless options[:image_id].nil?
+            unless c.image_id.nil?
+              override_alert( 'image_id', c.image_id, options[:image_id] )
+            end
+            c.image_id( options[:image_id] )
+          end
 
-      tags = [
-        { key: 'Name', value: "Temporary instance of #{ami_id} for #{whoami}" },
-        { key: 'awsm:owner', value: whoami }
-      ]
+          unless options[:key_name].nil?
+            unless c.key_name.nil?
+              override_alert( 'key_name', c.key_name, options[:key_name] )
+            end
+            c.key_name( options[:key_name] )
+          end
 
-      configured_tags.each do |k, v|
-        tags << { key: k, value: v }
+          spin_up( c )
+        end
       end
 
-      ec2.create_tags(
-        resources: [ instance_id ],
-        tags: tags
-      )
-
-      say "Tagged #{instance_id}:"
-      tags.each do |tag|
-        say "    #{tag[:key]} ", :cyan
-        say '=> '
-        say "#{tag[:value]}", :yellow
+      desc 'down [INSTANCE_ID]',
+        "Spin down the specified instance"
+      def down( instance_id )
+        say "Spinning down (terminating) #{instance_id}...", :red
+        ec2.terminate_instances(
+          instance_ids: [ instance_id ]
+        )
       end
-    end
-
-    desc 'down [INSTANCE_ID]',
-      "Spin down the specified instance"
-    def down( instance_id )
-      say "Spinning down (terminating) #{instance_id}...", :red
-      ec2.terminate_instances(
-        instance_ids: [ instance_id ]
-      )
-    end
-
-    desc 'list',
-      "List all spinning instances"
-    option :simple, :type => :boolean, :default => false, :aliases => '-s',
-      :desc => "Display list without prettiness - good for sedding"
-    def list
-      response = ec2.describe_instances(
-        filters: [
-          { name: 'tag-key', values: [ "awsm:owner" ] }
-        ]
-      )
-      spinning = []
-      response.reservations.each do |r|
-        r.instances.each do |i|
-          owner = i.tags.select { |t| t.key == 'awsm:owner' }.first.value
-
-          if owner == whoami
-            fields = [ i.instance_id, i.state.name, i.image_id, owner, i.launch_time ]
-
-            if i.state.name == 'running'
-              fields << i.private_ip_address
-            else
-              fields << 'N/A'
+
+      desc 'list',
+        "List all spinning instances"
+      option :simple, :type => :boolean, :default => false, :aliases => '-s',
+        :desc => "Display list without prettiness - good for sedding"
+      def list
+        response = ec2.describe_instances(
+          filters: [
+            { name: 'tag-key', values: [ "awsm:owner" ] }
+          ]
+        )
+        spinning = []
+        response.reservations.each do |r|
+          r.instances.each do |i|
+            owner = i.tags.select { |t| t.key == 'awsm:owner' }.first.value
+
+            if owner == whoami
+              fields = [ i.instance_id, i.state.name, i.image_id, owner, i.launch_time ]
+
+              if i.state.name == 'running'
+                fields << i.private_ip_address
+              else
+                fields << 'N/A'
+              end
+
+              spinning << fields
             end
+          end
+        end
 
-            spinning << fields
+        if options[:simple]
+          spinning.each do |row|
+            say row.join(' ')
           end
+        else
+          puts_table(
+            headings: [ 'Instance ID', 'State', 'AMI ID', 'Owner', 'Launched Time', 'Private IP' ],
+            rows: spinning
+          )
         end
       end
 
-      if options[:simple]
-        spinning.each do |row|
-          say row.join(' ')
+      no_commands do
+        def ec2
+          Aws::EC2::Client.new
         end
-      else
-        puts_table(
-          headings: [ 'Instance ID', 'State', 'AMI ID', 'Owner', 'Launched Time', 'Private IP' ],
-          rows: spinning
-        )
-      end
-    end
 
-    no_commands do
-      def ec2
-        Aws::EC2::Client.new
-      end
+        def whoami
+          me_host = `hostname -f`.strip
+          me_user = `whoami`.strip
+          "#{me_user}@#{me_host}"
+        end
 
-      def whoami
-        me_host = `hostname -f`.strip
-        me_user = `whoami`.strip
-        "#{me_user}@#{me_host}"
-      end
+        def override_alert( field, from, to )
+          say "Overriding #{field} from #{from} to #{to}!", :bold
+        end
 
-      def instance_extant?( instance_id )
-        description = ec2.describe_instances(
-          instance_ids: [ instance_id ]
-        )
+        def instance_extant?( instance_id )
+          description = ec2.describe_instances(
+            instance_ids: [ instance_id ]
+          )
 
-        num_found = description.reservations.first.instances.length
+          num_found = description.reservations.first.instances.length
 
-        if num_found == 0
-          return false
-        end
+          if num_found == 0
+            return false
+          end
 
-        true
-      end
+          true
+        end
 
-      def config
-        Config.new.get('Spin')
-      end
+        def spin_up( c )
+          response = ec2.run_instances(
+            image_id: c.image_id,
+            key_name: c.key_name,
+            instance_type: c.instance_type,
+            security_group_ids: c.security_groups,
+            subnet_id: c.subnet,
+            min_count: 1,
+            max_count: 1
+          )
+
+          say "Spinning up #{c.image_id}..."
+
+          instance_id = response.instances.first.instance_id
+          say "Instance #{instance_id} is spinning up...", :green
+
+          while instance_extant?( instance_id ) == false
+            say '.', :green, false
+            sleep(3)
+          end
 
-      def configured_security_groups
-        config['SecurityGroups']
-      end
+          tags = [
+            { key: 'Name', value: "Temporary instance of #{c.image_id} for #{whoami}" },
+            { key: 'awsm:owner', value: whoami }
+          ]
 
-      def configured_subnet
-        config['Subnet']
-      end
+          c.tags.each do |k, v|
+            tags << { key: k, value: v }
+          end
 
-      def configured_instance_type
-        config['InstanceType']
-      end
+          ec2.create_tags(
+            resources: [ instance_id ],
+            tags: tags
+          )
 
-      def configured_key_name
-        config['KeyName']
-      end
+          say "Tagged #{instance_id}:"
+          tags.each do |tag|
+            say "    #{tag[:key]} ", :cyan
+            say '=> '
+            say "#{tag[:value]}", :yellow
+          end
+        end
 
-      def configured_tags
-        config['Tags']
-      end
-    end
-  end
-end
-end
+      end #no_commands
+    end #class
+  end #module
+end #module

data/lib/awsm/cli/unused.rb

@@ -28,26 +28,11 @@ module Awsm
         )
       end
 
-			desc 'ami',
-				"Find unused AMIs"
-			def ami
-				puts_table(
-					headings: [ "AMI ID", "Created Time" ],
-					rows: find_unused_amis do |ami|
-						[  ]
-					end
-				)
-			end
-
       no_commands do
         def elb
           Aws::ElasticLoadBalancing::Client.new
         end
 
-				def ec2
-					Aws::EC2::Client.new
-				end
-
         def as
           Aws::AutoScaling::Client.new
         end
@@ -76,10 +61,6 @@ module Awsm
           end
           launchconfigurations
         end
-
-				def find_unused_amis
-binding.pry
-				end
       end
     
     end

data/lib/awsm/configure.rb

@@ -0,0 +1,135 @@
+module Awsm
+
+  def self.configure
+    @@c = Configulator.new
+    yield @@c
+  end
+
+  def self.spin_config( preset=nil )
+    @@c.spin( preset )
+  end
+
+  def self.dns_config
+    @@c.dns
+  end
+
+  class Configulator
+
+    def initialize
+      @spin_blocks = {}
+      @dns_block = nil
+    end
+
+    def dns( &block )
+      if block_given?
+        @dns_block = block
+        return
+      end
+
+      c = Domainatrix.new
+      @dns_block.call( c )
+      return c
+    end
+
+    def spin( preset=nil, &block )
+      if block_given?
+        if preset.nil?
+          preset = 'default'
+        end
+
+        @spin_blocks[ preset ] = block
+        return
+      end
+
+      if preset.nil? || preset == 'default'
+        preset = 'default'
+        c = Spinulator.new
+      else
+        c = Spinulator.new( spin('default') )
+      end
+
+      if @spin_blocks[ preset ].nil?
+        raise StandardError, "Invalid preset: #{preset}"
+      end
+
+      @spin_blocks[ preset ].call( c )
+
+      return c
+
+    end
+
+  end
+
+  class Domainatrix
+
+    def hosted_zone( zone=nil )
+      if zone.nil?
+        return @hosted_zone
+      end
+
+      @hosted_zone = zone
+    end
+
+  end
+
+  class Spinulator
+
+    def initialize( default=nil )
+      @config = { tags: {} }
+      if default
+        @config[:instance_type] = default.instance_type
+        @config[:key_name] = default.key_name
+        @config[:subnet] = default.subnet
+        @config[:security_groups] = default.security_groups
+        @config[:tags] = default.tags || {}
+      end
+    end
+
+    def method_missing( name, *args )
+      n_args = args.length
+
+      write = ( n_args > 0 || block_given? )
+
+      if write
+        if block_given?
+          args << yield
+        end
+
+        @config[ name ] = args.first
+      else
+        return @config[ name ]
+      end
+    end
+
+    def tag( name, value=nil )
+      if value.nil? && block_given?
+        @config[:tags][ name ] = yield
+      elsif value && !block_given?
+        @config[:tags][ name ] = value
+      elsif value.nil? && !block_given?
+        raise StandardError, "You need to specify something."
+      elsif !value.nil? && block_given?
+        raise StandardError, "You can't specify both a value and a block. Choose."
+      end
+    end
+
+    def security_group( security_group )
+      if @config[:security_groups].nil?
+        @config[:security_groups] = []
+      end
+
+      if security_group.nil? && block_given?
+        @config[:security_groups] << yield
+      elsif security_group && !block_given?
+        @config[:security_groups] << security_group
+      elsif security_group.nil? && !block_given?
+        raise StandardError, "You need to specify something."
+      elsif !security_group.nil? && block_given?
+        raise StandardError, "You can't specify both a value and a block. Choose."
+      end
+    end
+
+  end
+
+end
+

data/lib/awsm/dns.rb

@@ -21,7 +21,7 @@ module Awsm
 
     def load_dns_records
       paged_response = @client.list_resource_record_sets(
-        hosted_zone_id: ENV['AWSM_HOSTEDZONE']
+        hosted_zone_id: Awsm::dns_config.hosted_zone
       )
 
       paged_response.each_page do |p|

data/lib/awsm/version.rb

@@ -1,3 +1,3 @@
 module Awsm
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: awsm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Kendell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,35 +66,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Awsm AWS queryer
+        version: '0.10'
+description: If you work with AWS, then Awsm wants to help make your life easier.
+  Spin up/down ad-hoc instances as easily as `awsm spin up my_project`. Native ruby
+  config file!
 email:
 - daniel@kendell.org
 executables:
@@ -105,6 +93,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - awsm.gemspec
@@ -115,12 +104,12 @@ files:
 - lib/awsm/cli/spin.rb
 - lib/awsm/cli/unused.rb
 - lib/awsm/clibase.rb
-- lib/awsm/config.rb
+- lib/awsm/configure.rb
 - lib/awsm/dns.rb
 - lib/awsm/instances.rb
 - lib/awsm/loadbalancers.rb
 - lib/awsm/version.rb
-homepage: ''
+homepage: http://github.com/mduk/awsm
 licenses:
 - MIT
 metadata: {}
@@ -140,9 +129,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Awsm AWS queryer
+summary: Awsm AWS tool
 test_files: []
 has_rdoc: 

data/lib/awsm/config.rb

@@ -1,13 +0,0 @@
-module Awsm
-  class Config
-    def initialize
-      if File.exist?( ENV['HOME'] + '/.awsm' )
-        file = File.open( ENV['HOME'] + '/.awsm' ).read
-        @config = YAML.load( file )
-      end
-    end
-    def get( key )
-      @config[ key ]
-    end
-  end
-end