claws 1.0.0 → 1.1.0

data/bin/claws

@@ -4,33 +4,10 @@ require 'optparse'
 require 'ostruct'
 require 'yaml'
 
-options = OpenStruct.new(
-  {
-    :config_file => nil,
-    :connect => true,
-    :initialize => false,
-    :selection => nil,
-  }
-)
+options = Claws::Options.parse
 
-OptionParser.new do |opts|
-  opts.banner = 'Usage: claws [options]'
+Claws::Command::Initialize.exec if options.initialize
 
-  opts.on('-s', '--status-only', 'Display host status only and exit') do
-    options.connect = false
-  end
+Claws::Command::Version.exec if options.version
 
-  opts.on('-c', '--choice N', Float, 'Enter the number of the host to automatically connect to') do |n|
-    options.selection = n.to_i
-  end
-
-  opts.on('-i', '--init', 'Install the default configuration file for the application') do
-    options.initialize = true
-  end
-end.parse!
-
-if options.initialize
-  Claws::Command::Initialize.exec
-else
-  Claws::Command::EC2.exec options
-end
+Claws::Command::EC2.exec options

data/lib/claws.rb

@@ -1,6 +1,8 @@
+require 'claws/version'
 require 'claws/options'
 require 'claws/configuration'
 require 'claws/collection/ec2'
 require 'claws/report/ec2'
 require 'claws/command/initialize'
 require 'claws/command/ec2'
+require 'claws/command/version'

data/lib/claws/collection/base.rb

@@ -3,16 +3,12 @@ require 'aws-sdk'
 module Claws
   module Collection
     class Base
-      def self.connect(credentials)
-        AWS.config(credentials)
-        AWS.start_memoizing
-      end
+      attr_accessor :config
 
-      # Seems unnecessary
-      def self.build
-        collection = []
-        yield(collection)
-        collection
+      def initialize( config )
+        self.config = config
+        AWS.config(config.aws)
+        AWS.start_memoizing
       end
     end
   end

data/lib/claws/collection/ec2.rb

@@ -5,11 +5,19 @@ require 'claws/presenter/ec2'
 module Claws
   module Collection
     class EC2 < Claws::Collection::Base
-      def self.get(filters = {})
+      def get(filters = {})
         collection = []
-        AWS::EC2.new.instances.each do |instance|
-          collection << Claws::EC2::Presenter.new(instance)
+
+        AWS::EC2.new.regions.each do |region|
+          if config.ec2.regions
+            next unless config.ec2.regions.include?(region.name)
+          end
+
+          region.instances.each do |instance|
+            collection << Claws::EC2::Presenter.new(instance, :region => region.name)
+          end
         end
+
         collection
       end
     end

data/lib/claws/command/ec2.rb

@@ -10,10 +10,8 @@ module Claws
           exit 1
         end
 
-        Claws::Collection::EC2.connect( config.aws )
-
         begin
-          instances = Claws::Collection::EC2.get
+          instances = Claws::Collection::EC2.new(config).get
         rescue Exception => e
           puts e.message
         end

data/lib/claws/command/version.rb

@@ -0,0 +1,10 @@
+module Claws
+  module Command
+    class Version
+      def self.exec
+        puts Claws::VERSION
+        exit 0
+      end
+    end
+  end
+end

data/lib/claws/configuration.rb

@@ -19,7 +19,12 @@ module Claws
       self.capistrano = OpenStruct.new( yaml['capistrano'] )
       self.ssh = OpenStruct.new( yaml['ssh'] )
       self.aws = yaml['aws']
-      self.ec2 = OpenStruct.new( { :fields => yaml['ec2']['fields'] } )
+      self.ec2 = OpenStruct.new(
+        {
+          :fields => yaml['ec2']['fields'],
+          :regions => yaml['ec2']['regions'],
+        }
+      )
     end
   end
 end

data/lib/claws/options.rb

@@ -5,31 +5,43 @@ module Claws
     def self.parse
       options = OpenStruct.new(
         {
+          :config_file => nil,
           :connect => true,
+          :initialize => false,
+          :version => false,
+          :selection => nil,
           :source => 'ec2',
-          :choice => nil,
         }
       )
 
       OptionParser.new do |opts|
-        opts.banner = "Usage: script/aws [options] [environment] [role]"
+        opts.banner = 'Usage: claws [options]'
 
-        opts.on('-d', '--display-only', 'display host information only and exit') do
+        opts.on('-d', '--display-only', 'Display host status only and exit') do
           options.connect = false
         end
 
-        opts.on('-c', '--choice N', Float, 'enter the identity number of the host to automatically connect to') do |n|
-          options.choice = n.to_i
+        opts.on('-c', '--choice N', Float, 'Enter the number of the host to automatically connect to') do |n|
+          options.selection = n.to_i
         end
 
-        opts.on('-s', '--source', 'define the AWS source - default is ec2') do
-          options.source = 'elb'
-          options.connect = false
+        opts.on('-i', '--init', 'Install the default configuration file for the application') do
+          options.initialize = true
+        end
+
+        opts.on('-s', '--source S', String, 'define the AWS source - default is ec2') do |source|
+          options.source = source
+        end
+
+        opts.on('-v', '--version', 'Display the version number and exit') do
+          options.version = true
         end
       end.parse!
 
-      options.environment = ARGV.shift
-      options.role = ARGV.shift
+      unless ARGV.empty?
+        options.environment = ARGV.shift
+        options.role = ARGV.shift
+      end
 
       options
     end

data/lib/claws/presenter/ec2.rb

@@ -6,12 +6,17 @@ module Claws
     class Presenter
       attr_writer :roles
 
-      def initialize(instance, has_roles = [])
+      def initialize(instance, options = {})
         @ec2 = instance.extend(Claws::Support)
-        @roles = has_roles
+        @roles = options[:roles] || []
+        @region = options[:region]
         freeze
       end
 
+      def region
+        @region || 'N/A'
+      end
+
       def roles
         @roles.empty? ? 'N/A' : @roles.join(', ')
       end

data/lib/claws/version.rb

@@ -1,3 +1,3 @@
 module Claws
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/collection/base_spec.rb

@@ -5,26 +5,23 @@ require 'claws/configuration'
 describe Claws::Collection::Base do
   subject { Claws::Collection::Base }
 
-  before :each do
-    @yaml = {"capistrano_home"=>"test", "access_key_id"=>"asdf", "secret_access_key"=>"qwer"}
-    @credentials = {:access_key_id => 'asdf', :secret_access_key => 'qwer'}
+  let(:credentials) do
+    {
+      :access_key_id => 'asdf',
+      :secret_access_key => 'qwer'
+    }
+  end
 
-    @config = double('Claws::Configuration', :aws_credentials => @credentials)
-    AWS.should_receive(:config).with(@credentials).and_return(true)
-    AWS.should_receive(:start_memoizing).and_return(nil)
+  let(:config) do
+    double('Claws::Configuration', :aws => credentials)
   end
 
   it 'establishes a connection to the mothership' do
+    AWS.should_receive(:config).with(credentials).and_return(true)
+    AWS.should_receive(:start_memoizing).and_return(nil)
+
     expect {
-      subject.connect(@config.aws_credentials)
+      subject.new(config)
     }.to_not raise_exception
   end
-
-  it 'builds a collection' do
-    subject.connect(@config.aws_credentials)
-
-    subject.build do |collection|
-      10.times {|i| collection << i}
-    end.should == (0..9).to_a
-  end
 end

data/spec/collection/ec2_spec.rb

@@ -5,14 +5,81 @@ require 'claws/collection/ec2'
 describe Claws::Collection::EC2 do
   subject { Claws::Collection::EC2 }
 
-  it 'gets all instances' do
-    subject.should_receive(:get).with(no_args).and_return(
-      [
-        double('AWS::EC2::Instance'),
-        double('AWS::EC2::Instance'),
-      ]
+  let(:credentials) do
+    {
+      :access_key_id => 'asdf',
+      :secret_access_key => 'qwer'
+    }
+  end
+
+  let(:regions) do
+    [
+      double('AWS::EC2::Region',
+        :name => 'us-east-1',
+        :instances => 
+          [
+            double('AWS::EC2::Instance'),
+            double('AWS::EC2::Instance'),
+          ],
+      ),
+      double('AWS::EC2::Region',
+        :name => 'eu-east-1',
+        :instances => 
+          [
+            double('AWS::EC2::Instance'),
+            double('AWS::EC2::Instance'),
+          ],
+      ),
+    ]
+  end
+
+  context 'gets all instances in regions' do
+    it 'not defined in configuration' do
+      AWS.should_receive(:config).with(credentials).and_return(true)
+      AWS.should_receive(:start_memoizing).and_return(nil)
+
+      AWS::EC2.should_receive(:new).and_return(
+        double('AWS::EC2::RegionsCollection', :regions => regions)
+      )
+
+      config = double('Claws::Configuration',
+        :aws => credentials,
+        :ec2 => OpenStruct.new({:regions => nil}),
+      )
+
+      subject.new(config).get.size.should == 4
+    end
+
+    it 'defined in configuation' do
+      AWS.should_receive(:config).with(credentials).and_return(true)
+      AWS.should_receive(:start_memoizing).and_return(nil)
+
+      AWS::EC2.should_receive(:new).and_return(
+        double('AWS::EC2::RegionsCollection', :regions => regions)
+      )
+
+      config = double('Claws::Configuration',
+        :aws => credentials,
+        :ec2 => OpenStruct.new({:regions => %w(us-east-1 eu-east-1)}),
+      )
+
+      subject.new(config).get.size.should == 4
+    end
+  end
+
+  it 'gets all instances for specified regions' do
+    AWS.should_receive(:config).with(credentials).and_return(true)
+    AWS.should_receive(:start_memoizing).and_return(nil)
+
+    AWS::EC2.should_receive(:new).and_return(
+      double('AWS::EC2::RegionsCollection', :regions => regions)
+    )
+
+    config = double('Claws::Configuration',
+      :aws => credentials,
+      :ec2 => OpenStruct.new({:regions => %w(us-east-1)}),
     )
 
-    subject.get.size.should == 2
+    subject.new(config).get.size.should == 2
   end
 end

data/spec/command/ec2_spec.rb

@@ -50,10 +50,14 @@ describe Claws::Command::EC2 do
       let(:options) { OpenStruct.new( { :config_file => nil, } ) }
 
       context 'instance collections' do
-
         it 'retrieves' do
-          Claws::Collection::EC2.should_receive(:connect).and_return(true)
-          Claws::Collection::EC2.should_receive(:get).and_return([])
+          Claws::Collection::EC2.should_receive(:new).and_return(
+            double(Claws::Collection::EC2, :get => 
+              [
+                double(AWS::EC2::Instance, :id => 'test', :status => 'running', :dns_name => 'test.com'),
+              ]
+            )
+          )
 
           capture_stdout {
             subject.exec options
@@ -61,9 +65,11 @@ describe Claws::Command::EC2 do
         end
 
         it 'handles errors retrieving' do
-          Claws::Collection::EC2.should_receive(:connect).and_return(true)
-          Claws::Collection::EC2.should_receive(:get).and_raise(Exception)
-          subject.should_receive(:puts).once
+          Claws::Collection::EC2.should_receive(:new).and_return(
+            double(Claws::Collection::EC2, :get => Exception.new)
+          )
+
+          #subject.should_receive(:puts).once
 
           expect {
             subject.exec options
@@ -72,8 +78,13 @@ describe Claws::Command::EC2 do
       end
 
       it 'performs report' do
-        Claws::Collection::EC2.should_receive(:connect).and_return(true)
-        Claws::Collection::EC2.should_receive(:get).and_return([])
+        Claws::Collection::EC2.should_receive(:new).and_return(
+          double(Claws::Collection::EC2, :get =>
+            [
+              double(AWS::EC2::Instance, :id => 'test', :status => 'running', :dns_name => 'test.com'),
+            ]
+          )
+        )
 
         expect {
           capture_stdout {
@@ -114,8 +125,9 @@ describe Claws::Command::EC2 do
         end
 
         it 'automatically connects to the server' do
-          Claws::Collection::EC2.should_receive(:connect).and_return(true)
-          Claws::Collection::EC2.should_receive(:get).and_return(instances)
+          Claws::Collection::EC2.should_receive(:new).and_return(
+            double(Claws::Collection::EC2, :get => instances)
+          )
 
           subject.should_receive(:puts).twice
           subject.should_receive(:system).with('ssh test@test.com').and_return(0)
@@ -136,8 +148,9 @@ describe Claws::Command::EC2 do
         end
 
         it 'handles user inputed selection from the command line' do
-          Claws::Collection::EC2.should_receive(:connect).and_return(true)
-          Claws::Collection::EC2.should_receive(:get).and_return(instances)
+          Claws::Collection::EC2.should_receive(:new).and_return(
+            double(Claws::Collection::EC2, :get => instances)
+          )
 
           subject.should_receive(:puts).twice
           subject.should_receive(:system).with('ssh test@test2.com').and_return(0)
@@ -149,8 +162,9 @@ describe Claws::Command::EC2 do
         end
 
         it 'presents a selection and connects to the server' do
-          Claws::Collection::EC2.should_receive(:connect).and_return(true)
-          Claws::Collection::EC2.should_receive(:get).and_return(instances)
+          Claws::Collection::EC2.should_receive(:new).and_return(
+            double(Claws::Collection::EC2, :get => instances)
+          )
 
           subject.should_receive(:gets).and_return('1\n')
           subject.should_receive(:puts).once
@@ -162,8 +176,9 @@ describe Claws::Command::EC2 do
         end
 
         it 'presents a selection and allows a user to quit' do
-          Claws::Collection::EC2.should_receive(:connect).and_return(true)
-          Claws::Collection::EC2.should_receive(:get).and_return(instances)
+          Claws::Collection::EC2.should_receive(:new).and_return(
+            double(Claws::Collection::EC2, :get => instances)
+          )
 
           subject.should_receive(:gets).and_return('q\n')
 

data/spec/configuration_spec.rb

@@ -13,6 +13,10 @@ describe Claws::Configuration do
         'aws_user' => 'test',
       },
       'ec2' => {
+        'regions' => [
+          'us-east-1',
+          'eu-east-1',
+        ],
         'fields' => {
           'id' => {
             'width' => 10,
@@ -80,6 +84,12 @@ describe Claws::Configuration do
         YAML.should_receive(:load_file).and_return(yaml)
       end
 
+      it 'defines regions' do
+        regions = config.ec2.regions
+        regions[0].should == 'us-east-1'
+        regions[1].should == 'eu-east-1'
+      end
+
       context 'fields' do
         it 'defines id hash' do
           id = config.ec2.fields['id']

data/spec/options_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 require 'claws/options'
 
-ARGV.clear
-
 def cli(args)
   ARGV.push(*args)
   yield
@@ -15,7 +13,7 @@ describe Claws::Options do
       options = Claws::Options.parse
       options.connect.should be_true
       options.source.should == 'ec2'
-      options.choice.should be_nil
+      options.selection.should be_nil
     end
   end
 
@@ -35,11 +33,11 @@ describe Claws::Options do
 
   it 'accepts a choice flag' do
     cli %w{-c 10} do
-      Claws::Options.parse.choice.should == 10
+      Claws::Options.parse.selection.should == 10
     end
 
     cli %w{--choice 10} do
-      Claws::Options.parse.choice.should == 10
+      Claws::Options.parse.selection.should == 10
     end
   end
 
@@ -47,25 +45,23 @@ describe Claws::Options do
     cli %w{-s elb} do
       options = Claws::Options.parse
       options.source.should == 'elb'
-      options.connect.should be_false
     end
 
     cli %w{--source elb} do
       options = Claws::Options.parse
       options.source.should == 'elb'
-      options.connect.should be_false
     end
   end
 
   context 'capistrano' do
     it 'defines the environment' do
-      cli %w{-s production app} do
+      cli %w{production app} do
         Claws::Options.parse.environment.should == 'production'
       end
     end
 
     it 'defines the role' do
-      cli %w{-s production app} do
+      cli %w{production app} do
         Claws::Options.parse.role.should == 'app'
       end
     end

data/spec/presenter/ec2_spec.rb

@@ -28,7 +28,7 @@ describe Claws::EC2::Presenter do
     cap = double('Claws::Capistrano')
     cap.stub(:roles).with(host).and_return(%w{app web})
 
-    @full_presenter = subject.new(full_instance, cap.roles(full_instance.public_dns))
+    @full_presenter = subject.new(full_instance, :region => 'us-east-1', :roles => cap.roles(full_instance.public_dns))
 
     less_instance = double(AWS::EC2, :tags => nil)
     @less_presenter = subject.new(less_instance)
@@ -42,6 +42,16 @@ describe Claws::EC2::Presenter do
     end
   end
 
+  describe '#region' do
+    it 'can be defined' do
+      @full_presenter.region.should == 'us-east-1'
+    end
+
+    it 'is not required' do
+      @less_presenter.region.should == 'N/A'
+    end
+  end
+
   describe '#roles' do
     it 'can be defined' do
       @full_presenter.roles.should == 'app, web'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claws
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156422520 !ruby/object:Gem::Requirement
+  requirement: &2151922880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156422520
+  version_requirements: *2151922880
 - !ruby/object:Gem::Dependency
   name: command_line_reporter
-  requirement: &2156421940 !ruby/object:Gem::Requirement
+  requirement: &2151922140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156421940
+  version_requirements: *2151922140
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &2156420960 !ruby/object:Gem::Requirement
+  requirement: &2151921480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156420960
+  version_requirements: *2151921480
 description: A command line tool that provides a configurable report on the status
   of all of your EC2 hosts and provides trivial ssh access for connectivity.  Never
   copy and paste the public dns for a host again!
@@ -59,6 +59,7 @@ files:
 - lib/claws/collection/ec2.rb
 - lib/claws/command/ec2.rb
 - lib/claws/command/initialize.rb
+- lib/claws/command/version.rb
 - lib/claws/configuration.rb
 - lib/claws/options.rb
 - lib/claws/presenter/ec2.rb