claws 1.1.0 → 1.2.0

data/README.md

@@ -6,7 +6,7 @@ account via the command line.
 It provides a configurable text based interface of the status of your hosts similar to the AWS web
 console.  An example of its usage appears below:
 
-![Instances](http://i.imgur.com/VEC8V.png)
+![Instances](http://i.imgur.com/xCr7x.png)
 
 It gives you a choice of which host to connect to and invokes the proper ssh command:
 
@@ -46,9 +46,11 @@ The full list of options includes:
 
 ```bash
 Usage: claws [options]
-    -s, --status-only                Display host status only and exit
+    -d, --display-only               Display host status only and exit
     -c, --choice N                   Enter the number of the host to automatically connect to
     -i, --init                       Install the default configuration file for the application
+    -s, --source S                   define the AWS source - default is ec2
+    -v, --version                    Display the version number and exit
 ```
 
 ### To Do

data/lib/claws/command/ec2.rb

@@ -33,7 +33,13 @@ module Claws
 
           puts 'connecting to server...'
 
-          system "ssh #{config.ssh.user}@#{instances[selection.to_i].dns_name}"
+          identity = config.ssh.identity.nil? ? '' : "-i #{config.ssh.identity}"
+
+          instance = instances[selection.to_i]
+
+          hostname = instance.vpc? ? instance.private_ip_address : instance.dns_name
+
+          system "ssh #{identity} #{config.ssh.user}@#{hostname}"
         end
       end
     end

data/lib/claws/command/initialize.rb

@@ -10,6 +10,7 @@ module Claws
           },
           'ssh' => {
             'user' => nil,
+            'identity' => nil,
           },
           'aws' => {
             'access_key_id' => nil,
@@ -54,9 +55,16 @@ module Claws
         }
 
         conf = File.join(ENV['HOME'], '.claws.yml')
-        puts "Creating configuration file: #{conf}\n..."
-        File.open(conf, 'w').write(h.to_yaml)
-        puts 'Complete!'
+
+        if File.exists?(conf)
+          puts "Configuration file #{conf} exists!  Either remove or modify contents."
+          exit 1
+        else
+          print "Creating configuration file: #{conf}..."
+          File.open(conf, 'w').write(h.to_yaml)
+          puts "Complete!\nEnter your access key id and secret access key to access your AWS account."
+          exit 0
+        end
       end
     end
   end

data/lib/claws/version.rb

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

data/spec/command/ec2_spec.rb

@@ -52,7 +52,7 @@ describe Claws::Command::EC2 do
       context 'instance collections' do
         it 'retrieves' do
           Claws::Collection::EC2.should_receive(:new).and_return(
-            double(Claws::Collection::EC2, :get => 
+            double(Claws::Collection::EC2, :get =>
               [
                 double(AWS::EC2::Instance, :id => 'test', :status => 'running', :dns_name => 'test.com'),
               ]
@@ -102,7 +102,9 @@ describe Claws::Command::EC2 do
           OpenStruct.new(
             {
               :ssh => OpenStruct.new(
-                { :user => 'test' }
+                { :user => 'test',
+                  :identity => 'my_id'
+                }
               ),
               :ec2 => OpenStruct.new(
                 :fields => {
@@ -117,10 +119,32 @@ describe Claws::Command::EC2 do
         )
       end
 
+      context 'vpc' do
+        let(:instances) do
+          [
+            double(AWS::EC2::Instance, :id => 'test', :status => 'running', :private_ip_address => 'secret.com', :vpc? => true)
+          ]
+        end
+
+        it 'automatically connects to the server using private ip address' do
+          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 -i my_id test@secret.com').and_return(0)
+
+          capture_stdout {
+            subject.exec options
+          }
+        end
+
+      end
+
       context 'single instance' do
         let(:instances) do
           [
-            double(AWS::EC2::Instance, :id => 'test', :status => 'running', :dns_name => 'test.com')
+            double(AWS::EC2::Instance, :id => 'test', :status => 'running', :dns_name => 'test.com', :vpc? => false)
           ]
         end
 
@@ -130,7 +154,7 @@ describe Claws::Command::EC2 do
           )
 
           subject.should_receive(:puts).twice
-          subject.should_receive(:system).with('ssh test@test.com').and_return(0)
+          subject.should_receive(:system).with('ssh -i my_id test@test.com').and_return(0)
 
           capture_stdout {
             subject.exec options
@@ -141,9 +165,9 @@ describe Claws::Command::EC2 do
       context 'multiple instances' do
         let(:instances) do
           [
-            double(AWS::EC2::Instance, :id => 'test1', :status => 'running', :dns_name => 'test1.com'),
-            double(AWS::EC2::Instance, :id => 'test2', :status => 'running', :dns_name => 'test2.com'),
-            double(AWS::EC2::Instance, :id => 'test3', :status => 'running', :dns_name => 'test3.com'),
+            double(AWS::EC2::Instance, :id => 'test1', :status => 'running', :dns_name => 'test1.com', :vpc? => false),
+            double(AWS::EC2::Instance, :id => 'test2', :status => 'running', :dns_name => 'test2.com', :vpc? => false),
+            double(AWS::EC2::Instance, :id => 'test3', :status => 'running', :dns_name => 'test3.com', :vpc? => false),
           ]
         end
 
@@ -153,7 +177,7 @@ describe Claws::Command::EC2 do
           )
 
           subject.should_receive(:puts).twice
-          subject.should_receive(:system).with('ssh test@test2.com').and_return(0)
+          subject.should_receive(:system).with('ssh -i my_id test@test2.com').and_return(0)
 
           capture_stdout {
             subject.exec OpenStruct.new( {:selection => 1, :config_file => nil, :connect => true} )
@@ -168,7 +192,7 @@ describe Claws::Command::EC2 do
 
           subject.should_receive(:gets).and_return('1\n')
           subject.should_receive(:puts).once
-          subject.should_receive(:system).with('ssh test@test2.com').and_return(0)
+          subject.should_receive(:system).with('ssh -i my_id test@test2.com').and_return(0)
 
           capture_stdout {
             subject.exec options

data/spec/command/initialize_spec.rb

@@ -5,14 +5,29 @@ describe Claws::Command::Initialize do
 
   let(:config) { 'test/.test.yml' }
 
-  it 'works' do
+  it 'creates the configuration file' do
+    fh = double( File, :write => true )
+
     File.should_receive(:join).and_return(config)
-    subject.should_receive(:puts)
+    File.should_receive(:exists?).and_return(false)
 
-    fh = double( File, :write => true )
+    subject.should_receive(:print)
 
     File.should_receive(:open).with(config, 'w').and_return(fh)
+    fh.should_receive(:write)
+
+    subject.should_receive(:puts)
+    subject.should_receive(:exit).with(0)
+
+    subject.exec
+  end
+
+  it 'does not overwrite existing configuration file' do
+    File.should_receive(:join).and_return(config)
+    File.should_receive(:exists?).and_return(true)
+
     subject.should_receive(:puts)
+    subject.should_receive(:exit).with(1)
 
     subject.exec
   end

data/spec/configuration_spec.rb

@@ -7,6 +7,10 @@ describe Claws::Configuration do
       'capistrano' => {
         'home' => 'test',
       },
+      'ssh' => {
+        'user' => 'test',
+        'identity' => 'test/id_rsa',
+      },
       'aws' => {
         'access_key_id' => 'asdf',
         'secret_access_key' => 'qwer',
@@ -61,6 +65,20 @@ describe Claws::Configuration do
       end
     end
 
+    context 'SSH' do
+      before :each do
+        YAML.should_receive(:load_file).and_return(yaml)
+      end
+
+      it 'defines user' do
+        config.ssh.user.should == 'test'
+      end
+
+      it 'defines the identity file' do
+        config.ssh.identity.should == 'test/id_rsa'
+      end
+    end
+
     context 'AWS' do
       before :each do
         YAML.should_receive(:load_file).and_return(yaml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151922880 !ruby/object:Gem::Requirement
+  requirement: &2151925260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151922880
+  version_requirements: *2151925260
 - !ruby/object:Gem::Dependency
   name: command_line_reporter
-  requirement: &2151922140 !ruby/object:Gem::Requirement
+  requirement: &2151924480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151922140
+  version_requirements: *2151924480
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &2151921480 !ruby/object:Gem::Requirement
+  requirement: &2151923780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151921480
+  version_requirements: *2151923780
 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!