ftl 0.2.4 → 0.3.0

data/Changelog

@@ -1,3 +1,15 @@
+# Release Version 0.3.0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Feature: Add ftl <script> to execute arbitrary ruby locally within ftl environment
+* Feature: Add ftl ips to show Elastic IP addresses
+* Feature: Add ftl stop to stop running instances
+* Feature: Add ftl start to start running instances
+* Feature: Add option to pass in spot request instance count
+* Feature: Add ftl terminate to specifically terminate any instance vs only running ones
+* Bug fix: Spot requests were launching as regular instances 
+* Bug fix: Other minor bug fixes and cleanups
+
+
 # Release Version 0.2.4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Add ftl <action> <server> to execute arbitrary commands on running instances

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    ftl (0.2.4)
+    ftl (0.3.0)
       fog
       formatador (~> 0.2.2)
+      tilt
 
 GEM
   remote: https://rubygems.org/
@@ -22,11 +23,11 @@ GEM
       gherkin (~> 2.10.0)
       json (>= 1.4.6)
     diff-lcs (1.1.3)
-    excon (0.13.4)
+    excon (0.14.3)
     ffi (1.0.11)
-    fog (1.3.1)
+    fog (1.4.0)
       builder
-      excon (~> 0.13.0)
+      excon (~> 0.14.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -34,18 +35,16 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.2)
+    formatador (0.2.3)
     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)
+    mime-types (1.19)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.4.0)
-      jruby-pageant (>= 1.0.2)
-    nokogiri (1.5.2)
+    net-ssh (2.5.2)
+    nokogiri (1.5.5)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -58,6 +57,7 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/ftl.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake','~> 0.9.2')
   gem.add_dependency('fog')
   gem.add_dependency('formatador', '~> 0.2.2')
+  gem.add_dependency('tilt')
 end

data/lib/ftl.rb

@@ -7,6 +7,7 @@ require 'formatador'
 require 'ftl/fog_lights'
 require 'ftl/formatador_table'
 
+
 module Ftl
-  # I'm a module!
+  # Look at me, I'm a module!
 end

data/lib/ftl/client.rb

@@ -22,6 +22,7 @@ module Ftl
         ftl edit                           # Edit ftl.yml with your $EDITOR
         ftl images                         # Show AMIs associated with your account
         ftl <action> ninja                 # Execute the <action> (specified in ftl.yml) on the remote server instance
+        ftl <script> ninja                 # Execute the <script> (specified in ftl.yml) on your local machine
         ftl --config=~/ftl.yml servers     # Uses custom config file
         ftl --headers=id,tags.Name servers # Uses specified headers
         ftl --version                      # Show version number
@@ -40,17 +41,14 @@ module Ftl
     attr_accessor :options
 
     def initialize(args=nil, opts={})
-      load_config(opts)
       if args && args.length > 0
         arg = args.reverse.pop
+        @args = [arg, args - [arg]]
+        load_config(opts)
         if (!SINGLE_COMMANDS.include?(arg))
           @con = Fog::Compute.new(:provider => 'AWS', :aws_secret_access_key => options['SECRET_ACCESS_KEY'], :aws_access_key_id => options['ACCESS_KEY_ID'])
         end
-        begin
-          send(arg, args - [arg])
-        rescue
-          Ftl.help
-        end
+        send(*@args)
       else
         Ftl.help
       end
@@ -59,12 +57,14 @@ module Ftl
     def launch_instance(args)
       display "Spinning up FTL..."
       opts = options
-      opts = options[:templates][args.first.to_sym] if !options[:templates][args.first.to_sym].nil?
+      opts = options.merge(options[:templates][args.first.to_sym]) if !options[:templates][args.first.to_sym].nil?
 
       opts[:group_ids] = (opts[:group_ids] || []) + opts[:groups].select { | group | group.to_s =~ /^sg-[0-9a-f]{8}$/ }
       opts[:groups] = opts[:groups].reject { | group | group.to_s =~ /^sg-[0-9a-f]{8}$/ }
 
-      server = con.servers.create(:user_data          => opts[:user_data],
+      launcher = options.delete(:launcher) || :servers
+      server = con.send(launcher).create(
+                                  :user_data          => opts[:user_data],
                                   :key_name           => opts[:keypair],
                                   :groups             => opts[:groups],
                                   :security_group_ids => opts[:group_ids],
@@ -75,6 +75,8 @@ module Ftl
                                   :tags               => opts[:tags].merge(:Name => args.first),
                                   :subnet_id          => opts[:subnet_id],
                                   :private_ip_address => opts[:ip_private],
+                                  :ip_address         => opts[:ip_address],
+                                  :price              => opts[:price]
                                  )
 
       display server
@@ -84,7 +86,6 @@ module Ftl
 
     def launch(args={})
       guard(args.first, "Please provide a short name for instance\n\t[bold]ftl[/] launch <name>")
-      display "Spinning up FTL..."
       options.merge(options[:templates][args.first.to_sym]) if !options[:templates][args.first.to_sym].nil?
       server = launch_instance(args)
     end
@@ -94,17 +95,20 @@ module Ftl
     alias :new    :launch
 
     def spot(args={})
-      guard(args.first, "Please provide a short name for instance\n\t[bold]ftl[/] spot <name> <price>")
+      guard(args[0], "Please provide a short name for instance\n\t[bold]ftl[/] spot <name> <price>")
       guard(args[1], "Please provide a price for spot request\n\t[bold]ftl[/] spot <name> <price>")
       display "Spinning up FTL..."
       options.merge(options[:templates][args.first.to_sym]) if !options[:templates][args.first.to_sym].nil?
-      options[:price] = args[1]
+      options[:price] = args[1] || options[:templates][args.first.to_sym][:price] || options[:price]
+      options.merge!(:launcher => :spot_requests)
       server = launch_instance(args)
     end
+    alias :request :spot
 
     def spots(args={})
       con.spot_requests.table(_headers_for(:spot_requests))
     end
+    alias :spot_requests :spots
 
     def cancel(args={})
       guard(args.first, "Please provide the id for the spot request to cancel.") 
@@ -116,11 +120,19 @@ module Ftl
       end
     end
 
+    def running_instances(name)
+      find_instances(name).select{|i| i.state == "running" }
+    end
+
+    def running_instance(name)
+      instances = running_instances(name)
+      instances.first if instances
+    end
+
     def connect(args={})
-      if match = find_instances(args.first).select{|i| i.state == "running" }.first
-        opt_key = "-i #{options[:keys][match[:key_name]]}" unless (options[:keys].nil? || options[:keys][match[:key_name]].nil?)
-        hostname = match[:dns_name] || match[:public_ip_address] || match[:private_ip_address]
-        exec("ssh #{opt_key} #{options[:username]||'root'}@#{hostname}")
+      if server = running_instance(args.first)
+        # puts(ssh_command(server))
+        exec(ssh_command(server))
       else
         display "Typo alert! No server found!"
       end
@@ -133,34 +145,49 @@ module Ftl
       server = find_instance(args.first)
       display server
     end
+    alias :st :status
 
     def start(args={})
-      display "Starting stopped instances is not implemented yet. Stay tuned true believers."
+      display "Bringing \"#{args.first}\" server back to life."
+      find_instance(args.first).start
     end
+    alias :run :start
 
     def stop(args={})
-      display "Stopping running instances is not implemented yet. Stay tuned true believers."
+      display "Stopping \"#{args.first}\" server."
+      find_instance(args.first).stop
     end
+    alias :pause :stop
 
     def destroy(args={})
-      if args.first.nil?
-        display "Please provide the name (or partial name for the instance(s) you want to delete. For instance, like: ftl destroy ninja"
-        return
+      guard(on_what, "Please provide the name (or partial name for the instance(s) you want to delete. For instance, like: ftl destroy ninja")
+      display "Spinning down FTL..."
+      instances = find_instances(on_what).select{|i| i.state == 'running' }
+      if !instances.empty?
+        instances.map(&:destroy)
+        display "Destroyed [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
+
+    def terminate(args={})
+      guard(on_what, "Please provide the name (or partial name for the instance(s) you want to terminate. For instance, like: ftl destroy ninja")
       display "Spinning down FTL..."
-      instances = find_instances(args.first)
-      if instances
+      instances = find_instances(on_what)
+      if !instances.empty?
         instances.map(&:destroy)
-        display "Terminated [bold]\[#{instances.map(&:id).join(', ')}\][/]"
+        display "Destroyed [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
+    alias :t :terminate
 
     def info(args={})
       display find_instance(args.first)
@@ -171,11 +198,13 @@ module Ftl
       opts = [:servers] if opts.empty?
       con.send(opts.first).table(_headers_for(opts.first))
     end
-    alias :l :list
+    alias :l  :list
+    alias :ls :list
 
     def image(args={})
       Formatador.display_table(con.images.find(:id => args.first))
     end
+    alias :img :image
 
     # TODO: Make this better by including more details of block devices
     def images(args={})
@@ -188,14 +217,29 @@ module Ftl
       end 
       puts Formatador.display_table(hashes)
     end
+    alias :describe_images :images
+
+    def ip_addresses
+      con.addresses
+    end
+
+    def ips(args={})
+      # TODO add server "name"
+      addrs = con.describe_addresses.body['addressesSet'] #.collect do |addr|
+        # addr
+      # end 
+      Formatador.display_table addrs
+    end
+    alias :addresses :ips
 
     def headers(args={})
-      display "Showing header options for #{args.first}"
-      display con.send(args.first).first.attributes.keys
+      what = args.first || :servers
+      display "Showing header options for #{what}"
+      display con.send(what).first.attributes.keys
     end
 
     def server_instances(args={})
-      @servers ||= @con.servers.all
+      @servers ||= (con.servers.all||[])
     end
 
     def edit(args={})
@@ -207,10 +251,45 @@ module Ftl
       puts File.open(File.dirname(__FILE__) + "/../resources/ftl.yml").read
     end
 
+    def command
+      @args[0]
+    end
+
+    def secondary_arguments
+      @args[1] 
+    end
+
+    def on_what 
+      secondary_arguments.first
+    end
+
+    def volume(args={})
+      arg = args.is_a?(String) ? args : on_what
+      display vol = con.volumes.select{|v| v.tags['Name'] == arg || v.id == arg }.first
+      vol
+    end
+
+    def execute(args={})
+      arg = args.is_a?(String) ? args : args[1]
+      server = find_instances(on_what).select{|i| i.state == 'running' }.first
+      puts %|#{ssh_command(server)} #{arg}|
+      system(%|#{ssh_command(server)} #{arg}|)
+    end
+    alias :ex :execute
+
     ###########################################################################
     ## private                                                              ###
     ###########################################################################
     private
+ 
+    def ssh_command(server)
+      opt_key = " -i #{options[:keys][server[:key_name]]}" unless (options[:keys].nil? || options[:keys][server[:key_name]].nil?)
+      hostname = server[:public_ip_address] || server[:dns_name] || server[:private_ip_address]
+      server_name =  server.tags['Name'].to_sym
+      user_name = options[:templates][server_name][:username] 
+      user_name = 'root' if user_name.nil? || user_name.length == 0
+      "ssh#{opt_key} #{user_name}@#{hostname}"
+    end
 
     def guard(arg, options={:message => "Please refer to ftl help"})
       if arg.nil?
@@ -224,7 +303,7 @@ module Ftl
     end
 
     def load_config(opts={})
-      # TODO Make this less shitty. Such a common pattern.
+      # TODO So ugly, make this less shitty. Such a common pattern.
       if opts[:config]
         default_config_file = opts[:config]
       else
@@ -267,9 +346,9 @@ module Ftl
       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"]
+        [:id, :image_id, :flavor_id, :availability_zone, :state, :created_at, :"tags.Name"]
       else
-        [:id, :image_id, :flavor_id, :availability_zone, :state, :"tags.Name"]
+        [:id, :image_id, :flavor_id, :availability_zone, :state, :created_at, :"tags.Name"]
       end
     end
 
@@ -285,17 +364,35 @@ module Ftl
     def eval_action(script, args)
       # TODO Complete the script to handle multiple servers, like:
       # ftl bundle server1 server2 server3
-      server = find_instance(args[1].first)
+      # server = find_instance(on_what)
+      server = find_instances(on_what).select{|i| i.state == 'running' }.first
+      eval(script, binding)
+    end
+
+    def eval_script(script, args)
       eval(script, binding)
     end
 
+    def local(cmd)
+      puts output = %x|#{cmd}|
+      output
+    end
+
+    # def remote(cmd)
+    #   %x|#{ssh_command(server)} #{cmd}|
+    # end
+
     def method_missing(*args)
-      begin
-        method = args.first.to_sym
-        display con.send(method).table(_headers_for(method)) if con.respond_to? method
-        eval_action(@options[:actions][method], args) if @options[:actions][method]
+      method = args.first.to_sym
+      if con.respond_to? method
+        results = con.send(method)
+        display results.table(_headers_for(method))
+      elsif options[:actions][method]
+        eval_action(options[:actions][method], args)
+      elsif options[:scripts][method]
+        eval_script(options[:scripts][method], args)
+      else
         Ftl.help
-      rescue
       end
     end
 

data/lib/ftl/version.rb

@@ -1,3 +1,3 @@
 module Ftl
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/lib/resources/ftl.yml

@@ -5,23 +5,20 @@
 ACCESS_KEY_ID: 
 SECRET_ACCESS_KEY: 
 
-:ami: ami-a29943cb # Ubuntu 12.04 LTS Precise Pangolin
-:username: ubuntu
-:instance_type: t1.micro # m1.small 
-:user_data: |
-  #!/bin/sh
-  touch /root/file.touched
-:post_script: | 
-:tags: {}
+:scripts:
+  :ls: |
+    local("ls -alh")
+    local("echo '-----------'")
+
 :actions:
   :uptime: puts server.ssh('uptime').first.stdout
   :mount: puts server.ssh('mount').first.stdout
   :df: puts server.ssh('df -h').first.stdout
   :w: puts server.ssh('w').first.stdout
 
-
 :templates:
-  :default:
+
+  :defaults: &defaults
     :ami: ami-a29943cb # Ubuntu 12.04 LTS Precise Pangolin
     :username: ubuntu
     :instance_type: m1.small
@@ -30,4 +27,9 @@ SECRET_ACCESS_KEY:
       touch /root/file.touched
     :post_script: | 
 
+  :ninja_server:
+    <<: *defaults
+    :user_data: |
+      #!/bin/sh
+      uptime > /root/uptime.txt
 

metadata

@@ -1,82 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ftl
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Matt Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: fog
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ftl is a command line tool for Fog/AWS
-email: 
+email:
 - matt@kizmeta.com
-executables: 
+executables:
 - ftl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Changelog
 - Gemfile
@@ -101,38 +139,35 @@ files:
 - test/tc_something.rb
 homepage: http://github.com/lodestone/ftl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3514707693365094716
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2669038478733499008
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3514707693365094716
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2669038478733499008
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ftl is a command line tool for Fog/AWS
-test_files: 
+test_files:
 - features/ftl.feature
 - features/step_definitions/ftl_steps.rb
 - features/support/env.rb