orca 0.3.2 → 0.3.3

data/Gemfile.lock

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

data/lib/orca.rb

@@ -38,6 +38,7 @@ module Orca
   end
 end
 
+require_relative "./orca/logger"
 require_relative "./orca/package"
 require_relative "./orca/package_index"
 require_relative "./orca/node"

data/lib/orca/execution_context.rb

@@ -1,20 +1,32 @@
+require "open3"
+
 class Orca::ExecutionContext
   attr_reader :node
 
-  def initialize(node)
+  def initialize(node, log)
     @node = node
+    @log = log
+    @node.log_to(@log)
   end
 
   def apply(blk)
     instance_eval(&blk)
   end
 
+  def run_local(cmd)
+    @log.local(cmd)
+    stdout, stderr, status = Open3.capture3(cmd)
+    @log.stdout(stdout)
+    @log.stderr(stderr)
+  end
+
   def run(cmd, opts={})
     @node.execute(cmd, opts)
   end
 
-  def log(msg)
-    @node.log('log', msg)
+  def log(msg=nil)
+    @log.log(msg) if msg
+    @log
   end
 
   def sudo(cmd, opts={})
@@ -74,32 +86,32 @@ end
 
 class Orca::MockExecutionContext < Orca::ExecutionContext
   def run(cmd)
-    @node.log 'mock-execute', cmd
+    @log.mock_execute(cmd)
     ''
   end
 
   def sudo(cmd)
-    @node.log 'mock-execute', "sudo #{cmd}"
+    @log.mock_execute "sudo #{cmd}"
     ''
   end
 
   def upload(from, to)
-    @node.log('mock-sftp', "UPLOAD: #{from} => #{to}")
+    @log.mock_execute("UPLOAD: #{from} => #{to}")
   end
 
   def download(from, to)
-    @node.log('mock-sftp', "DOWLOAD: #{from} => #{to}")
+    @log.mock_execute("DOWLOAD: #{from} => #{to}")
   end
 
   def remove(path)
-    @node.log('mock-sftp', "REMOVE: #{path}")
+    @log.mock_execute("REMOVE: #{path}")
   end
 
   def stat(path)
-    @node.log('mock-sftp', "STAT: #{path}")
+    @log.mock_execute("STAT: #{path}")
   end
 
   def setstat(path, opts)
-    @node.log('mock-sftp', "SET: #{path} - #{opts.inspect}")
+    @log.mock_execute("SET: #{path} - #{opts.inspect}")
   end
 end

data/lib/orca/extensions/apt.rb

@@ -37,10 +37,11 @@ Orca.extension :apt do
 
     action 'ppa' do |repo|
       sudo "DEBIAN_FRONTEND=noninteractive add-apt-repository #{repo} -y"
+      trigger 'apt:update', true
     end
 
-    action 'update' do
-      sudo "DEBIAN_FRONTEND=noninteractive apt-get update -y -qq"
+    action 'update' do |force=false|
+      sudo "DEBIAN_FRONTEND=noninteractive apt-get update -y -qq", {:once => !force}
     end
 
     action 'exists' do |package_name, required_version=nil|

data/lib/orca/logger.rb

@@ -0,0 +1,53 @@
+class Orca::Logger
+  def initialize(node, package)
+    @node = node
+    @package = package
+  end
+
+  def set_package(package)
+    @package = package
+  end
+
+  def command(msg)
+    say(msg, :yellow)
+  end
+
+  def local(cmd)
+    say(cmd, :cyan)
+  end
+
+  def execute(cmd)
+    say(cmd, :cyan)
+  end
+
+  def mock_execute(cmd)
+    execute(cmd)
+  end
+
+  def cached(cmd)
+    execute(cmd)
+  end
+
+  def sftp(cmd)
+    execute(cmd)
+  end
+
+  def log(msg)
+    say(msg)
+  end
+
+  def stdout(msg, force=false)
+    say(msg, :green) if force || Orca.verbose
+  end
+
+  def stderr(msg, force=false)
+    say(msg, :red) if force || Orca.verbose
+  end
+
+  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}" }
+    end
+  end
+end

data/lib/orca/node.rb

@@ -20,6 +20,7 @@ class Orca::Node
     @host = host
     @options = options
     @connection = nil
+    @history = []
     Orca::Node.register(self)
   end
 
@@ -32,17 +33,17 @@ class Orca::Node
   end
 
   def upload(from, to)
-    log('sftp', "UPLOAD: #{from} => #{to}")
+    log.sftp("UPLOAD: #{from} => #{to}")
     sftp.upload!(from, to)
   end
 
   def download(from, to)
-    log('sftp', "DOWLOAD: #{from} => #{to}")
+    log.sftp("DOWLOAD: #{from} => #{to}")
     sftp.download!(from, to)
   end
 
   def remove(path)
-    log('sftp', "REMOVE: #{path}")
+    log.sftp("REMOVE: #{path}")
     begin
       sftp.remove!(path)
     rescue Net::SFTP::StatusException
@@ -51,12 +52,12 @@ class Orca::Node
   end
 
   def stat(path)
-    log('sftp', "STAT: #{path}")
+    log.sftp("STAT: #{path}")
     sftp.stat!(path)
   end
 
   def setstat(path, opts)
-    log('sftp', "SET: #{path} - #{opts.inspect}")
+    log.sftp("SET: #{path} - #{opts.inspect}")
     sftp.setstat!(path, opts)
   end
 
@@ -65,25 +66,23 @@ class Orca::Node
   end
 
   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) if opts[:log] || Orca.verbose
-      end
+    if should_execute?(cmd, opts)
+      really_execute(cmd, opts)
+    else
+      cached_execute(cmd, opts)
     end
-    output
   end
 
   def sudo(cmd, opts={})
     execute("sudo #{cmd}", opts)
   end
 
-  def log(context, msg)
-    Thread.exclusive { puts "#{self.to_s} [#{context.to_s.bold}] #{msg}" }
-    msg
+  def log
+    @log
+  end
+
+  def log_to(log)
+    @log = log
   end
 
   def connection
@@ -108,4 +107,33 @@ class Orca::Node
       hsh
     end
   end
+
+  def cached_execute(cmd, opts={})
+    log.cached(cmd)
+    last_output(cmd)
+  end
+
+  def really_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|
+        log.send(stream, line, opts[:log])
+      end
+    end
+    @history << {cmd:cmd, output:output}
+    output
+  end
+
+  def should_execute?(cmd, opts)
+    return true unless opts[:once]
+    last_output(cmd).nil?
+  end
+
+  def last_output(cmd)
+    results = @history.select {|h| h[:cmd] == cmd }
+    return nil unless results && results.size > 0
+    results.last[:output]
+  end
 end

data/lib/orca/runner.rb

@@ -4,6 +4,7 @@ class Orca::Runner
     @package = package
     @perform = true
     @skip_dependancies = skip_dependancies
+    @log = Orca::Logger.new(@node, package)
   end
 
   def packages
@@ -14,7 +15,7 @@ class Orca::Runner
   end
 
   def execute(command_name)
-    @node.log command_name, packages.map(&:name).join(', ').yellow
+    @log.say packages.map(&:name).join(', ').yellow
     packages.each do |pkg|
       send(:"execute_#{command_name}", pkg)
     end
@@ -64,8 +65,9 @@ class Orca::Runner
   end
 
   def exec(pkg, command_name)
-    @node.log pkg.name, command_name.to_s.yellow
-    context = @perform ? Orca::ExecutionContext.new(@node) : Orca::MockExecutionContext.new(@node)
+    @log.set_package(pkg)
+    @log.command(command_name)
+    context = @perform ? Orca::ExecutionContext.new(@node, @log) : Orca::MockExecutionContext.new(@node, @log)
     cmds = pkg.command(command_name)
     cmds.map {|cmd| context.apply(cmd) }
   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.2'
+  gem.version       = '0.3.3'
   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.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -100,6 +100,7 @@ files:
 - lib/orca/extensions/file_sync.rb
 - lib/orca/group.rb
 - lib/orca/local_file.rb
+- lib/orca/logger.rb
 - lib/orca/node.rb
 - lib/orca/package.rb
 - lib/orca/package_index.rb
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -77465203265155118
+      hash: -3898811184980038862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -77465203265155118
+      hash: -3898811184980038862
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23