ftl 0.2.2 → 0.2.3

data/Changelog

@@ -1,4 +1,9 @@
-Release Version 0.2.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Release Version 0.2.2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  
+  * Add ftl status
+  * find_instances returns exact match preferentially
+
+Release Version 0.2.2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   * Adds templates feature to config file
   * Start and cancel spot requests

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ftl (0.2.2)
+    ftl (0.2.3)
       fog
       formatador (~> 0.2.2)
 

data/README.md

@@ -47,4 +47,8 @@ Install is easy.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-© 2012 Matthew Petty Twitter:@mattpetty Github:@lodestone Email:lodestone@gmail.com
+© 2012 Matthew Petty 
+
+* Twitter: [@mattpetty](http://twitter.com/mattpetty) 
+* Github: [@lodestone](http://github.com/lodestone) 
+* Email: [lodestone@gmail.com](mailto:lodestone@gmail.com)

data/TODO.md

@@ -1,19 +1,8 @@
 # TODO
 
-* Enable launching of spot instances
-* ftl edit should edit ~/.ftl/ftl.yml with $EDITOR
-* Allow multiple named launch templates
 * ftl status <instance>
 * Tests    
 
-### Example of named templates:
 
-    :templates:
-      :ninja:
-        :username: ninja
-        :ami: ami-123456
-      :samurai:
-        :username: samurai
-        :ami: ami-456789
 
 

data/lib/ftl/client.rb

@@ -61,7 +61,7 @@ module Ftl
                                   :availability_zone => opts[:availability_zone], 
                                   :flavor_id         => opts[:instance_type], 
                                   :username          => opts[:username],
-                                  :tags              => opts[:tags] + [args.first]
+                                  :tags              => opts[:tags].merge(:Name => args.first)
                                   )
       display server
       eval(options[:post_script]) if options[:post_script]
@@ -123,6 +123,11 @@ module Ftl
     alias :x :connect
     alias :ssh :connect
 
+    def status(args={})
+      server = find_instance(args.first)
+      display server
+    end
+
     def start(args={})
       display "Starting stopped instances is not implemented yet. Stay tuned true believers."
     end
@@ -184,6 +189,9 @@ module Ftl
       `$EDITOR ~/.ftl/ftl.yml`
     end
 
+
+    ###########################################################################
+    ## private                                                              ###
     ###########################################################################
     private
 
@@ -220,8 +228,9 @@ module Ftl
 
     def find_instances(name)
       id_match  = server_instances.select{|i| i[:id] == name } if name[/^i-/]
+      exact_tag_match = server_instances.select{|i| !i.tags.nil? && i.tags['Name'] && i.tags['Name'] == name }
       tag_match = server_instances.select{|i| !i.tags.nil? && i.tags['Name'] && i.tags['Name'][name] }
-      id_match || tag_match
+      id_match || exact_tag_match || tag_match
     end
 
     def _headers_for(object)

data/lib/ftl/version.rb

@@ -1,3 +1,3 @@
 module Ftl
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/resources/ftl.yml

@@ -7,6 +7,7 @@ SECRET_ACCESS_KEY:
   #!/bin/sh
   touch /root/file.touched
 :spinup_script: | 
+:tags: {}
 
 :templates:
   :default:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70185339927300 !ruby/object:Gem::Requirement
+  requirement: &70186162145440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185339927300
+  version_requirements: *70186162145440
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70185339925300 !ruby/object:Gem::Requirement
+  requirement: &70186162190980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185339925300
+  version_requirements: *70186162190980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70185339924600 !ruby/object:Gem::Requirement
+  requirement: &70186162190220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70185339924600
+  version_requirements: *70186162190220
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70185339923960 !ruby/object:Gem::Requirement
+  requirement: &70186162189420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185339923960
+  version_requirements: *70186162189420
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70185339923280 !ruby/object:Gem::Requirement
+  requirement: &70186162188520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70185339923280
+  version_requirements: *70186162188520
 description: Ftl is a command line tool for Fog/AWS
 email:
 - matt@kizmeta.com
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3178890883638753060
+      hash: 1941961806599830985
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3178890883638753060
+      hash: 1941961806599830985
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11