ftl 0.3.1 → 0.3.2

data/Changelog

@@ -1,3 +1,9 @@
+# Release Version 0.3.2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Feature: Add ftl templates (BETA)
+* Feature: Load yml files from templates subdirectory if available (BETA)
+* Bug Fix: ssh command usernames
+
 # Release Version 0.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Allow spot requests to accept --count parameter

data/Gemfile.lock

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

data/README.md

@@ -112,6 +112,6 @@ To connect to it, run `ftl connect ninja`.
 
 © 2012 Matthew Petty 
 
-* Twitter: [@mattpetty](http://twitter.com/mattpetty) 
+* Twitter: [@lodestone](http://twitter.com/lodestone) 
 * Github: [@lodestone](http://github.com/lodestone) 
 * Email: [lodestone@gmail.com](mailto:lodestone@gmail.com)

data/lib/ftl/client.rb

@@ -132,7 +132,7 @@ module Ftl
 
     def connect(args={})
       if server = running_instance(args.first)
-        # puts(ssh_command(server))
+        puts(ssh_command(server))
         exec(ssh_command(server))
       else
         display "Typo alert! No server found!"
@@ -286,8 +286,10 @@ module Ftl
     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] 
+      if server.tags['Name']
+        server_name =  server.tags['Name'].to_sym
+        user_name = options[:templates][server_name][:username] 
+      end
       user_name = 'root' if user_name.nil? || user_name.length == 0
       "ssh#{opt_key} #{user_name}@#{hostname}"
     end
@@ -323,9 +325,34 @@ module Ftl
       end
       @options = YAML.load_file(default_config_file)
       @options = @options.merge(opts)
+      load_extended_config_yaml
       puts "======Please open #{default_config_file} and set ACCESS_KEY_ID and SECRET_ACCESS_KEY====\n\n" if aws_credentials_absent?
     end
 
+    def yaml_config(*args)
+      puts @options
+    end
+
+    def templates(args)
+      if args.first
+        p @options[:templates][args.first.to_sym]
+      else
+        @options[:templates].each do |template|
+          puts template.first
+        end
+      end
+    end
+
+    # TODO Make :scripts and :actions the same way
+    def load_extended_config_yaml
+      Dir.glob("#{ENV['HOME']}/.ftl/templates/*.yml").each do |file|
+        yaml = YAML.load_file(file)
+        name = File.basename(file).gsub(".yml", '')
+        @options[:templates][name.to_sym]=@options[:templates][:defaults]
+        @options[:templates][name.to_sym].merge!(yaml)
+      end
+    end
+
     def find_instance(name)
       find_instances(name).first
     end

data/lib/ftl/version.rb

@@ -1,3 +1,3 @@
 module Ftl
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2487648818037517609
+      hash: -840873737631182775
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,10 +160,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2487648818037517609
+      hash: -840873737631182775
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ftl is a command line tool for Fog/AWS