befog 0.1.0 → 0.2.0

data/lib/befog/cli.rb

@@ -7,7 +7,10 @@ require "befog/commands/list"
 require "befog/commands/configure"
 
 module Befog
+  
   module CLI
+    
+    class Error < RuntimeError ; end
 
     COMMANDS = {
       "add" => Befog::Commands::Add,
@@ -30,8 +33,12 @@ module Befog
         # differentiate between expected exceptions
         # (just display the error message) and un-
         # expected (display the backtrace)
-        rescue => e
+        rescue Befog::CLI::Error => e
           $stderr.puts "befog: #{e.message}"
+          exit(-1)
+        rescue => e # uh-oh
+          $stderr.puts "Unexpected error"
+          $stderr.puts "#{e.class}: #{e.message}"
           $stderr.puts e.backtrace
           exit(-1)
         end
@@ -50,11 +57,16 @@ module Befog
         
 Usage: befog <subcommand> [<bank>] [<options>]
 
-The befog command allows you to manage your cloud servers from the command line. 
+The befog command allows you to manage your cloud servers from the command line.
+You reference these sets of servers as banks.  A bank can have one or many servers.
+
+Example: befog add web-servers --count 3
+
+Adds 3 servers to the bank "web-servers"
 
 Valid commands:
 
-    configure,  Configure a bank of servers
+    configure   Configure a bank of servers
     config
     add         Provision new servers for a bank of servers
     remove      De-provision servers for a bank of servers
@@ -69,4 +81,4 @@ eos
       
     end
   end
-end
+end

data/lib/befog/commands/add.rb

@@ -24,9 +24,7 @@ module Befog
         :long  => "--count COUNT",
         :required => true,
         :description => "The number of machines to provision"
-        
-      # TODO: Add support for machine type
-    
+            
       def run        
         count = options[:count].to_i
         if count <= 0
@@ -35,10 +33,14 @@ module Befog
         end
         servers = []
         count.times do |i|
-          $stdout.puts "Provisioning server #{i+1} ..."
+          $stdout.puts "Provisioning server #{i+1} for bank '#{options[:bank]}'..."
           # TODO: Figure out how to give the server a name
-          servers << compute.servers.create(:image_id => bank["image"], 
-              :key_name => bank["keypair"], :region => bank["region"])
+          # TODO: Check for values for all crucial configuration properties
+          servers << compute.servers.create(
+              :tags => {"Name" => options[:bank]}, :region => bank["region"],
+              :flavor_id => bank["type"], :image_id => bank["image"], 
+              :security_group_ids => [options[:group]||"default"],
+              :key_name => bank["keypair"])
         end
         $stdout.puts "This may take a few minutes ..."
         servers.each do |server|

data/lib/befog/commands/configure.rb

@@ -53,6 +53,11 @@ module Befog
         :short => "-g GROUP",
         :long  => "--group GROUP",
         :description => "The security group to use for new instances"
+    
+      option :type, 
+        :short => "-t TYPE",
+        :long  => "--type TYPE",
+        :description => "The number of machines to provision"
 
       def self.run(args)
         self.new(args).run
@@ -67,11 +72,9 @@ module Befog
           _key = key.to_sym
           provider[key] = options[_key] if options[_key]
         end
-        if options[:bank]
-          %w( provider region image keypair group ).each do |key|
-            _key = key.to_sym
-            bank[key] = options[_key] if options[_key]
-          end
+        %w( provider region image keypair group type ).each do |key|
+          _key = key.to_sym
+          bank[key] = options[_key] if options[_key]
         end
         save
       end

data/lib/befog/commands/list.rb

@@ -66,7 +66,8 @@ module Befog
         out << "instances:"
         banks[name]["servers"].each do |id|
           c = compute(configuration["provider"])
-          out << "- #{c.servers.get(id).public_ip_address}"
+          s = c.servers.get(id)
+          out << "- #{s.flavor_id} #{s.public_ip_address} #{s.state}"
         end
         $stdout.puts out.join("\n#{indent}")
       end

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

@@ -8,7 +8,7 @@ module Befog
         end
         
         def _bank
-          raise "You must specify a bank to do this" unless options[:bank]
+          raise Befog::CLI::Error.new("You must specify a bank to do this") unless options[:bank]
           banks[options[:bank]] ||= {}
         end
         
@@ -22,13 +22,13 @@ module Befog
         
         def process_arguments(arguments)
           _bank,*rest = arguments
-          if _bank =~ /^\-/ or rest.empty?
+          if _bank.nil? or _bank =~ /^\-/
             super
           else
             super(rest)
             options[:bank] = _bank
             bank.each do |key,value|
-              options[key.to_sym] = value
+              options[key.to_sym] ||= value
             end
           end
         end

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

@@ -36,6 +36,7 @@ module Befog
 
         def save
           File.open(File.expand_path(configuration_path),"w") { |f| YAML.dump(_configuration,f) }
+          $stdout.puts "Configuration written to: #{configuration_path}"
         end
               
 

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

@@ -14,7 +14,7 @@ module Befog
         end
         
         def provider
-          raise "You must specify a provider (with --provider or -q) to do this" unless options[:provider]
+          raise Befog::CLI::Error.new("You must specify a provider (with --provider or -q) to do this") unless options[:provider]
           providers[options[:provider]] ||= {}
         end
       
@@ -23,7 +23,7 @@ module Befog
         end
 
         def region
-          raise "Please set the region using -r or --region." unless options[:region]
+          raise Befog::CLI::Error.new("Please set the region using -r or --region.") unless options[:region]
           regions[options[:region]] ||= {}
         end
 

data/lib/befog/commands/run.rb

@@ -33,11 +33,16 @@ module Befog
       end
 
       def run_for_server(id)
-        address = get_server(id).public_ip_address
-        $stdout.puts "Running command '#{options[:command]}' for #{address} ..."
-        result = Fog::SSH.new(address, "root").run(options[:command]).first
-        $stdout.puts "[#{address}: STDOUT] #{result.stdout}"
-        $stderr.puts "[#{address}: STDERR] #{result.stderr}"
+        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 "[#{address}: STDOUT] #{result.stdout}"
+          $stderr.puts "[#{address}: STDERR] #{result.stderr}"
+        else
+          $stdout.puts "Server #{id} isn't running - skipping"
+        end
       end
 
     end

data/lib/befog/commands/start.rb

@@ -19,13 +19,20 @@ module Befog
       include Mixins::Help
 
       command "befog start <bank>",
-        :default_to_help => true
+        :default_to_help => false
 
       def run
         run_for_each_server
       end
 
       def run_for_server(id)
+        server = get_server(id)
+        if server.state == "stopped"
+          $stdout.puts "Starting server #{id} ..."
+          server.start
+        else
+          $stdout.puts "Server #{id} is already (or still) running"
+        end
       end
 
     end

data/lib/befog/commands/stop.rb

@@ -20,13 +20,20 @@ module Befog
       include Mixins::Help
 
       command "befog stop <bank>",
-        :default_to_help => true
+        :default_to_help => false
 
       def run
         run_for_each_server
       end
 
       def run_for_server(id)
+        server = get_server(id)
+        if server.state == "running"
+          $stdout.puts "Stopping server #{id} ..."
+          server.stop
+        else
+          $stdout.puts "Server #{id} is not (yet) running"
+        end
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: befog
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Carlo Flores  carlo@spire.io