orca 0.3.4 → 0.3.5

data/Gemfile.lock

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

data/README.md

@@ -27,17 +27,17 @@ Orca fills the rather large gap between (2) and (3). It's a bigger gap then you
 
 Orca fixes these problems by...
 
-- working directly over SSH, all you need is a box tht you can connect to
+- working directly over SSH, all you need is a box that you can connect to
 - package definitions can all go in a single file and most servers can be configured in ~50 lines
 - packages are defined in a ruby based DSL that consists of only 5 very basic commands to learn
-- Orca makes no assumptions about the underlying OS accept to assume it supports SSH
+- Orca makes no assumptions about the underlying OS except to assume it supports SSH
 - Orca is extensible and adding platform specific features like package manger support can be achieved in a dozen or so lines.
 
 
 What problems is Orca avoiding?
 -------------------------------
 
-Orca intentionally skirts around some important thengs that may or may not matter to you. If they do then you are probably better using more robust tools such as Puppet or Chef.
+Orca intentionally skirts around some important things that may or may not matter to you. If they do then you are probably better using more robust tools such as Puppet or Chef.
 
 Orca doesn't...
 

data/lib/orca/cli.rb

@@ -39,22 +39,24 @@ class Orca::Cli < Thor
 
   def run_command(package, group, cmd)
     Orca.verbose(options[:verbose] || false)
+    err = nil
     begin
       suite = Orca::Suite.new(options)
       suite.load_file(orca_file)
       suite.run(group, package, cmd)
     rescue => e
+      err = e
+    ensure
+      $stdout.print "Disconnecting...".green
+      suite.cleanup
+      $stdout.puts "Done!".green
+      exit(0) if err.nil?
       if options[:throw]
-        raise e
+        raise err
       else
         $stderr.puts "!!! ERROR !!! [#{e.class.name}] #{e.message}".red.bold
         exit(1)
       end
-    ensure
-      $stdout.print "Disconnecting...".green
-      suite.cleanup
-      $stdout.puts "Done!".green
-      exit(0)
     end
   end
 

data/lib/orca/dsl.rb

@@ -15,8 +15,8 @@ module Orca
       Orca::Node.new(name, host, options)
     end
 
-    def group(name, nodes=[], &blk)
-      g = Orca::Group.new(name, nodes)
+    def group(name, config={}, nodes=[], &blk)
+      g = Orca::Group.new(name, config, nodes)
       g.instance_eval(&blk) if block_given?
     end
   end

data/lib/orca/group.rb

@@ -6,7 +6,7 @@ class Orca::Group
     end
 
     def from_node(node)
-      new(node.name, [node])
+      new(node.name, {}, [node])
     end
 
     def find(name)
@@ -16,16 +16,17 @@ class Orca::Group
     end
   end
 
-  attr_reader :name, :nodes
+  attr_reader :name, :nodes, :config
 
-  def initialize(name, nodes=[])
+  def initialize(name, config={}, nodes=[])
     @name = name
+    @config = config
     @nodes = nodes
     Orca::Group.register(self)
   end
 
   def node(name, host, options={})
-    add_node( Orca::Node.new(name, host, options) )
+    add_node( Orca::Node.new(name, host, @config.merge(options)) )
   end
 
   def add_node(node)
@@ -35,4 +36,8 @@ class Orca::Group
   def includes(group)
     Orca::Group.find(group).nodes.each {|n| add_node(n) }
   end
+
+  def set(property, value)
+    @config[property.to_sym] = value
+  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.4'
+  gem.version       = '0.3.5'
   gem.add_dependency('colored')
   gem.add_dependency('net-ssh')
   gem.add_dependency('net-sftp')

data/test/group_test.rb

@@ -20,6 +20,15 @@ describe Orca::Group do
       group.nodes.first.name.must_equal 'mynode'
       group.nodes.first.host.must_equal 'myhost'
     end
+
+    it "inherits config from the group" do
+      group = Orca::Group.new('test', :user => 'testuser')
+      group.node('mynode', 'myhost')
+      group.nodes.size.must_equal 1
+      group.nodes.first.name.must_equal 'mynode'
+      group.nodes.first.host.must_equal 'myhost'
+      group.nodes.first.user.must_equal 'testuser'
+    end
   end
 
   describe ".add_node(node)" do
@@ -34,7 +43,7 @@ describe Orca::Group do
   describe ".includes(other_group)" do
     it "copied the nodes from another group" do
       node = mock
-      group = Orca::Group.new('test-a', [node])
+      group = Orca::Group.new('test-a', {}, [node])
       group2 = Orca::Group.new('test-b')
       group2.nodes.must_equal []
       group2.includes(group)
@@ -43,11 +52,19 @@ describe Orca::Group do
 
     it "copied the nodes from another group by name" do
       node = mock
-      group = Orca::Group.new('test-a', [node])
+      group = Orca::Group.new('test-a', {}, [node])
       group2 = Orca::Group.new('test-b')
       group2.nodes.must_equal []
       group2.includes('test-a')
       group2.nodes.must_equal [node]
     end
   end
+
+  describe ".set(property, value)" do
+    it "sets a config option for the group" do
+      group = Orca::Group.new('test')
+      group.set :user, 'testuser'
+      group.config[:user].must_equal 'testuser'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orca
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-01 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: 565408569363101895
+      hash: -2049972371270429172
 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: 565408569363101895
+      hash: -2049972371270429172
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23