orca 0.3.5 → 0.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orca (0.3.5)
+    orca (0.3.6)
       colored
       net-sftp
       net-ssh

data/README.md

@@ -87,6 +87,7 @@ If you have a package with the same name as a group or node you can abreviate th
 You can also directly trigger actions from the CLI like so...
 
     orca trigger nginx:reload web-1
+    orca trigger firewall:add[allow,80] web-1
 
 Options, all commands support the following optional parameters...
 

data/lib/orca.rb

@@ -22,7 +22,7 @@ module Orca
   end
   module_function :add_package
 
-  def extension(name, &blk)
+  def extension(&blk)
     Orca::DSL.class_eval(&blk)
   end
   module_function :extension

data/lib/orca/extensions/apt.rb

@@ -1,4 +1,4 @@
-Orca.extension :apt do
+Orca.extension do
 
   # supports three formats
   # apt_package 'git-core' - create a package 'git-core' that installs 'git-core'

data/lib/orca/extensions/file_sync.rb

@@ -1,4 +1,4 @@
-Orca.extension :file_sync do
+Orca.extension do
   class Orca::Package
     def file(config, &blk)
       Orca::FileSync.new(self, config, &blk).configure

data/lib/orca/group.rb

@@ -14,6 +14,10 @@ class Orca::Group
       return nil unless @groups
       @groups[name]
     end
+
+    def names
+      @groups.keys.sort
+    end
   end
 
   attr_reader :name, :nodes, :config

data/lib/orca/logger.rb

@@ -1,11 +1,11 @@
 class Orca::Logger
   def initialize(node, package)
     @node = node
-    @package = package
+    set_package(package)
   end
 
   def set_package(package)
-    @package = package
+    @package = package.to_s
   end
 
   def command(msg)
@@ -47,7 +47,7 @@ class Orca::Logger
   def say(msg, color=nil)
     msg.to_s.split("\n").each do |line|
       out = color ? line.send(color) : line
-      Thread.exclusive { puts "#{@node.to_s} [#{@package.name.bold}] #{out}" }
+      Thread.exclusive { puts "#{@node.to_s} [#{@package.bold}] #{out}" }
     end
   end
 end

data/lib/orca/package.rb

@@ -49,4 +49,8 @@ class Orca::Package
   def provides_command?(name)
     @commands.has_key?(name.to_sym)
   end
+
+  def to_s
+    self.name
+  end
 end

data/lib/orca/suite.rb

@@ -13,6 +13,7 @@ class Orca::Suite
 
   def run(group_name, pkg_name, command, sequential=false)
     group = Orca::Group.find(group_name)
+    raise Orca::MissingGroupError.new(group_name) if group.nil?
     runners = group.nodes.map do |node|
       @nodes << node
       if command == :trigger
@@ -43,4 +44,14 @@ class Orca::Suite
       runner.execute(command)
     end
   end
+end
+
+class Orca::MissingGroupError < StandardError
+  def initialize(group_name)
+    @group_name = group_name
+  end
+
+  def message
+    "No Group or Node exists with the name '#{@group_name}'. Try one of: #{Orca::Group.names.join(', ')}"
+  end
 end

data/lib/orca/trigger_runner.rb

@@ -1,14 +1,25 @@
 class Orca::TriggerRunner
-  def initialize(node, action_ref)
+  def initialize(node, action_ref_with_args)
     @node = node
-    @action_ref = action_ref
+    @action_ref, @args = *parse_action_ref(action_ref_with_args)
+    @log = Orca::Logger.new(@node, @action_ref)
   end
 
   def execute(_)
-    Orca::ExecutionContext.new(@node).trigger(@action_ref)
+    Orca::ExecutionContext.new(@node, @log).trigger(@action_ref, *@args)
   end
 
   def demonstrate(_)
-    Orca::MockExecutionContext.new(@node).trigger(@action_ref)
+    Orca::MockExecutionContext.new(@node, @log).trigger(@action_ref, *@args)
+  end
+
+  private
+
+  def parse_action_ref(action_ref_with_args)
+    matches = action_ref_with_args.match(/([\w\:]+?)(\[([\w\,]+?)\])/)
+    return [action_ref_with_args,[]] unless matches
+    action_ref = matches[1]
+    args = matches[3].split(',').map(&:strip)
+    [action_ref, args]
   end
 end

data/orca.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "orca"
   gem.require_paths = ["lib"]
-  gem.version       = '0.3.5'
+  gem.version       = '0.3.6'
   gem.add_dependency('colored')
   gem.add_dependency('net-ssh')
   gem.add_dependency('net-sftp')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orca
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2049972371270429172
+      hash: -796320942601903817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2049972371270429172
+      hash: -796320942601903817
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23