orca 0.1.0 → 0.2.0

data/Gemfile.lock

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

data/README.md

@@ -5,7 +5,7 @@ Orca
 
 Orca is a super simple way to build and configure servers.
 
-If you've found yourself stuck in the gap between deployment tools like Capistrano and full blown infrastructure tools like Puppet and Chef then Orca is probably for you.
+If you've found yourself stuck in the gap between deployment tools like Capistrano and full blown infrastructure tools like Puppet and Chef then Orca is probably for you. This is especially the case if you choose to cycle machines and prefer baking from scratch when changes are required rather than attempting to converge system state (although you can build convergent systems using Orca if you wish).
 
 
 What problem does Orca try to solve?
@@ -42,7 +42,7 @@ Orca intentionally skirts around some important thengs that may or may not matte
 Orca doesn't...
 
 - try to scale beyond a smallish number of nodes
-- have any algorithyms that attempt to run periodically and converge divergent configurations
+- have any algorithms that attempt to run periodically and converge divergent configurations
 - abstract the differences of different host OSes
 - provide a server to supervise infrastructure configuration
 
@@ -50,9 +50,13 @@ Orca doesn't...
 Installation
 ------------
 
-To install orca you will need to be running Ruby 1.9 or 2.0 and then install the orca gem from this repository...
+To install orca you will need to be running Ruby 1.9 or 2.0 and then install the orca gem...
 
-    gem 'orca', :git => 'git@github.com:andykent/orca.git'
+    gem install orca
+
+or ideally add it to your gemfile...
+
+    gem 'orca'
 
 
 Command Line Usage
@@ -60,7 +64,7 @@ Command Line Usage
 
 To get started from within your projct you can run...
 
-    bundle exec orca init .
+    orca init .
 
 This will create a config/orca.rb file for you to get started with.
 
@@ -107,3 +111,24 @@ Orca packages are written in a Ruby based DSL. It's really simple to learn in le
         trigger('gem:exists', 'bundler')
       end
     end
+
+
+
+Extensions
+----------
+
+The core of Orca doesn't have any platform specific logic but is designed to be a foundation to build apon. Extensions can be written in their own files, projects or gems, simply `require 'orca'` and then use the `Orca.extension` helper.
+
+Some example extensions are included in this repo and can be required into your orca.rb file if you need them...
+
+`require "orca/extensions/apt"` - Adds support for specifying aptitude dependancies with the `apt_package` helper.
+
+`relative "orca/extensions/file_sync"` - Adds support for syncing and converging local/remove files with the `file` action.
+
+
+Extras
+------
+
+*Vagrant Provisioner Plugin*
+https://github.com/andykent/vagrant-orca
+Allows you to completely provision a machine with `vagrant up`

data/lib/orca.rb

@@ -35,6 +35,7 @@ end
 require_relative "./orca/package"
 require_relative "./orca/package_index"
 require_relative "./orca/node"
+require_relative "./orca/group"
 require_relative "./orca/runner"
 require_relative "./orca/resolver"
 require_relative "./orca/execution_context"
@@ -42,7 +43,4 @@ require_relative "./orca/local_file"
 require_relative "./orca/remote_file"
 require_relative "./orca/dsl"
 require_relative "./orca/suite"
-require_relative "./orca/cli"
-
-require_relative "./orca/extensions/apt"
-require_relative "./orca/extensions/file_sync"
+require_relative "./orca/cli"

data/lib/orca/cli.rb

@@ -3,23 +3,24 @@ class Orca::Cli < Thor
 
   source_root File.join(File.dirname(__FILE__), *%w[.. .. config])
 
-  class_option :demonstrate, :type => :boolean, :desc => "Don't actually run any commands on the node, just pretend."
+  class_option :demonstrate, :type => :boolean, :desc => "Don't actually run any commands on the group, just pretend."
   class_option :file,        :banner => 'ORCA_FILE', :desc => "path to the orca.rb file to load, defaults to ./orca/orca.rb"
   class_option :throw,       :type => :boolean, :desc => "Don't pretty print errors, raise with a stack trace."
+  class_option :sequential,  :type => :boolean, :desc => "Don't run tasks in parrallel across nodes."
 
-  desc "apply PACKAGE_NAME NODE_NAME", "apply the given package onto the given named node"
-  def apply(package, node)
-    run_command(package, node, :apply)
+  desc "apply PACKAGE_NAME GROUP_OR_NODE_NAME", "apply the given package onto the given named group"
+  def apply(package, group)
+    run_command(package, group, :apply)
   end
 
-  desc "remove PACKAGE_NAME NODE_NAME", "remove the given package onto the given named node"
-  def remove(package, node)
-    run_command(package, node, :remove)
+  desc "remove PACKAGE_NAME GROUP_OR_NODE_NAME", "remove the given package onto the given named group"
+  def remove(package, group)
+    run_command(package, group, :remove)
   end
 
-  desc "validate PACKAGE_NAME NODE_NAME", "run validation steps on the given named node"
-  def validate(package, node)
-    run_command(package, node, :validate)
+  desc "validate PACKAGE_NAME GROUP_OR_NODE_NAME", "run validation steps on the given named group"
+  def validate(package, group)
+    run_command(package, group, :validate)
   end
 
   desc "init", "initialize the current directory with a orca/orca.rb"
@@ -29,15 +30,11 @@ class Orca::Cli < Thor
 
   private
 
-  def run_command(package, node, cmd)
+  def run_command(package, group, cmd)
     begin
-      suite = Orca::Suite.new
+      suite = Orca::Suite.new(options)
       suite.load_file(orca_file)
-      if options[:demonstrate]
-        suite.demonstrate(node, package, cmd)
-      else
-        suite.execute(node, package, cmd)
-      end
+      suite.run(group, package, cmd)
     rescue => e
       if options[:throw]
         raise e

data/lib/orca/dsl.rb

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

data/lib/orca/group.rb

@@ -0,0 +1,38 @@
+class Orca::Group
+  class << self
+    def register(group)
+      @groups ||= {}
+      @groups[group.name] = group
+    end
+
+    def from_node(node)
+      new(node.name, [node])
+    end
+
+    def find(name)
+      return name if name.is_a?(Orca::Group)
+      return nil unless @groups
+      @groups[name]
+    end
+  end
+
+  attr_reader :name, :nodes
+
+  def initialize(name, nodes=[])
+    @name = name
+    @nodes = nodes
+    Orca::Group.register(self)
+  end
+
+  def node(name, host, options={})
+    add_node( Orca::Node.new(name, host, options) )
+  end
+
+  def add_node(node)
+    @nodes << node
+  end
+
+  def includes(group)
+    Orca::Group.find(group).nodes.each {|n| add_node(n) }
+  end
+end

data/lib/orca/node.rb

@@ -11,6 +11,7 @@ class Orca::Node
 
   def self.register(node)
     @nodes ||= {}
+    Orca::Group.from_node(node)
     @nodes[node.name] = node
   end
 
@@ -69,7 +70,7 @@ class Orca::Node
   end
 
   def log(context, msg)
-    puts "#{self.to_s} [#{context.to_s.bold}] #{msg}"
+    Thread.exclusive { puts "#{self.to_s} [#{context.to_s.bold}] #{msg}" }
   end
 
   def connection

data/lib/orca/suite.rb

@@ -1,18 +1,31 @@
 class Orca::Suite
 
+  def initialize(options={})
+    @sequential = options[:sequential]
+    @demonstrate = options[:demonstrate]
+  end
+
   def load_file(file)
     Orca::DSL.module_eval(File.read(file))
   end
 
-  def execute(node_name, pkg_name, command)
-    node = Orca::Node.find(node_name)
+  def run(group_name, pkg_name, command, sequential=false)
+    group = Orca::Group.find(group_name)
     pkg = Orca::PackageIndex.default.get(pkg_name)
-    Orca::Runner.new(node, pkg).execute(command)
+    runners = group.nodes.map { |node| Orca::Runner.new(node, pkg) }
+    if @sequential
+      runners.each {|runner| exec(runner, command) }
+    else
+      threads = runners.map {|runner| Thread.new { exec(runner, command) } }
+      threads.each {|t| t.join }
+    end
   end
 
-  def demonstrate(node_name, pkg_name, command)
-    node = Orca::Node.find(node_name)
-    pkg = Orca::PackageIndex.default.get(pkg_name)
-    Orca::Runner.new(node, pkg).demonstrate(command)
+  def exec(runner, command)
+    if @demonstrate
+      runner.demonstrate(command)
+    else
+      runner.execute(command)
+    end
   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.1.0'
+  gem.version       = '0.2.0'
   gem.add_dependency('colored')
   gem.add_dependency('net-ssh')
   gem.add_dependency('net-sftp')

data/test/dsl_test.rb

@@ -32,4 +32,20 @@ describe Orca::DSL do
       node.host.must_equal 'node-host'
     end
   end
+
+  describe "'group' command" do
+    it "creates a group" do
+      Orca::DSL.group('group-name')
+      group = Orca::Group.find('group-name')
+      group.must_be_instance_of Orca::Group
+      group.name.must_equal 'group-name'
+    end
+
+    it "evals in the group context" do
+      node = mock
+      Orca::DSL.group('group-name') { add_node(node) }
+      group = Orca::Group.find('group-name')
+      group.nodes.must_equal [node]
+    end
+  end
 end

data/test/group_test.rb

@@ -0,0 +1,53 @@
+require_relative 'test_helper'
+
+describe Orca::Group do
+  describe "#from_node" do
+    it "creates a new group based on a node name" do
+      node = mock(:name => 'test-node')
+      Orca::Group.from_node(node)
+      group = Orca::Group.find('test-node')
+      group.must_be_instance_of(Orca::Group)
+      group.name.must_equal('test-node')
+      group.nodes.must_equal [node]
+    end
+  end
+
+  describe ".node(name, host, options)" do
+    it "adds a new node from parameters" do
+      group = Orca::Group.new('test')
+      group.node('mynode', 'myhost')
+      group.nodes.size.must_equal 1
+      group.nodes.first.name.must_equal 'mynode'
+      group.nodes.first.host.must_equal 'myhost'
+    end
+  end
+
+  describe ".add_node(node)" do
+    it "adds a new node by object" do
+      group = Orca::Group.new('test')
+      node = mock
+      group.add_node(node)
+      group.nodes.must_equal [node]
+    end
+  end
+
+  describe ".includes(other_group)" do
+    it "copied the nodes from another group" do
+      node = mock
+      group = Orca::Group.new('test-a', [node])
+      group2 = Orca::Group.new('test-b')
+      group2.nodes.must_equal []
+      group2.includes(group)
+      group2.nodes.must_equal [node]
+    end
+
+    it "copied the nodes from another group by name" do
+      node = mock
+      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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orca
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -98,6 +98,7 @@ files:
 - lib/orca/execution_context.rb
 - lib/orca/extensions/apt.rb
 - lib/orca/extensions/file_sync.rb
+- lib/orca/group.rb
 - lib/orca/local_file.rb
 - lib/orca/node.rb
 - lib/orca/package.rb
@@ -109,6 +110,7 @@ files:
 - orca.gemspec
 - test/dsl_test.rb
 - test/fixtures/example.txt
+- test/group_test.rb
 - test/local_file_test.rb
 - test/package_index_test.rb
 - test/package_test.rb
@@ -127,12 +129,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1672503668912245797
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1672503668912245797
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -142,6 +150,7 @@ summary: Simplified Machine Building
 test_files:
 - test/dsl_test.rb
 - test/fixtures/example.txt
+- test/group_test.rb
 - test/local_file_test.rb
 - test/package_index_test.rb
 - test/package_test.rb