orca 0.3.6 → 0.4.0

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    orca (0.3.6)
+    orca (0.4.0)
       colored
       net-sftp
       net-ssh
       thor
+      tilt
 
 GEM
   remote: https://rubygems.org/
@@ -17,9 +18,10 @@ GEM
       metaclass (~> 0.0.1)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     rake (10.0.4)
     thor (0.18.1)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby

data/lib/orca.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'colored'
-require 'thor'
 
 module Orca
   def verbose(val=nil)
@@ -46,6 +45,7 @@ require_relative "./orca/group"
 require_relative "./orca/runner"
 require_relative "./orca/trigger_runner"
 require_relative "./orca/resolver"
+require_relative "./orca/template"
 require_relative "./orca/execution_context"
 require_relative "./orca/local_file"
 require_relative "./orca/remote_file"

data/lib/orca/cli.rb

@@ -1,3 +1,5 @@
+require 'thor'
+
 class Orca::Cli < Thor
   include Thor::Actions
 
@@ -44,7 +46,7 @@ class Orca::Cli < Thor
       suite = Orca::Suite.new(options)
       suite.load_file(orca_file)
       suite.run(group, package, cmd)
-    rescue => e
+    rescue Exception => e
       err = e
     ensure
       $stdout.print "Disconnecting...".green

data/lib/orca/execution_context.rb

@@ -61,6 +61,10 @@ class Orca::ExecutionContext
     Orca::RemoteFile.new(self, path)
   end
 
+  def template(path)
+    Orca::Template.new(@node, path)
+  end
+
   def trigger(action_ref, *args)
     pkg_name, action_name = *action_ref.split(':', 2)
     pkg = Orca::PackageIndex.default.get(pkg_name)

data/lib/orca/extensions/file_sync.rb

@@ -11,7 +11,7 @@ class Orca::FileSync
     @parent = parent
     @config = config
     @after_apply = blk
-    raise ArgumentError.new('A file :source must be provided') unless local_path
+    raise ArgumentError.new('A file :source  or template must be provided') unless local_path or template_path
     raise ArgumentError.new('A file :destination must be provided') unless remote_path
   end
 
@@ -19,6 +19,15 @@ class Orca::FileSync
     @config[:source]
   end
 
+  def template_path
+    @config[:template]
+  end
+
+  def local_path_for_node(node)
+    return local_path if local_path
+    Orca::Template.new(node, template_path).render_to_tempfile
+  end
+
   def remote_path
     @config[:destination]
   end
@@ -62,7 +71,7 @@ class Orca::FileSync
           sudo("mkdir -p #{mk_dir}")
           sudo("chown #{fs.user}:#{fs.group || fs.user} #{mk_dir}") if fs.user
         end
-        local_file = local(fs.local_path)
+        local_file = local(fs.local_path_for_node(node))
         tmp_path = "orca-upload-#{local_file.hash}"
         local_file.copy_to(remote(tmp_path))
         sudo("mv #{tmp_path} #{fs.remote_path}")
@@ -74,7 +83,7 @@ class Orca::FileSync
       end
 
       package.command :validate do
-        local(fs.local_path).matches?(remote(fs.remote_path))
+        local(fs.local_path_for_node(node)).matches?(remote(fs.remote_path))
       end
     end
   end

data/lib/orca/template.rb

@@ -0,0 +1,32 @@
+require 'erb'
+require 'tilt'
+
+class Orca::Template
+  def initialize(node, path)
+    @node = node
+    @path = resolve(path)
+    @template = Tilt.new(@path)
+  end
+
+  def render(locals={})
+    @template.render(@node, locals)
+  end
+
+  def render_to_tempfile(locals={})
+    basename = File.basename(@path).gsub('.', '-')
+    file = Tempfile.new(basename)
+    file.write render(locals)
+    file.close
+    file.path
+  end
+
+  private
+
+  def resolve(path)
+    if path =~ /^\//
+      path
+    else
+      File.join(Orca.root, path)
+    end
+  end
+end

data/orca.gemspec

@@ -10,9 +10,10 @@ 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.6'
+  gem.version       = '0.4.0'
   gem.add_dependency('colored')
   gem.add_dependency('net-ssh')
   gem.add_dependency('net-sftp')
   gem.add_dependency('thor')
+  gem.add_dependency('tilt')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orca
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Orca is a super simple way to build and configure servers
 email:
 - andy.kent@me.com
@@ -108,6 +124,7 @@ files:
 - lib/orca/resolver.rb
 - lib/orca/runner.rb
 - lib/orca/suite.rb
+- lib/orca/template.rb
 - lib/orca/trigger_runner.rb
 - orca.gemspec
 - test/dsl_test.rb
@@ -133,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -796320942601903817
+      hash: -951848962071421734
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -796320942601903817
+      hash: -951848962071421734
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23