befog 0.3.0 → 0.4.0

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

@@ -0,0 +1,127 @@
+require 'fog'
+
+module Befog
+  module Commands
+    module Mixins
+      module Scope
+        
+        def provider_name
+          options[:provider] or bank["provider"] or 
+            error("Specify a provider with --provider or by adding one to the '#{bank_name}' bank.")
+        end
+        
+        def provider?
+          !!options[:provider] or bank["provider"]
+        end
+        
+        def providers
+          @providers ||= (configuration["providers"] ||= {})
+        end
+        
+        def provider
+          @provider ||= (providers[provider_name] ||= {})
+        end
+        
+        def account_key
+          provider["key"]
+        end
+        
+        def account_secret
+          provider["secret"]
+        end
+        
+        # TODO: do something clever once we have more than 2-3 providers
+        def compute
+          case provider_name
+          when "aws"
+            @compute ||= Fog::Compute.new(:provider => "AWS", 
+              :aws_access_key_id => account_key, 
+              :aws_secret_access_key => account_secret,
+              :region => region)
+          else
+            error("Provider '#{provider_name}' is currently unsupported.")
+          end
+        end
+        
+        def get_server(id)
+          compute.servers.get(id)
+        end
+            
+        
+        def region
+          options[:region] or bank["region"] or 
+            error("Specify a region with --region or by adding one to the '#{bank_name}' bank.")
+        end
+        
+        def region?
+          !!options[:region] or bank["region"]
+        end
+        
+        def flavor
+          options[:type] or bank["type"] or 
+            error("Specify an instance type (flavor) with --type or by adding one to the '#{bank_name}' bank.")
+        end
+        
+        def flavor?
+          !!options[:type] or bank["type"]
+        end
+        
+        def image
+          options[:image] or bank["image"] or 
+            error("Specify an image with --image or by adding one to the '#{bank_name}' bank.")
+        end
+        
+        def image?
+          !!options[:image] or bank["image"]
+        end
+        
+        def security_group
+          options[:group] or bank["group"] or 
+            error("Specify a security group with --group or by adding one to the '#{bank_name}' bank.")
+        end
+        
+        def security_group?
+          options[:group] or bank["group"]
+        end
+        
+        def keypair
+          options[:keypair] or bank["keypair"] or 
+            error("Specify a keypair with --keypair or by adding one to the '#{bank_name}' bank.")
+        end
+        
+        def keypair?
+          !!options[:keypair] or bank["keypair"]
+        end
+        
+        def banks
+          configuration["banks"] ||= {}
+        end
+        
+        def _bank
+          banks[bank_name] ||= {}
+        end
+        
+        def bank
+          _bank["configuration"] ||= {}
+        end
+        
+        def bank?
+          !!options[:bank]
+        end
+        
+        def bank_name
+          options[:bank] or error("Did you mean to include a bank name?")
+        end
+        
+        def servers
+          _bank["servers"] ||= []
+        end
+        
+        def servers=(array)
+          _bank["servers"] = array
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+module Befog
+  module Commands
+    module Mixins
+      module Selectable
+        def self.included(target)
+          target.module_eval do
+            
+            option :provider,
+              :short => :q,
+              :description => "Select servers from this provider"
+
+            option :region,
+              :short => :r,
+              :description => "Select servers from this region"
+
+            option :image, 
+              :short => :i,
+              :description => "Select servers using this image"
+
+            option :keypair, 
+              :short => :x,
+              :description => "Select servers using this keypair"
+
+            option :group, 
+              :short => :g,
+              :description => "Select servers using this group"
+
+            option :type, 
+              :short => :t,
+              :description => "Select servers of this type (flavor)"
+
+            option :id,
+              :short => :z,
+              :description => "Select server with the given ID"
+
+          end
+        end
+        
+        def run_for_selected(&block)
+          if bank? 
+            servers.each(&block)
+          else
+            banks.keys.each do |name|
+              options[:bank] = name
+              if options[:id]
+                block.call(options[:id]) if servers.include?(options[:id])
+              else
+                servers.each(&block) if ((not provider? or (bank["provider"] == provider_name)) and
+                  (not region? or (bank["region"] == region)) and
+                  (not image? or (bank["image"] == image)) and
+                  (not security_group? or (bank["group"] == security_group)) and
+                  (not flavor? or (bank["type"] == flavor)))
+              end
+            end
+          end
+          
+        end
+      end
+    end
+  end
+end
+            

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

@@ -0,0 +1,29 @@
+module Befog
+  module Commands
+    module Mixins
+      module Traceable
+        def self.included(target)
+          target.module_eval do
+            option :rehearse,
+              :short => :u,
+              :description => "Dry-run, verbose logging, but don't actually run anything"
+          end
+        end
+        
+        def rehearse?
+          !!options[:rehearse]
+        end
+        
+        def verbose?
+          !!options[:verbose] or rehearse?
+        end
+        
+        def verbose(message)
+          log(message) if verbose?
+        end
+        
+      end
+    end
+  end
+end
+            

data/lib/befog/commands/remove.rb

@@ -1,8 +1,8 @@
 require "befog/commands/mixins/command"
 require "befog/commands/mixins/configurable"
-require "befog/commands/mixins/bank"
-require "befog/commands/mixins/provider"
-require "befog/commands/mixins/server"
+require "befog/commands/mixins/scope"
+require "befog/commands/mixins/safely"
+require "befog/commands/mixins/selectable"
 require "befog/commands/mixins/help"
 
 module Befog
@@ -12,46 +12,51 @@ module Befog
   
       include Mixins::Command
       include Mixins::Configurable
-      include Mixins::Bank
-      include Mixins::Provider
-      include Mixins::Server
+      include Mixins::Scope
+      include Mixins::Safely
+      include Mixins::Selectable
       include Mixins::Help
 
-      command "befog remove <bank>",
+      command :name => :remove,
+        :usage => "befog remove [<bank>] <options>",
         :default_to_help => true
 
       option :count, 
-        :short => "-c COUNT",
-        :long  => "--count COUNT",
-        :required => true,
+        :short => :c,
         :description => "The number of machines to de-provision"
+        
+      option :all,
+        :short => :a,
+        :description => "Deprovision all selected servers"
+        
 
       def run
-        if servers.empty?
-          $stderr.puts "No servers are in bank '#{name}'."
-          return
-        end
-        count = options[:count].to_i
-        if count <= 0
-          $stderr.puts "Number must be an integer greater than 0."
-          return
-        end
-        if count > servers.size
-          $stderr.puts "Number must be less than or equal to the bank size of #{bank.size}."
-          return
+        count = 0 ; threads = [] ; deleted = []
+        unless options[:all]
+          count = options[:count].to_i
+          if count <= 0
+            error "Count must be an integer greater than 0."
+          end
         end
-        count.times do |i|
-          id = servers.pop
-          $stdout.puts "Deprovisioning server #{id} ..."
-          begin
-            get_server(id).destroy
-          rescue => e
-            $stderr.puts "Error deprovisioning server #{id}"
-            servers.push id
+        run_for_selected do |id|
+          if options[:all] or count > 0
+            threads << Thread.new do
+              safely do
+                log "Deprovisioning server #{id} ..."
+                compute.servers.get(id).destroy
+                deleted << id
+                count -= 1
+              end
+            end
           end
-          save
         end
+        $stdout.print "This may take a few minutes .."
+        sleep 1 while threads.any? { |t| $stdout.print "."; $stdout.flush ; t.alive? } 
+        $stdout.print "\n"
+        self.servers -= deleted
+        save
       end
+      
     end
   end
 end

data/lib/befog/commands/run.rb

@@ -1,9 +1,9 @@
 require "fog"
 require "befog/commands/mixins/command"
 require "befog/commands/mixins/configurable"
-require "befog/commands/mixins/bank"
-require "befog/commands/mixins/provider"
-require "befog/commands/mixins/server"
+require "befog/commands/mixins/scope"
+require "befog/commands/mixins/safely"
+require "befog/commands/mixins/selectable"
 require "befog/commands/mixins/help"
 
 
@@ -14,34 +14,42 @@ module Befog
   
       include Mixins::Command
       include Mixins::Configurable
-      include Mixins::Bank
-      include Mixins::Provider
-      include Mixins::Server
+      include Mixins::Scope
+      include Mixins::Safely
+      include Mixins::Selectable
       include Mixins::Help
 
-      command "befog run <bank>",
+      command :name => :run,
+        :usage => "befog run [<bank>] <options>",
         :default_to_help => true
 
       option :command, 
-        :short => "-c COMMAND",
-        :long  => "--command COMMAND",
+        :short => :c,
         :required => true,
         :description => "Command to run (required)"
-        
-      def run
-        run_for_each_server
-      end
+    
+      option :all,
+        :short => :a,
+        :description => "Deprovision all selected servers"
 
-      def run_for_server(id)
-        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"
+    
+      def run
+        run_for_selected do |id|
+          threads = []; threads << Thread.new do
+            safely do
+              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}" unless result.stderr.empty?
+              else
+                $stdout.puts "Server #{id} isn't running - skipping"
+              end
+            end
+          end
+          sleep 1 while threads.any? { |t| t.alive? }
         end
       end
 

data/lib/befog/commands/start.rb

@@ -1,9 +1,9 @@
 require "fog"
 require "befog/commands/mixins/command"
 require "befog/commands/mixins/configurable"
-require "befog/commands/mixins/bank"
-require "befog/commands/mixins/provider"
-require "befog/commands/mixins/server"
+require "befog/commands/mixins/scope"
+require "befog/commands/mixins/safely"
+require "befog/commands/mixins/selectable"
 require "befog/commands/mixins/help"
 
 module Befog
@@ -13,25 +13,28 @@ module Befog
   
       include Mixins::Command
       include Mixins::Configurable
-      include Mixins::Bank
-      include Mixins::Provider
-      include Mixins::Server
+      include Mixins::Scope
+      include Mixins::Safely
+      include Mixins::Selectable
       include Mixins::Help
 
-      command "befog start <bank>",
-        :default_to_help => false
+      command :name => :start,
+        :usage => "befog start [<bank>] [<options>]",
+        :default_to_help => true
 
-      def run
-        run_for_each_server
-      end
+      option :all,
+        :short => :a,
+        :description => "Deprovision all selected servers"
 
-      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"
+      def run
+        run_for_selected do |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

@@ -1,9 +1,9 @@
 require "fog"
 require "befog/commands/mixins/command"
 require "befog/commands/mixins/configurable"
-require "befog/commands/mixins/bank"
-require "befog/commands/mixins/provider"
-require "befog/commands/mixins/server"
+require "befog/commands/mixins/scope"
+require "befog/commands/mixins/safely"
+require "befog/commands/mixins/selectable"
 require "befog/commands/mixins/help"
 
 module Befog
@@ -14,28 +14,26 @@ module Befog
   
       include Mixins::Command
       include Mixins::Configurable
-      include Mixins::Bank
-      include Mixins::Provider
-      include Mixins::Server
+      include Mixins::Scope
+      include Mixins::Selectable
+      include Mixins::Safely
       include Mixins::Help
 
-      command "befog stop <bank>",
-        :default_to_help => false
+      command :name => :stop,
+        :usage => "befog stop [<bank>] <options>",
+        :default_to_help => true
 
       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"
+        run_for_selected do |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
-
     end
   end
 end

data/lib/befog.rb

@@ -1 +1,2 @@
+require "bundler/setup"
 require "befog/cli"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: befog
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Carlo Flores  carlo@spire.io
@@ -16,54 +11,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 Z
+date: 2012-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fog
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
+        version: "1.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: fog
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 7
+        version: "1.3"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: "2.7"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
         version: "0.7"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: "\t\tThe befog gem allows you to manage your cloud servers\n\
   \t\tdirectly from the command-line. \n"
 email: 
@@ -80,18 +73,18 @@ files:
 - lib/befog/commands/add.rb
 - lib/befog/commands/configure.rb
 - lib/befog/commands/list.rb
-- lib/befog/commands/mixins/bank.rb
 - lib/befog/commands/mixins/command.rb
 - lib/befog/commands/mixins/configurable.rb
 - lib/befog/commands/mixins/help.rb
-- lib/befog/commands/mixins/provider.rb
-- lib/befog/commands/mixins/server.rb
+- lib/befog/commands/mixins/safely.rb
+- lib/befog/commands/mixins/scope.rb
+- lib/befog/commands/mixins/selectable.rb
+- lib/befog/commands/mixins/traceable.rb
 - lib/befog/commands/remove.rb
 - lib/befog/commands/run.rb
 - lib/befog/commands/start.rb
 - lib/befog/commands/stop.rb
 - lib/befog/commands.rb
-- lib/befog/providers/aws.rb
 - lib/befog.rb
 - bin/befog
 homepage: https://github.com/spire-io/befog
@@ -107,23 +100,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cloud provisioning CLI