teleport 1.0.5 → 1.0.6

data/lib/teleport/install.rb

@@ -23,6 +23,16 @@ module Teleport
       @config.dsl.extend(Util)
       @config.dsl.run_verbose!
 
+      # handle CONFIG_RECIPE
+      if @config_file[:recipe]
+        _with_callback(:install) do
+          _with_callback(:recipes) do
+            _recipe(@config_file[:recipe])
+          end
+        end
+        return
+      end
+
       _with_callback(:install) do
         _gems
         _hostname
@@ -49,13 +59,13 @@ module Teleport
 
     def _read_config
       # read DIR/config to get CONFIG_HOST (and set @host)
-      config_file = { }
+      @config_file = { }
       File.readlines("config").each do |i|
         if i =~ /CONFIG_([^=]+)='([^']*)'/
-          config_file[$1.downcase.to_sym] = $2
+          @config_file[$1.downcase.to_sym] = $2
         end
       end
-      @host = config_file[:host]
+      @host = @config_file[:host]
 
       # do we have a server object?
       @server = @config.server(@host)
@@ -92,19 +102,21 @@ module Teleport
       list += @server.recipes if @server
 
       banner "Recipes..."
-      list.each do |recipe|
-        path = "#{DATA}/recipes/#{recipe}"
-        if File.exists?(path)
-          banner "#{recipe}..."
-          # eval ruby files instead of running them
-          if path =~ /\.rb$/
-            eval(File.read(path), nil, path)
-          else
-            run path
-          end
+      list.each { |i| _recipe(i) }
+    end
+
+    def _recipe(recipe)
+      path = "#{DATA}/recipes/#{recipe}"
+      if File.exists?(path)
+        banner "#{recipe}..."
+        # eval ruby files instead of running them
+        if path =~ /\.rb$/
+          eval(File.read(path), nil, path)
         else
-          fatal "Recipe '#{recipe}' does not exist inside recipes/"
+          run path
         end
+      else
+        fatal "Recipe '#{recipe}' does not exist inside recipes/"
       end
     end
 

data/lib/teleport/main.rb

@@ -33,6 +33,9 @@ module Teleport
         o.on("-i", "--infer", "infer a new Telfile from YOUR machine") do |f|
           @options[:cmd] = :infer
         end
+        o.on("-r", "--recipe [RECIPE]", "run a single recipe instead of a full install") do |f|
+          @options[:recipe] = f
+        end
         o.on_tail("-h", "--help", "print this help text") do
           puts opt
           exit(0)
@@ -63,6 +66,11 @@ module Teleport
         fatal("Sadly, I can't find Telfile here. Please create one.")
       end
       @config = Config.new("Telfile")
+
+      # check if recipe exists
+      if @options[:recipe] && !File.exists?("recipes/#{@options[:recipe]}")
+        fatal "I couldn't find recipe #{@options[:recipe].inspect}. Oops."
+      end
     end
 
     # Assemble the the tgz before we teleport to the host
@@ -83,7 +91,8 @@ module Teleport
       File.open("#{DIR}/config", "w") do |f|
         f.puts("CONFIG_HOST='#{@options[:host]}'")        
         f.puts("CONFIG_RUBY='#{@config.ruby}'")
-        f.puts("CONFIG_RUBYGEMS='#{RUBYGEMS}'")        
+        f.puts("CONFIG_RUBYGEMS='#{RUBYGEMS}'")
+        f.puts("CONFIG_RECIPE='#{@options[:recipe]}'") if @options[:recipe]
       end
       # keys
       if ssh_key = @config.ssh_key

data/lib/teleport/version.rb

@@ -1,4 +1,4 @@
 module Teleport
   # Gem version
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleport
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -562607455023534771
+      hash: -2626968326399993902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -562607455023534771
+      hash: -2626968326399993902
 requirements: []
 rubyforge_project: teleport
 rubygems_version: 1.8.21