caterer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc681c51ec2487b11cdc0160e22b21679127bbc
-  data.tar.gz: 25f555f407bd57f2340543d6bd61d6e08af06622
+  metadata.gz: 0b3147ba0fe11638b59e9868a8d4acd806f26c77
+  data.tar.gz: 976a1d58307350bfb790500a54b118fbf88b4388
 SHA512:
-  metadata.gz: b531a7470042d3786d80b1e39f6bde48702b37dae7b0fa77f5441eb0182a197b6a6d5a0a7e352804e373a64475816ea76f5b84d33a9ff5d25d2c8b28d223487d
-  data.tar.gz: 7efefe14acc39795da9880f9eab145e12c3ce347e8ceb7841ac9243b710b7e3370f07bb5bb1cb6aa232c53800f16a761a90f528b631d2e4bdfc5830f680dbdde
+  metadata.gz: f5aa87a973e936714fe87065ee3ac861c3ceeb0f7de726b00bf2b9f5989c57ebef776fb31989352c99551710d536d3ee81aec5820410b4f3fb65f7203c5a3294
+  data.tar.gz: 04c695725ef3e98cb235f974a7c2be6e80107690e6ba65c9a6fcb4fce96b9a929254053543a311a71dc31deda9ad0c47bb81f6d7a3400040af57f942cba434f8

data/config/default.rb

@@ -1,5 +1,7 @@
 Caterer.configure do |config|
 
+  config.default_command = 'provision'
+  
   config.provisioner.default_engine = :chef_solo
 
 end

data/lib/caterer/cli.rb

@@ -29,11 +29,20 @@ module Caterer
         return 0
       end
 
-      command_class = Caterer.commands.get(@sub_command.to_sym) if @sub_command
-      if !command_class || !@sub_command
+      if !@sub_command
         help
         return 0
+      end      
+
+      begin
+        command_class = Caterer.commands.get(@sub_command.to_sym) || raise
+      rescue
+        # didn't understand the sub-command, let's run our default
+        @sub_args.unshift @sub_command
+        @sub_command = @env.config.default_command
+        retry
       end
+
       @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
 
       # Initialize and execute the command class, returning the exit status.

data/lib/caterer/command/server.rb

@@ -80,7 +80,7 @@ module Caterer
         opts[:pass]   = options[:pass] || member.password || group.password
         opts[:host]   = options[:host] || member.host
         opts[:port]   = options[:port] || member.port
-        opts[:images] = image_list(options) || member.images || group.images
+        opts[:images] = image_list(options) || member.images || group.images || [:default]
         opts[:key]    = options[:key] || member.key || group.key
 
         opts[:data] = begin

data/lib/caterer/config/base.rb

@@ -3,7 +3,7 @@ module Caterer
     class Base
 
       attr_reader :images, :groups
-      attr_accessor :dest_dir
+      attr_accessor :dest_dir, :default_command
 
       def initialize
         @images   = {}

data/lib/caterer/group.rb

@@ -6,12 +6,12 @@ module Caterer
 
     def initialize(name=nil)
       @name    = name
-      @images  = []
       @members = {}
       @data    = {}
     end
 
     def add_image(image)
+      @images ||= []
       @images << image
     end
 

data/lib/caterer/member.rb

@@ -9,5 +9,10 @@ module Caterer
       @data = {}
     end
 
+    def add_image(image)
+      @images ||= []
+      @images << image
+    end
+
   end
 end

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tyler Flint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r