fate 0.2.13 → 0.2.14

data/bin/fate

@@ -34,7 +34,7 @@ fate = Fate.new(configuration, options)
 
 
 require "fate/repl"
-fate.start
+fate.start(ARGV)
 fate.repl
 
 

data/lib/fate.rb

@@ -1,13 +1,10 @@
-require "set"
 
 gem "term-ansicolor"
-gem "squeeze"
+gem "json-schema"
 require "term/ansicolor"
-require "squeeze/hash_tree"
+require "json-schema"
 
-require "fate/logger"
 require "fate/service"
-require "fate/output"
 require "fate/process_manager"
 
 Thread.abort_on_exception = true
@@ -45,12 +42,18 @@ class Fate
     end
   end
 
-  def start
-    if manager.start_group(@service.commands)
-      logger.green "All commands are running."
-      true
+  def start(command_specs=[])
+    if command_specs.size > 0
+      command_specs.each do |command_spec|
+        self.start_command(command_spec)
+      end
     else
-      false
+      if manager.start_group(@service.commands)
+        logger.green "All commands are running."
+        true
+      else
+        false
+      end
     end
   end
 
@@ -68,22 +71,28 @@ class Fate
     start
   end
 
-  def start_command(spec)
-    names = @service.resolve_commands(spec)
+  def start_command(command_spec)
+    names = @service.resolve_commands(command_spec)
     if names.empty?
-      puts "No commands found for: #{spec}"
+      puts "No commands found for: #{command_spec}"
     else
+      commands = {}
       names.each do |name|
         command = @service.commands[name]
-        manager.start_command(name, command)
+        commands[name] = command
+      end
+      if manager.start_group(commands)
+        logger.green "All commands in '#{command_spec}' running."
+      else
+        logger.red "Failed to start '#{command_spec}'."
       end
     end
   end
 
-  def stop_command(spec)
-    names = @service.resolve_commands(spec)
+  def stop_command(command_spec)
+    names = @service.resolve_commands(command_spec)
     if names.empty?
-      puts "No commands found for: #{spec}"
+      puts "No commands found for: #{command_spec}"
     else
       names.each do |name|
         manager.stop_command(name)

data/lib/fate/process_manager.rb

@@ -18,16 +18,17 @@ class Fate
       @names_by_pid = {}
       @pids_by_name = {}
       at_exit do
-        stop
+        shutdown
       end
     end
 
-    def stop
+    def shutdown
       @mutex.synchronize do
         @names_by_pid.each do |pid, name|
           kill(name)
         end
       end
+      exit(1)
     end
 
     def start_group(hash)
@@ -36,7 +37,7 @@ class Fate
         start_command(name, command) unless @down_in_flames
       end
 
-      until @threads.size == hash.size
+      until hash.keys.all? { |key| @threads[key] }
         return false if @down_in_flames
         sleep 0.1
       end
@@ -139,7 +140,7 @@ class Fate
       end
       logger.info "Shutting down all processes."
 
-      stop
+      shutdown
     end
 
 

data/lib/fate/repl.rb

@@ -12,9 +12,8 @@ class Fate
       puts "* Available commands: " << commands.sort.join(" ")
     end
 
-    command("quit", :alias => "q") do
-      exit
-    end
+    command("quit", :alias => "q") { exit }
+    command("exit") { exit }
 
     command("stop") do
       self.stop

data/lib/fate/service.rb

@@ -1,20 +1,76 @@
+require "set"
+
+gem "squeeze"
+require "squeeze/hash_tree"
+
+require "fate/logger"
+require "fate/output"
+
 class Fate
 
   class Service
 
-    attr_reader :longest_name, :names, :commands, :completions, :specification
+    SpecificationSchema = {
+      "type" => "object",
+      "properties" => {
+        "commands" => {
+          "type" => "object",
+          "additionalProperties" => {
+            "type" => ["object", "string"]
+          }
+        },
+        "groups" => {
+          "type" => "object",
+          "additionalProperties" => {
+            "type" => ["array"]
+          }
+        }
+      },
+      "additionalProperties" => false
+    }
+
+    def self.validate(spec)
+      JSON::Validator.fully_validate(SpecificationSchema, spec)
+    end
+
+    attr_reader :names, :commands, :completions, :specification
     attr_reader :output_handlers, :logger
     def initialize(specification, options)
+      stringify(specification)
+
+      validation = self.class.validate(specification)
+      if validation.size > 0
+        puts "Invalid specification:"
+        puts validation
+        exit
+      end
+
       @specification = specification
       @options = options
 
-      @commands = process_commands(@specification[:commands])
+      @commands = process_commands(@specification["commands"])
       @names = @commands.keys
+      @groups = @specification["groups"] || {}
+      @completions.merge @groups.keys
+
       @longest_name = @commands.keys.sort_by {|k| k.size }.last.size
       @logger = Fate::MultiLogger.new(:io => STDOUT, :width => @longest_name)
       @output_handlers = Output::Handlers.new(self, options[:output] || {})
     end
 
+    def stringify(hash)
+      keys = hash.keys
+      keys.each do |key|
+        if key.is_a? Symbol
+          value = hash.delete(key)
+          if value.is_a? Hash
+            stringify(value)
+          end
+          hash[key.to_s] = value
+        end
+      end
+    end
+
     def process_commands(hash)
       hash = Squeeze::HashTree[hash]
 
@@ -35,6 +91,8 @@ class Fate
       targets = []
       if @commands.has_key?(name)
         targets << name
+      elsif @groups.has_key?(name)
+        targets += @groups[name]
       else
         @commands.each do |cname, _command|
           if cname.split(".").first == name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fate
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
 description: 
 email: 
 executables: