orca 0.3.0 → 0.3.1

data/Gemfile.lock

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

data/README.md

@@ -87,6 +87,7 @@ Options, all commands support the following optional parameters...
     --sequential        | dont attempt to run commands accross multiple nodes in parrallel
     --throw             | throw a stack trace rather than pretty printing errors
     --file              | path to the orca.rb file to load, defaults to ./orca/orca.rb
+    --verbose           | print all SSH output, useful for debugging but can be rather long
     --skip-dependancies | Don't validate and run dependancies, only the pkg in question
 
 
@@ -123,6 +124,7 @@ Orca packages are written in a Ruby based DSL. It's really simple to learn in le
       end
     end
 
+A more complete WIP example can be found in this gist... https://gist.github.com/andykent/5814997
 
 
 Extensions

data/lib/orca.rb

@@ -3,6 +3,12 @@ require 'colored'
 require 'thor'
 
 module Orca
+  def verbose(val=nil)
+    @verbose = val unless val.nil?
+    @verbose || false
+  end
+  module_function :verbose
+
   def root
     File.dirname(ENV['ORCA_FILE'])
   end

data/lib/orca/cli.rb

@@ -7,6 +7,7 @@ class Orca::Cli < Thor
   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."
+  class_option :verbose,     :type => :boolean, :desc => "print all SSH output, useful for debugging"
   class_option :'skip-dependancies', :type => :boolean, :desc => "Don't validate and run dependancies."
 
   desc "apply PACKAGE_NAME GROUP_OR_NODE_NAME", "apply the given package onto the given named group"
@@ -37,6 +38,7 @@ class Orca::Cli < Thor
   private
 
   def run_command(package, group, cmd)
+    Orca.verbose(options[:verbose] || false)
     begin
       suite = Orca::Suite.new(options)
       suite.load_file(orca_file)
@@ -47,6 +49,8 @@ class Orca::Cli < Thor
       else
         puts "!!! ERROR !!! [#{e.class.name}] #{e.message}".red.bold
       end
+    ensure
+      suite.cleanup
     end
   end
 

data/lib/orca/execution_context.rb

@@ -9,16 +9,16 @@ class Orca::ExecutionContext
     instance_eval(&blk)
   end
 
-  def run(cmd)
-    @node.execute(cmd)
+  def run(cmd, opts={})
+    @node.execute(cmd, opts)
   end
 
   def log(msg)
     @node.log('log', msg)
   end
 
-  def sudo(cmd)
-    @node.sudo(cmd)
+  def sudo(cmd, opts={})
+    @node.sudo(cmd, opts)
   end
 
   def upload(from, to)

data/lib/orca/extensions/apt.rb

@@ -1,25 +1,38 @@
 Orca.extension :apt do
+
+  # supports three formats
+  # apt_package 'git-core' - create a package 'git-core' that installs 'git-core'
+  # apt_package 'git', 'git-core' - creates a package 'git' that installs 'git-core'
+  # apt_package 'git', package:'git-core', version:'1.7.2' - creates a package 'git' that installs 'git-core=1.7.2'
   module_function
-  def apt_package(pkg_name, apt_name=pkg_name, &blk)
+  def apt_package(pkg_name, opts=pkg_name, &blk)
+    apt_name = opts
+    version = nil
+    if opts.is_a? Hash
+      version = opts[:version]
+      apt_name = opts[:package] || pkg_name
+    end
     package pkg_name do
-      depends_on 'apt'
-      validate { trigger 'apt:exists', apt_name  }
-      apply    do
-        trigger 'apt:update'
-        trigger 'apt:install', apt_name
+      depends_on('apt')
+      validate { trigger('apt:exists', apt_name, version) }
+      apply do
+        trigger('apt:update')
+        trigger('apt:install', apt_name, version)
       end
-      remove   { trigger 'apt:remove', apt_name  }
+      remove { trigger('apt:remove', apt_name, version) }
       instance_eval(&blk) if blk
     end
   end
 
   package 'apt' do
-    action 'install' do |package_name|
-      sudo "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq #{package_name}"
+    action 'install' do |package_name, version=nil|
+      package_description = [package_name, version].compact.join('=')
+      sudo "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq #{package_description}"
     end
 
-    action 'remove' do |package_name|
-      sudo "DEBIAN_FRONTEND=noninteractive apt-get remove -y -qq #{package_name}"
+    action 'remove' do |package_name, version=nil|
+      package_description = [package_name, version].compact.join('=')
+      sudo "DEBIAN_FRONTEND=noninteractive apt-get remove -y -qq #{package_description}"
     end
 
     action 'ppa' do |repo|
@@ -30,8 +43,15 @@ Orca.extension :apt do
       sudo "DEBIAN_FRONTEND=noninteractive apt-get update -y -qq"
     end
 
-    action 'exists' do |package_name|
-      run("dpkg -s #{package_name} 2>&1 | grep Status") =~ /Status: install ok installed/
+    action 'exists' do |package_name, required_version=nil|
+      pkg_info = run("dpkg -s #{package_name} 2>&1")
+      installed = pkg_info =~ /Status: install ok installed/
+      next false unless installed
+      next true if required_version.nil?
+      version = pkg_info.match(/^Version: (.+?)$/)[1]
+      version_matches = (version == required_version)
+      log("#{package_name}: expected '#{required_version}' but found '#{version}'") unless version_matches
+      version_matches
     end
 
     validate do

data/lib/orca/extensions/file_sync.rb

@@ -50,7 +50,7 @@ class Orca::FileSync
   end
 
   def run_after_apply(context)
-    context.instance_eval(&@after_apply)
+    context.instance_eval(&@after_apply) if @after_apply
   end
 
   def add_content_package

data/lib/orca/node.rb

@@ -60,21 +60,21 @@ class Orca::Node
     @sftp ||= connection.sftp.connect
   end
 
-  def execute(cmd)
+  def execute(cmd, opts={})
     log('execute', cmd.cyan)
     output = ""
     connection.exec! cmd do |channel, stream, data|
       output += data if stream == :stdout
       data.split("\n").each do |line|
         msg = stream == :stdout ? line.green : line.red
-        log(stream, msg)
+        log(stream, msg) if opts[:log] || Orca.verbose
       end
     end
     output
   end
 
-  def sudo(cmd)
-    execute("sudo #{cmd}")
+  def sudo(cmd, opts={})
+    execute("sudo #{cmd}", opts)
   end
 
   def log(context, msg)
@@ -84,7 +84,11 @@ class Orca::Node
 
   def connection
     return @connection if @connection
-    @connetion = Net::SSH.start(@host, (@options[:user] || 'root'), options_for_ssh)
+    @connection = Net::SSH.start(@host, (@options[:user] || 'root'), options_for_ssh)
+  end
+
+  def disconnect
+    @connection.close if @connection && !@connection.closed?
   end
 
   def to_s

data/lib/orca/suite.rb

@@ -4,6 +4,7 @@ class Orca::Suite
     @sequential = options[:sequential]
     @demonstrate = options[:demonstrate]
     @skip_dependancies = options[:'skip-dependancies'] || false
+    @nodes = []
   end
 
   def load_file(file)
@@ -13,6 +14,7 @@ class Orca::Suite
   def run(group_name, pkg_name, command, sequential=false)
     group = Orca::Group.find(group_name)
     runners = group.nodes.map do |node|
+      @nodes << node
       if command == :trigger
         Orca::TriggerRunner.new(node, pkg_name)
       else
@@ -28,6 +30,12 @@ class Orca::Suite
     end
   end
 
+  def cleanup
+    @nodes.each(&:disconnect)
+  end
+
+  private
+
   def exec(runner, command)
     if @demonstrate
       runner.demonstrate(command)

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.0'
+  gem.version       = '0.3.1'
   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.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1540904086341919600
+      hash: -4313409858467376914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1540904086341919600
+      hash: -4313409858467376914
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23