ftl 0.2.0 → 0.2.2

data/.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+.bundle
+vendor/bundle
 results.html
 pkg
 html

data/Changelog

@@ -0,0 +1,14 @@
+Release Version 0.2.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  * Adds templates feature to config file
+  * Start and cancel spot requests
+  * Execution without parameters shows help screen
+  * Fixes various bugs
+
+Release Version 0.2.0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ * First revamped release handling AWS in a more generic way
+
+Previous releases were focused on starting up Pair Programming servers. 
+The latest releases can also be used for this but are more useful in a generic 
+AWS situation.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ftl (0.2.0)
+    ftl (0.2.2)
       fog
       formatador (~> 0.2.2)
 
@@ -37,12 +37,14 @@ GEM
     formatador (0.2.2)
     gherkin (2.10.0)
       json (>= 1.4.6)
+    jruby-pageant (1.0.2)
     json (1.7.3)
     mime-types (1.18)
     multi_json (1.3.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.3.0)
+    net-ssh (2.4.0)
+      jruby-pageant (>= 1.0.2)
     nokogiri (1.5.2)
     rake (0.9.2.2)
     rdoc (3.12)

data/README.md

@@ -4,7 +4,8 @@ Faster Than Light. Fog Terminal Language. For Terminal Launching.
 
 ## Description
 
-Ftl is an AWS (fog) based application for managing cloud instances from the command line.
+Ftl is an AWS (fog-based) application for managing cloud instances from the command line.
+Easier than chef or the ec2 command line tools. Smarter too.
 
 ## Installation
 
@@ -17,26 +18,26 @@ Install is easy.
 ### Example commands
 
     Usage: ftl [<config-options>] <command> [<command-options>]
-        commands: start, kill, list, connect, servers, tags, images, snapshots, volumes
-        examples:
-          ftl start ninja                    # starts an instance named 'ninja'
-          ftl up ninja                       # starts an instance named 'ninja'
-          ftl spinup ninja                   # starts an instance named 'ninja'
-          ftl launch ninja                   # starts an instance named 'ninja'
-          ftl start ninja                    # starts an instance named 'ninja'
-          ftl list                           # shows running instances and status
-          ftl l                              # shows running instances and status
-          ftl connect ninja                  # connects to instance named 'ninja'
-          ftl kill ninja                     # kills instance Named "ninja"
-          ftl kill i-123456                  # kills instance with id i-123456
-          ftl images                         # shows aws images
-          ftl snapshots                      # shows aws snapshots
-          ftl tags                           # shows aws tags
-          ftl volumes                        # shows aws volumes
-          ftl --config=~/ftl.yml servers     # Uses custom config file 
-          ftl -c=~/ftl.yml servers           # Uses custom config file 
-          ftl --headers=id,tags.Name servers # Uses headers 
-          ftl headers servers                # Show possible headers for servers
+      commands: start, kill, list, edit, connect, servers, tags, images, snapshots, volumes
+      examples:
+        ftl launch ninja                   # Launches an instance named 'ninja'
+        ftl list                           # Shows running instances and status
+        ftl connect ninja                  # Connects to instance named 'ninja'
+        ftl kill ninja                     # Kills instances matching name /ninja/
+        ftl kill i-123456                  # Kills instance with id i-123456
+        ftl spot ninja 0.02                # Request spot instance using template :ninja for $0.02
+        ftl cancel sir-123456              # Cancel spot instance with id sir-123456
+        ftl spots                          # Shows AWS spot requests
+        ftl images                         # Shows AWS images
+        ftl snapshots                      # Shows AWS snapshots
+        ftl tags                           # Shows AWS tags
+        ftl volumes                        # Shows AWS volumes
+        ftl headers servers                # Show possible headers for servers
+        ftl headers volumes                # Show possible headers for volumes
+        ftl edit                           # Edit ftl.yml with your $EDITOR
+        ftl --config=~/ftl.yml servers     # Uses custom config file 
+        ftl --headers=id,tags.Name servers # Uses specified headers 
+        ftl --version                      # Show version number
 
 ## Contributing
 
@@ -45,3 +46,5 @@ Install is easy.
 3. Commit your changes (`git commit -am 'Added some feature'`)
 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

data/TODO.md

@@ -0,0 +1,19 @@
+# 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/bin/ftl

@@ -11,13 +11,17 @@ optparse = OptionParser.new do |opts|
     exit
   end
 
-  opts.on('-h', '--headers FILE', Array, "provide custom config file") do |headers|
+  opts.on('-d', '--headers FILE', Array, "provide custom headers") do |headers|
     options[:headers] = headers
   end
 
-  opts.on('-c', '--config FILE', "provide custom config file") do
-    puts "Supplied config file"
-    puts opts
+  opts.on('-c', '--config FILE', "provide custom config file") do |file|
+    options[:config] = file
+  end
+
+  opts.on('-v', '--version', "display version info") do
+    puts Ftl::VERSION
+    exit
   end
 
 end

data/features/step_definitions/ftl_steps.rb

@@ -1 +1,21 @@
 # Put your step defintions here
+When /^I get help for "(.*?)"$/ do |arg1|
+  # pending # express the regexp above with the code you wish you had
+end
+
+Then /^the banner should be present$/ do
+  pending # express the regexp above with the code you wish you had
+end
+
+Then /^the banner should document that this app takes options$/ do
+  pending # express the regexp above with the code you wish you had
+end
+
+Then /^the following options should be documented:$/ do |table|
+  # table is a Cucumber::Ast::Table
+  pending # express the regexp above with the code you wish you had
+end
+
+Then /^the banner should document that this app takes no arguments$/ do
+  pending # express the regexp above with the code you wish you had
+end

data/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'aruba/cucumber'
-require 'methadone/cucumber'
+# require 'methadone/cucumber'
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')

data/lib/ftl.rb

@@ -5,6 +5,7 @@ require "ftl/server"
 require "fog"
 require 'formatador'
 require 'ftl/fog_lights'
+require 'ftl/formatador_table'
 
 module Ftl
   # I'm a module!

data/lib/ftl/client.rb

@@ -3,26 +3,26 @@ module Ftl
   def self.help_message
     %Q{
     Usage: [bold]ftl[/] \[<config-options>\] <command> \[<command-options>\]
-      commands: start, kill, list, connect, servers, tags, images, snapshots, volumes
+      commands: start, kill, list, edit, connect, servers, tags, images, snapshots, volumes
       examples:
-        ftl start ninja                    # starts an instance named 'ninja'
-        ftl up ninja                       # starts an instance named 'ninja'
-        ftl spinup ninja                   # starts an instance named 'ninja'
-        ftl launch ninja                   # starts an instance named 'ninja'
-        ftl start ninja                    # starts an instance named 'ninja'
-        ftl list                           # shows running instances and status
-        ftl l                              # shows running instances and status
-        ftl connect ninja                  # connects to instance named 'ninja'
-        ftl kill ninja                     # kills instance Named "ninja"
-        ftl kill i-123456                  # kills instance with id i-123456
-        ftl images                         # shows aws images
-        ftl snapshots                      # shows aws snapshots
-        ftl tags                           # shows aws tags
-        ftl volumes                        # shows aws volumes
-        ftl --config=~/ftl.yml servers     # Uses custom config file 
-        ftl -c=~/ftl.yml servers           # Uses custom config file 
-        ftl --headers=id,tags.Name servers # Uses headers 
+        ftl launch ninja                   # Launches an instance named 'ninja'
+        ftl list                           # Shows running instances and status
+        ftl connect ninja                  # Connects to instance named 'ninja'
+        ftl kill ninja                     # Kills instances matching name /ninja/
+        ftl kill i-123456                  # Kills instance with id i-123456
+        ftl spot ninja 0.02                # Request spot instance using template :ninja for $0.02
+        ftl cancel sir-123456              # Cancel spot instance with id sir-123456
+        ftl spots                          # Shows AWS spot requests
+        ftl images                         # Shows AWS images
+        ftl snapshots                      # Shows AWS snapshots
+        ftl tags                           # Shows AWS tags
+        ftl volumes                        # Shows AWS volumes
         ftl headers servers                # Show possible headers for servers
+        ftl headers volumes                # Show possible headers for volumes
+        ftl edit                           # Edit ftl.yml with your $EDITOR
+        ftl --config=~/ftl.yml servers     # Uses custom config file 
+        ftl --headers=id,tags.Name servers # Uses specified headers 
+        ftl --version                      # Show version number
     }
   end
 
@@ -38,7 +38,7 @@ module Ftl
     def initialize(args=nil, opts={})
       load_config(opts)
       @con = Fog::Compute.new(:provider => 'AWS', :aws_secret_access_key => options['SECRET_ACCESS_KEY'], :aws_access_key_id => options['ACCESS_KEY_ID'])
-      if args
+      if args && args.length > 0
         arg = args.reverse.pop
         send(arg, args - [arg])
       else
@@ -46,50 +46,107 @@ module Ftl
       end
     end
 
-    def start(args={})
+    def launch(args={})
+      if args.first.nil?
+        display "Please provide a short name for instance\n\t[bold]ftl[/] launch <name>"
+        return
+      end
+      display "Spinning up FTL..."
+      opts = options
+      opts = options[:templates][args.first.to_sym] if !options[:templates][args.first.to_sym].nil?
+      server = con.servers.create(:user_data         => opts[:user_data],
+                                  :key_name          => opts[:keypair], 
+                                  :groups            => opts[:groups], 
+                                  :image_id          => opts[:ami], 
+                                  :availability_zone => opts[:availability_zone], 
+                                  :flavor_id         => opts[:instance_type], 
+                                  :username          => opts[:username],
+                                  :tags              => opts[:tags] + [args.first]
+                                  )
+      display server
+      eval(options[:post_script]) if options[:post_script]
+    end
+    alias :up     :launch
+    alias :spinup :launch
+    alias :create :launch
+    alias :new    :launch
+
+    def spot(args={})
       if args.first.nil?
-        puts "Please provide a short name for instance, like: ftl start ninjaserver"
+        display "Please provide a short name for instance\n\t[bold]ftl[/] spot <name> <price>"
+        return
+      end
+      if args[1].nil?
+        display "Please provide a price for spot request\n\t[bold]ftl[/] spot <name> <price>"
         return
       end
       display "Spinning up FTL..."
-      i = con.servers.create(:user_data => options[:user_data],
-                             :key_name  => options[:keypair], 
-                             :groups    => options[:groups], 
-                             :image_id  => options[:ami], 
-                             :flavor_id => options[:instance_type], 
-                             :username  => options[:username]
-                             )
-      tag = con.tags.new(:key => "Name", :value => args.first)
-      tag.resource_id = i.id
-      tag.resource_type = 'instance'
-      tag.save
-      display i
-    end
-    alias :up     :start 
-    alias :launch :start 
-    alias :spinup :start
-    alias :create :start
-    alias :new    :start
+      opts = options
+      opts = options[:templates][args.first.to_sym] if !options[:templates][args.first.to_sym].nil?
+      server = con.spot_requests.create(:user_data         => opts[:user_data],
+                                        :price             => args[1],
+                                        :key_name          => opts[:keypair], 
+                                        :groups            => opts[:groups], 
+                                        :image_id          => opts[:ami], 
+                                        :availability_zone => opts[:availability_zone], 
+                                        :flavor_id         => opts[:instance_type], 
+                                        :username          => opts[:username],
+                                        :tags              => {:Name => args.first}
+                                        )
+      display server
+    end
+
+    def spots(args={})
+      con.spot_requests.table(_headers_for(:spot_requests))
+    end
+
+    def cancel(args={})
+      if args.first.nil?
+        display "Please provide the id for the spot request to cancel."
+        return
+      end
+      spot = con.spot_requests.get(args.first)
+      if spot && spot.destroy
+        display "Canceled Spot Instance #{spot.id}."
+      else
+        display "Whups, spot instance not found!"
+      end
+    end
 
     def connect(args={})
-      if match = find_instance(args.first)
+      if match = find_instances(args.first).select{|i| i.state == "running" }.first
         exec("ssh #{options[:username]||'root'}@#{match[:dns_name]}")
       else
         display "Typo alert! No server found!"
       end
     end
-    alias :c :connect
+    alias :x :connect
+    alias :ssh :connect
+
+    def start(args={})
+      display "Starting stopped instances is not implemented yet. Stay tuned true believers."
+    end
+
+    def stop(args={})
+      display "Stopping running instances is not implemented yet. Stay tuned true believers."
+    end
 
     def destroy(args={})
       if args.first.nil?
-        puts "Please provide the name (or partial name for the instance(s) you want to delete. For instance, like: ftl destroy ninja"
+        display "Please provide the name (or partial name for the instance(s) you want to delete. For instance, like: ftl destroy ninja"
         return
       end
       display "Spinning down FTL..."
-      instance = find_instance(args.first)
-      instance.destroy
+      instances = find_instances(args.first)
+      if instances
+        instances.map(&:destroy)
+        display "Terminated [bold]\[#{instances.map(&:id).join(', ')}\][/]"
+      else
+        display "No instances found"
+      end
     end
     alias :d        :destroy 
+    alias :delete   :destroy 
     alias :kill     :destroy 
     alias :down     :destroy 
     alias :shutdown :destroy 
@@ -99,8 +156,9 @@ module Ftl
     end
     alias :i :info
 
-    def list(args=[:servers])
-      server_instances.table(_headers_for(args.first))
+    def list(opts)
+      opts = [:servers] if opts.empty?
+      con.send(opts.first).table(_headers_for(opts.first))
     end
     alias :l :list
 
@@ -108,6 +166,10 @@ module Ftl
       Formatador.display_table(con.images.find(:id => args.first))
     end
 
+    # TODO: Make images return only account's images by default
+    # def images(args={})
+    # end
+
     def headers(args={})
       display "Showing header options for #{args.first}"
       display con.send(args.first).first.attributes.keys
@@ -117,43 +179,35 @@ module Ftl
       @servers ||= @con.servers.all
     end
 
+    def edit(args={})
+      display "You need to set [bold]$EDITOR[/] environment variable" if ENV['EDITOR'].nil?
+      `$EDITOR ~/.ftl/ftl.yml`
+    end
+
     ###########################################################################
     private
 
     def ftl_yml
-%Q%
-ACCESS_KEY_ID: 
-SECRET_ACCESS_KEY: 
-:ami: ami-a29943cb # Ubuntu 12.04 LTS Precise Pangolin
-:username: ubuntu
-:instance_type: c1.medium
-:default_username: ubuntu
-:instance_script: |
-  #!/bin/sh
-  touch file.touched
-:spinup_script: | 
-  class Samurai
-    def slice!
-      puts "slice"
-    end
-  end
-  Samurai.new.slice!
-%
+      File.open("lib/resources/ftl.yml").read
     end
 
     def load_config(opts={})
       # TODO Make this less shitty. Such a common pattern.
-      default_config_name = 'ftl.yml'
-      default_config_dir  = '/.ftl/'
-      default_config_home = "#{ENV['HOME']}#{default_config_dir}"
-      default_config_file = "#{default_config_home}#{default_config_name}"
-      if Dir.exist?(default_config_home) 
-        if !File.exist?(default_config_file)     
+      if opts[:config]
+        default_config_file = opts[:config]
+      else
+        default_config_name = 'ftl.yml'
+        default_config_dir  = '/.ftl/'
+        default_config_home = "#{ENV['HOME']}#{default_config_dir}"
+        default_config_file = "#{default_config_home}#{default_config_name}"
+        if Dir.exist?(default_config_home) # Directory exists 
+          if !File.exist?(default_config_file) # File does not
+            File.open(default_config_file, 'w') {|f| f << ftl_yml }
+          end
+        else # Directory does not exist 
+          Dir.mkdir(default_config_home)
           File.open(default_config_file, 'w') {|f| f << ftl_yml }
         end
-      else
-        Dir.mkdir(default_config_home)
-        File.open(default_config_file, 'w') {|f| f << ftl_yml }
       end
       @options = YAML.load_file(default_config_file)
       @options = @options.merge(opts)
@@ -161,20 +215,28 @@ SECRET_ACCESS_KEY:
     end
 
     def find_instance(name)
-      id_match  = server_instances.find{|i| i[:id] == name } if name[/^i-/]
-      tag_match = server_instances.find{|i| !i.tags.nil? && i.tags['Name'] == name }
+      find_instances(name).first
+    end
+
+    def find_instances(name)
+      id_match  = server_instances.select{|i| i[:id] == name } if name[/^i-/]
+      tag_match = server_instances.select{|i| !i.tags.nil? && i.tags['Name'] && i.tags['Name'][name] }
       id_match || tag_match
     end
 
     def _headers_for(object)
       return options[:headers].map(&:to_sym) if options[:headers]
-      case object
+      case object.to_sym
       when :snapshots
         [:id, :volume_id, :state, :volume_size, :description, :"tags.Name"]
+      when :spot_requests
+        [:id, :image_id, :availability_zone, :price, :flavor_id, :state, :request_type, :launched, :created_at]
       when :volumes
         [:server_id, :id, :size, :snapshot_id, :availability_zone, :state, :"tags.Name"]
       when nil
         [:id, :image_id, :flavor_id, :availability_zone, :state, :"tags.Name"]
+      else
+        [:id, :image_id, :flavor_id, :availability_zone, :state, :"tags.Name"]
       end
     end
 
@@ -190,7 +252,7 @@ SECRET_ACCESS_KEY:
     def method_missing(*args)
       begin
         method = args.first
-        options = args[1]
+        # opts = args[1]
         if con.respond_to? method
           display con.send(method).table(_headers_for(method))
         else