orca 0.2.0 → 0.3.0

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
+gem 'minitest'
 gem 'mocha', :require => false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orca (0.2.0)
+    orca (0.3.0)
       colored
       net-sftp
       net-ssh
@@ -12,6 +12,7 @@ GEM
   specs:
     colored (1.2)
     metaclass (0.0.1)
+    minitest (4.7.5)
     mocha (0.13.1)
       metaclass (~> 0.0.1)
     net-sftp (2.1.2)
@@ -24,6 +25,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest
   mocha
   orca!
   rake

data/README.md

@@ -76,7 +76,18 @@ So here are some examples (assuming you have a package called "app" and a node c
 
     orca apply app server
     orca remove app server
-    orca demonstrate app server
+
+You can also directly trigger actions from the CLI like so...
+
+    orca trigger nginx:reload web-1
+
+Options, all commands support the following optional parameters...
+
+    --demonstrate       | dont actually run the commands on the server just pretend like you are
+    --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
+    --skip-dependancies | Don't validate and run dependancies, only the pkg in question
 
 
 The Orca DSL

data/lib/orca.rb

@@ -37,6 +37,7 @@ require_relative "./orca/package_index"
 require_relative "./orca/node"
 require_relative "./orca/group"
 require_relative "./orca/runner"
+require_relative "./orca/trigger_runner"
 require_relative "./orca/resolver"
 require_relative "./orca/execution_context"
 require_relative "./orca/local_file"

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 :'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"
   def apply(package, group)
@@ -28,6 +29,11 @@ class Orca::Cli < Thor
     directory('template', 'orca')
   end
 
+  desc "trigger ACTION_REF GROUP_OR_NODE_NAME", "trigger an action directly e.g. `orca trigger nginx:reload web-1`"
+  def trigger(action_ref, group)
+    run_command(action_ref, group, :trigger)
+  end
+
   private
 
   def run_command(package, group, cmd)

data/lib/orca/execution_context.rb

@@ -1,4 +1,6 @@
 class Orca::ExecutionContext
+  attr_reader :node
+
   def initialize(node)
     @node = node
   end
@@ -11,6 +13,10 @@ class Orca::ExecutionContext
     @node.execute(cmd)
   end
 
+  def log(msg)
+    @node.log('log', msg)
+  end
+
   def sudo(cmd)
     @node.sudo(cmd)
   end
@@ -47,7 +53,7 @@ class Orca::ExecutionContext
     pkg_name, action_name = *action_ref.split(':', 2)
     pkg = Orca::PackageIndex.default.get(pkg_name)
     action = pkg.actions[action_name]
-    raise "Action #{action_ref} could not be found." unless action
+    raise Orca::MissingActionError.new(action_ref) unless action
     instance_exec(*args, &action)
   end
 
@@ -56,6 +62,16 @@ class Orca::ExecutionContext
   end
 end
 
+class Orca::MissingActionError < StandardError
+  def initialize(action_ref)
+    @action_ref = action_ref
+  end
+
+  def message
+    "Action '#{@action_ref}' could not be found."
+  end
+end
+
 class Orca::MockExecutionContext < Orca::ExecutionContext
   def run(cmd)
     @node.log 'mock-execute', cmd

data/lib/orca/extensions/file_sync.rb

@@ -1,15 +1,16 @@
 Orca.extension :file_sync do
   class Orca::Package
-    def file(config)
-      Orca::FileSync.new(self, config).configure
+    def file(config, &blk)
+      Orca::FileSync.new(self, config, &blk).configure
     end
   end
 end
 
 class Orca::FileSync
-  def initialize(parent, config)
+  def initialize(parent, config, &blk)
     @parent = parent
     @config = config
+    @after_apply = blk
     raise ArgumentError.new('A file :source must be provided') unless local_path
     raise ArgumentError.new('A file :destination must be provided') unless remote_path
   end
@@ -48,6 +49,10 @@ class Orca::FileSync
     add_permissions_package unless permissions.nil? and user.nil? and group.nil?
   end
 
+  def run_after_apply(context)
+    context.instance_eval(&@after_apply)
+  end
+
   def add_content_package
     fs = self
     add_package('content') do |package|
@@ -61,6 +66,7 @@ class Orca::FileSync
         tmp_path = "orca-upload-#{local_file.hash}"
         local_file.copy_to(remote(tmp_path))
         sudo("mv #{tmp_path} #{fs.remote_path}")
+        fs.run_after_apply(self)
       end
 
       package.command :remove do
@@ -79,6 +85,7 @@ class Orca::FileSync
       package.command :apply do
         remote(fs.remote_path).set_owner(fs.user, fs.group) unless fs.user.nil? and fs.group.nil?
         remote(fs.remote_path).set_permissions(fs.permissions) unless fs.permissions.nil?
+        fs.run_after_apply(self)
       end
 
       package.command :validate do

data/lib/orca/node.rb

@@ -23,6 +23,14 @@ class Orca::Node
     Orca::Node.register(self)
   end
 
+  def get(option)
+    @options[option]
+  end
+
+  def method_missing(meth, *args)
+    get(meth)
+  end
+
   def upload(from, to)
     log('sftp', "UPLOAD: #{from} => #{to}")
     sftp.upload!(from, to)
@@ -71,14 +79,25 @@ class Orca::Node
 
   def log(context, msg)
     Thread.exclusive { puts "#{self.to_s} [#{context.to_s.bold}] #{msg}" }
+    msg
   end
 
   def connection
     return @connection if @connection
-    @connetion = Net::SSH.start(@host, (@options[:user] || 'root'), @options)
+    @connetion = Net::SSH.start(@host, (@options[:user] || 'root'), options_for_ssh)
   end
 
   def to_s
     "#{name}(#{host})"
   end
+
+  private
+
+  def options_for_ssh
+    opts = [:auth_methods, :compression, :compression_level, :config, :encryption , :forward_agent , :global_known_hosts_file , :hmac , :host_key , :host_key_alias , :host_name, :kex , :keys , :key_data , :keys_only , :logger , :paranoid , :passphrase , :password , :port , :properties , :proxy , :rekey_blocks_limit , :rekey_limit , :rekey_packet_limit , :timeout , :user , :user_known_hosts_file , :verbose ]
+    @options.reduce({}) do |hsh, (k,v)|
+      hsh[k] = v if opts.include?(k)
+      hsh
+    end
+  end
 end

data/lib/orca/remote_file.rb

@@ -55,7 +55,7 @@ class Orca::RemoteFile
   end
 
   def delete!
-    @context.remove(path)
+    @context.remove(path) if exists?
     invalidate!
     self
   end

data/lib/orca/runner.rb

@@ -1,11 +1,13 @@
 class Orca::Runner
-  def initialize(node, package)
+  def initialize(node, package, skip_dependancies=false)
     @node = node
     @package = package
     @perform = true
+    @skip_dependancies = skip_dependancies
   end
 
   def packages
+    return [@package] if @skip_dependancies
     resolver = Orca::Resolver.new(@package)
     resolver.resolve
     resolver.packages

data/lib/orca/suite.rb

@@ -3,6 +3,7 @@ class Orca::Suite
   def initialize(options={})
     @sequential = options[:sequential]
     @demonstrate = options[:demonstrate]
+    @skip_dependancies = options[:'skip-dependancies'] || false
   end
 
   def load_file(file)
@@ -11,8 +12,14 @@ class Orca::Suite
 
   def run(group_name, pkg_name, command, sequential=false)
     group = Orca::Group.find(group_name)
-    pkg = Orca::PackageIndex.default.get(pkg_name)
-    runners = group.nodes.map { |node| Orca::Runner.new(node, pkg) }
+    runners = group.nodes.map do |node|
+      if command == :trigger
+        Orca::TriggerRunner.new(node, pkg_name)
+      else
+        pkg = Orca::PackageIndex.default.get(pkg_name)
+        Orca::Runner.new(node, pkg, @skip_dependancies)
+      end
+    end
     if @sequential
       runners.each {|runner| exec(runner, command) }
     else

data/lib/orca/trigger_runner.rb

@@ -0,0 +1,14 @@
+class Orca::TriggerRunner
+  def initialize(node, action_ref)
+    @node = node
+    @action_ref = action_ref
+  end
+
+  def execute(_)
+    Orca::ExecutionContext.new(@node).trigger(@action_ref)
+  end
+
+  def demonstrate(_)
+    Orca::MockExecutionContext.new(@node).trigger(@action_ref)
+  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.2.0'
+  gem.version       = '0.3.0'
   gem.add_dependency('colored')
   gem.add_dependency('net-ssh')
   gem.add_dependency('net-sftp')

data/test/remote_file_test.rb

@@ -75,9 +75,20 @@ describe Orca::RemoteFile do
 
   describe 'delete!' do
     it "removes the file from the remote server" do
+      @context.expects(:run)
+              .with(%[if [ -f #{@remote_file_path} ]; then echo "true"; else echo "false"; fi])
+              .returns("true\n")
       @context.expects(:remove).with(@remote_file.path)
       @remote_file.delete!
     end
+
+    it "doesn't delete missing files" do
+      @context.expects(:run)
+              .with(%[if [ -f #{@remote_file_path} ]; then echo "true"; else echo "false"; fi])
+              .returns("false\n")
+      @context.expects(:remove).with(@remote_file.path).never
+      @remote_file.delete!
+    end
   end
 
   describe 'set_permissions' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orca
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -107,6 +107,7 @@ files:
 - lib/orca/resolver.rb
 - lib/orca/runner.rb
 - lib/orca/suite.rb
+- lib/orca/trigger_runner.rb
 - orca.gemspec
 - test/dsl_test.rb
 - test/fixtures/example.txt
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1672503668912245797
+      hash: 1540904086341919600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1672503668912245797
+      hash: 1540904086341919600
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23