befog 0.5.0 → 0.5.1

data/lib/befog/commands/add.rb

@@ -30,6 +30,10 @@ module Befog
       option :type, 
         :short => :t,
         :description => "The type of machines to provision"
+        
+      option :spot,
+        :short => :s,
+        :description => "Provision a spot instance"
 
       def run        
         provision_servers(options[:count].to_i)
@@ -71,10 +75,21 @@ module Befog
       end
       
       def provision_server
-        compute.servers.create(
+        if options[:spot]
+          request = compute.spot_requests.create(
+            :price => price.to_f, :instance_count => 1, 
             :tags => {"Name" => generate_server_name},
             :region => region, :flavor_id => flavor, :image_id => image, 
-            :security_group_ids => security_group, :key_name => keypair)
+            :groups => [ security_group ], :key_name => keypair)
+          server = nil
+          Fog.wait_for {(server = compute.servers.get(request.reload.instance_id)) rescue nil}
+          server
+        else
+          compute.servers.create(
+              :tags => {"Name" => generate_server_name},
+              :region => region, :flavor_id => flavor, :image_id => image, 
+              :security_group_ids => security_group, :key_name => keypair)
+        end
       end
       
       def generate_server_name

data/lib/befog/commands/configure.rb

@@ -51,6 +51,10 @@ module Befog
       option :type, 
         :short => :t,
         :description => "The number of machines to provision"
+        
+      option :price,
+        :short => :z,
+        :description => "The spot instance price"
 
       def run
         safely do
@@ -58,7 +62,7 @@ module Befog
             _key = key.to_sym
             provider[key] = options[_key] if options[_key]
           end
-          %w( region image keypair group type ).each do |key|
+          %w( region image keypair group type price ).each do |key|
             _key = key.to_sym
             bank[key] = options[_key] if options[_key]
           end          

data/lib/befog/commands/mixins/scope.rb

@@ -89,6 +89,11 @@ module Befog
             error("Specify a keypair with --keypair or by adding one to the '#{bank_name}' bank.")
         end
         
+        def price
+          options[:price] or bank["price"] or
+            error("Specify a spot instance price with --price or by adding one to the '#{bank_name}' bank.")
+        end
+        
         def keypair?
           !!options[:keypair] or bank["keypair"]
         end

data/lib/befog/commands/mixins/selectable.rb

@@ -23,7 +23,7 @@ module Befog
 
             option :group, 
               :short => :g,
-              :description => "Select servers using this group"
+              :description => "Select servers using this security group"
 
             option :type, 
               :short => :t,

data/lib/befog/commands/run.rb

@@ -25,8 +25,11 @@ module Befog
 
       option :command, 
         :short => :c,
-        :required => true,
-        :description => "Command to run (required)"
+        :description => "Command to run"
+      
+      option :shell,
+        :short => :y,
+        :description => "Shell script to run remotely"
     
       option :all,
         :short => :a,
@@ -34,14 +37,25 @@ module Befog
 
     
       def run
+        script = if options[:command] and not options[:shell]
+          $stdout.puts "Running command '#{options[:command]}' ..."
+          options[:command]
+        elsif options[:shell] and not options[:command]
+          $stdout.puts "Running script '#{options[:shell]}' ..."
+          # We add the sleep in case the last command is run in the bg
+          File.open options[:shell] { |file| file.read + "\nsleep 1"}
+        else
+          raise "Must specify one of --shell or --command"
+        end
         run_for_selected do |id|
           threads = []; threads << Thread.new do
             safely do
+              # TODO: Add check to see if we have a bad ID in the config
               server = get_server(id)
               if server.state == "running"
                 address = server.public_ip_address
-                $stdout.puts "Running command '#{options[:command]}' for #{address} ..."
-                result = Fog::SSH.new(address, "root").run(options[:command]).first
+                $stdout.puts "... for '#{address}'"
+                result = Fog::SSH.new(address, "root").run(script).first
                 $stdout.puts "#{address} STDOUT: #{result.stdout}"
                 $stderr.puts "#{address} STDERR: #{result.stderr}" unless result.stderr.empty?
               else

metadata

@@ -1,63 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: befog
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
-- Carlo Flores  carlo@spire.io
-- Dan Yoder dan@spire.io
+authors:
+- Lance Lakey lancelakey@gmail.com
+- Carlo Flores lo@js.la
+- Dan Yoder danielyoder@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.7"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id003
-description: "\t\tThe befog gem allows you to manage your cloud servers\n\
-  \t\tdirectly from the command-line. \n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+description: ! "\t\tThe befog gem allows you to manage your cloud servers\n\t\tdirectly
+  from the command-line. \n"
+email:
+- 
 - 
 - 
-executables: 
+executables:
 - befog
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/befog/cli.rb
 - lib/befog/commands/add.rb
 - lib/befog/commands/configure.rb
@@ -76,33 +90,29 @@ files:
 - lib/befog/commands.rb
 - lib/befog.rb
 - bin/befog
-homepage: https://github.com/spire-io/befog
+homepage: https://github.com/dyoder/befog
 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 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cloud provisioning CLI
 test_files: []
-
 has_rdoc: