ftl 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ftl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ftl}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Petty"]
-  s.date = %q{2010-07-29}
+  s.date = %q{2010-08-16}
   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

@@ -111,6 +111,21 @@ module FTL
       end
     end
 
+    def help(*args)
+      puts "Usage: ftl <command> <options>"
+      puts "  commands: start kill list connect"
+      puts "  examples:"
+      puts "    ftl start ninja   # starts an instance named 'ninja'"
+      puts "    ftl list          # shows running instances and status"
+      puts "    ftl connect       # connects to instance if only one is running"
+      puts "    ftl connect ninja # connects to instance named 'ninja'"
+      puts "    ftl kill nin      # kills all instances matching /nin/"
+    end
+
+    def method_missing(*args)
+      help
+    end
+
   end
 
 end

data/lib/ftl/server.rb

@@ -43,7 +43,11 @@ module FTL
       pm = PairingMachine.new(params)
       pm[:instance_type] ||= 'c1.medium'
       ec2 = Aws::Ec2.new(ACCESS_KEY_ID, SECRET_ACCESS_KEY)
-      instance_script = URI.parse(INSTANCE_SCRIPT).read || '#!'
+      if INSTANCE_SCRIPT.nil?
+        instance_script = '#!' 
+      else
+        instance_script = INSTANCE_SCRIPT[/^#!/] ? INSTANCE_SCRIPT : URI.parse(INSTANCE_SCRIPT).read
+      end
       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]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matt Petty
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -05:00
+date: 2010-08-16 00:00:00 -05:00
 default_executable: ftl
 dependencies: 
 - !ruby/object:Gem::Dependency