ftl 0.0.3 → 0.1.0

data/TODO

@@ -22,3 +22,7 @@ Start up script:
   set ASCII art login prompt
   add hashrocket git pairing switcher thingy
 
+EVERYTHING SCRIPT:
+Requiring an ami that uses the UserData
+==================
+

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/ftl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ftl}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Petty"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-07-29}
   s.default_executable = %q{ftl}
   s.description = %q{FTL spins up and down Amazon EC2 instances for pair programming}
   s.email = %q{matt@kizmeta.com}

data/lib/ftl/client.rb

@@ -24,10 +24,15 @@ module FTL
         return
       end
       puts "Spinning up FTL..."
-      self.class.post('/machines', :body => '', :query => {:name => args.first, :ami => CONFIG['ami']})
+      self.class.post('/machines', :body => '', :query => {:name => args.first, :ami => CONFIG['ami']}, :instance_type => (CONFIG['type'] || 'c1.medium'))
     end
+    alias :up :start 
+    alias :spinup :start
+    alias :create :start
+    alias :new :start
 
     def connect(args={})
+      # Do some monkeying with .ssh/known_hosts to clear ones we've seen before
       response = self.class.get('/machines')
       if response.length == 0
         puts "No machines running. try: ftl start <servername>"
@@ -46,6 +51,7 @@ module FTL
       end
       exec("ssh dev@#{server['dns_name']}") if server['dns_name']
     end
+    alias :c :connect
 
     def destroy(args={})
       if args.first.nil?
@@ -56,6 +62,10 @@ module FTL
       response = self.class.delete('/machines', :query => {:name => args.first}, :body => {:name => args.first})
       puts response['message']
     end
+    alias :kill     :destroy 
+    alias :down     :destroy 
+    alias :shutdown :destroy 
+
 
     def list(args={})
       response = self.class.get('/machines')

data/lib/ftl/server.rb

@@ -3,6 +3,8 @@ require 'active_support'
 require 'right_aws'
 require 'sdb/active_sdb'
 require 'json'
+require 'open-uri'
+
 # require 'fog'
 # ENV["FOG_RC"] = Will need this if we switch to Fog
 
@@ -15,6 +17,7 @@ module FTL
 
     ACCESS_KEY_ID     = ENV['ACCESS_KEY_ID']     || YAML.load_file(ENV['HOME']+'/.ftl/ftl.yml')['ACCESS_KEY_ID']
     SECRET_ACCESS_KEY = ENV['SECRET_ACCESS_KEY'] || YAML.load_file(ENV['HOME']+'/.ftl/ftl.yml')['SECRET_ACCESS_KEY']
+    INSTANCE_SCRIPT   = ENV['INSTANCE_SCRIPT']   || YAML.load_file(ENV['HOME']+'/.ftl/ftl.yml')['INSTANCE_SCRIPT']
 
     before do
       Aws::ActiveSdb.establish_connection(ACCESS_KEY_ID, SECRET_ACCESS_KEY)
@@ -38,9 +41,10 @@ module FTL
       return "Need to name this machine" unless params[:name]
       return "Please provide an ami" unless params[:ami]
       pm = PairingMachine.new(params)
-      pm[:instance_type] ||= 'm1.small'
+      pm[:instance_type] ||= 'c1.medium'
       ec2 = Aws::Ec2.new(ACCESS_KEY_ID, SECRET_ACCESS_KEY)
-      i = ec2.launch_instances(params[:ami], :user_data => "#!/", :instance_type => pm[:instance_type])[0]
+      instance_script = URI.parse(INSTANCE_SCRIPT).read || '#!'
+      i = ec2.launch_instances(params[:ami], :user_data => instance_script, :instance_type => pm[:instance_type])[0]
       pm[:aws_instance_id] = i[:aws_instance_id]
       pm[:dns_name] = i[:dns_name]
       pm.save

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matt Petty
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -05:00
+date: 2010-07-29 00:00:00 -05:00
 default_executable: ftl
 dependencies: 
 - !ruby/object:Gem::Dependency