befog 0.4.2 → 0.5.0

data/lib/befog.rb

@@ -1 +1,12 @@
+module Befog
+  VERSION = begin
+    path = File.expand_path("../../VERSION", Pathname.new(__FILE__).realpath)
+    File.read(path).chomp
+  end
+  
+  def self.show_version
+    $stdout.puts "Befog Version #{VERSION}"
+  end
+end
+
 require "befog/cli"

data/lib/befog/cli.rb

@@ -50,6 +50,13 @@ module Befog
     
     def self.run(arguments)
       subcommand = arguments.shift
+      # TODO: Rejigger this so we can have top-level options
+      # instead of special-casing --version
+      if subcommand == "--version" or subcommand == "-v"
+        Befog.show_version
+        exit if arguments.empty?
+        subcommand = arguments.shift
+      end
       if subcommand && (command = COMMANDS[subcommand])
         command.run(CLI.parse(arguments))
       elsif subcommand

data/lib/befog/commands/configure.rb

@@ -42,7 +42,7 @@ module Befog
     
       option :keypair, 
         :short => :x,
-        :description => "The keypair name to use with SSH"
+        :description => "The cloud provider SSH key pair name to use with the instances in this bank"
 
       option :group, 
         :short => :g,
@@ -70,4 +70,4 @@ module Befog
       end
     end
   end
-end
+end

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

@@ -21,9 +21,10 @@ module Befog
               def options ; @options||=[] ; end
 
               def run(options)
+                Befog.show_version if options[:version] or options[:v]
                 new(options).run
               end
-
+              
             end
             
           end

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

@@ -35,7 +35,9 @@ module Befog
         end
 
         def save
-          File.open(File.expand_path(configuration_path),"w") { |f| YAML.dump(_configuration,f) }
+          # Make sure we load the configuration before opening the file for writing
+          configuration_for_writing = _configuration
+          File.open(configuration_path,"w") { |f| YAML.dump(configuration_for_writing,f) }
           $stdout.puts "Configuration written to: #{configuration_path}"
         end
               

data/lib/befog/commands/remove.rb

@@ -40,18 +40,18 @@ module Befog
         end
         run_for_selected do |id|
           if options[:all] or count > 0
-            threads << Thread.new do
+            # threads << Thread.new do
               safely do
                 log "Deprovisioning server #{id} ..."
                 compute.servers.get(id).destroy
                 deleted << id
                 count -= 1
               end
-            end
+            # end
           end
         end
         $stdout.print "This may take a few minutes .."
-        sleep 1 while threads.any? { |t| $stdout.print "."; $stdout.flush ; t.alive? } 
+        # sleep 1 while threads.any? { |t| $stdout.print "."; $stdout.flush ; t.alive? } 
         $stdout.print "\n"
         self.servers -= deleted
         save

data/lib/befog/commands/start.rb

@@ -24,7 +24,7 @@ module Befog
 
       option :all,
         :short => :a,
-        :description => "Deprovision all selected servers"
+        :description => "Start all selected servers"
 
       def run
         run_for_selected do |id|

metadata

@@ -2,7 +2,7 @@
 name: befog
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Carlo Flores  carlo@spire.io