pd-blender 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184f4e1009b13d2f60b78a000f41a8216b5a9c8e
-  data.tar.gz: ef34cccbaca40a15a455e83b91a910cbe725e39e
+  metadata.gz: e24f3ed1968a3e52c672544856b6997422682aff
+  data.tar.gz: 91c94a245676a3d615b7432b2d46bfde8fdfba23
 SHA512:
-  metadata.gz: 5b4c27d394fbb4a9dff23af968a1e37781b85707e38df77b0cee6b41635543d09708f361c2f8508a55f89d7a0357cce9124292fd57df1d30d494272dc5e7fc10
-  data.tar.gz: 099a03a58909a2e0b93aa37c88521017ef789721d283d1c7edb0049b5e239b32d38aced5335b93685fdb0ac1121db46f78bd85ae36ea3ce81e0fa91032d0f47b
+  metadata.gz: 38714485f27b733feeba33298f640409b85cf2290233b7394b7486d8c360669ceddb08e9b967acddfd836b03cebaf2f013dead4d3ef6d14de3a2213ca23cabd8
+  data.tar.gz: 48a894c2bc264ff10dbeb55f10886e14d30cceca812708422908ac74f91d2a30e65fdbd3cddd58e089d7fd4d1f98737af808024f2b30685160e5be30cd16ab62

data/README.md

@@ -138,6 +138,18 @@ can execute `ssh_task`s. Blender core ships with following tasks and drivers:
   end
   ```
 
+  - **blend_task**: invoke a blender script as a task (nesting)
+
+  ```ruby
+  members ['host1', 'host2', 'host3']
+  blend_task 'test-task' do
+    file '/path/to/remote/file'
+    concurrency 10
+    strategy :per_host
+  end
+  ```
+
+
 As mentioned earlier tasks are executed using drivers. Tasks can declare their preferred driver or
 Blender will assign a driver to them automatically. Blender will reuse the global driver if its
 compatible, else it will create one. By default the ```global_driver``` is a ```shell_out``` driver.

data/lib/blender/drivers/blend.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Ranjib Dey (<ranjib@pagerduty.com>)
+# Copyright:: Copyright (c) 2015 PagerDuty, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'blender/drivers/base'
+
+module Blender
+  module Driver
+    class Blend < Base
+      def execute(tasks, hosts)
+        tasks.each do |task|
+          cmd = run_command(task.command, hosts)
+          if cmd.exitstatus != 0 and !task.metadata[:ignore_failure]
+            raise ExecutionFailed, cmd.stderr
+          end
+        end
+      end
+
+      def run_command(command, hosts)
+        exit_status = 0
+        err = ''
+        begin
+          Blender.blend(command.file, command.options) do |sched|
+            sched.strategy(command.strategy)
+            sched.members(hosts)
+            sched.concurrency(command.concurrency)
+            command.config_store.keys.each do |key|
+              sched.config(key, command.config_store[key])
+            end
+            sched.instance_eval(File.read(command.file))
+          end
+        rescue StandardError => e
+          err = e.message + "\nBacktrace:" + e.backtrace.join("\n")
+          exit_status = -1
+        end
+        ExecOutput.new(exit_status, '', err)
+      end
+    end
+  end
+end

data/lib/blender/scheduler/dsl.rb

@@ -22,6 +22,7 @@ require 'blender/tasks/ruby'
 require 'blender/tasks/ssh'
 require 'blender/tasks/shell_out'
 require 'blender/tasks/scp'
+require 'blender/tasks/blend'
 require 'highline'
 require 'blender/utils/refinements'
 require 'blender/drivers/ssh'
@@ -30,6 +31,7 @@ require 'blender/drivers/ssh_multi'
 require 'blender/drivers/shellout'
 require 'blender/drivers/ruby'
 require 'blender/drivers/scp'
+require 'blender/drivers/blend'
 require 'blender/discovery'
 require 'blender/handlers/base'
 require 'blender/lock/flock'
@@ -136,6 +138,15 @@ module Blender
       append_task(:scp, task, blender_config(:ssh))
     end
 
+    def blend_task(name, &block)
+      task = build_task(name, :blend)
+      task.instance_eval(&block) if block_given?
+      task.command.pass_configs.each do |key|
+        task.command.config_store[key] = blender_config(key).dup
+      end
+      append_task(:blend, task)
+    end
+
     def strategy(strategy)
       klass_name = camelcase(strategy.to_s).to_sym
       begin

data/lib/blender/tasks/blend.rb

@@ -0,0 +1,69 @@
+#
+# Author:: Ranjib Dey (<ranjib@pagerduty.com>)
+# Copyright:: Copyright (c) 2014 PagerDuty, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'blender/tasks/base'
+
+module Blender
+  module Task
+    class Blend < Base
+      attr_reader :blender_strategy
+
+      def initialize(name, metadata = {})
+        super
+        @command = Struct.new(
+          :file,
+          :strategy,
+          :pass_configs,
+          :config_store,
+          :concurrency,
+          :options
+        ).new
+        @command.strategy = :default
+        @command.concurrency = 1
+        @command.pass_configs = []
+        @command.config_store = ThreadSafe::Cache.new
+        @command.options = ThreadSafe::Hash.new
+      end
+
+      def strategy(st)
+        @command.strategy = st
+      end
+
+      def execute(f)
+        @command.file = f
+      end
+
+      alias file execute
+
+      def concurrency(n)
+        @command.concurrency = n
+      end
+
+      def pass_configs(*keys)
+        @command.pass_configs += keys unless keys.empty?
+      end
+
+      def config(key, opts = {})
+        @command.config_store[key] = opts
+      end
+
+      def options(hash)
+        @command.options.merge!(hash)
+      end
+    end
+  end
+end

data/lib/blender/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Blender
-  VERSION = '0.5'
+  VERSION = '0.6'
 end

data/spec/blender/drivers/blend_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Blender do
+  let(:scp_config) do
+    { user: 'test-user', password: 'test-password' }
+  end
+  let!(:sched) do
+    blender_file = File.expand_path('../../../data/example.rb', __FILE__)
+    sched = Blender.blend('sub blend', no_doc: true) do |sched|
+      sched.config(:scp, scp_config)
+      sched.members(['1.2.3.4'])
+      sched.blend_task 'foo' do
+        file blender_file
+        strategy :per_task
+        pass_configs :scp
+        concurrency 3
+      end
+    end
+  end
+
+  it 'passes apropriate config options from parent blender script' do
+    blend_task = sched.tasks.first
+    expect(blend_task.command.config_store[:scp]).to eq(scp_config)
+  end
+end

data/spec/blender/tasks/blend_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Blender::Task::Blend do
+  let(:task) do
+    described_class.new('blend-test')
+  end
+
+  it 'setup task name accordingly' do
+    expect(task.name).to eq('blend-test')
+  end
+
+  it 'setup blender file accordingly' do
+    task.execute '/foo/bar'
+    expect(task.command.file).to eq('/foo/bar')
+  end
+
+  it 'setup strategy for the blender job accordingly' do
+    task.strategy :foo
+    expect(task.command.strategy).to eq(:foo)
+  end
+
+  it 'setup concurrency correctly' do
+    task.concurrency(10)
+    expect(task.command.concurrency).to eq(10)
+  end
+
+  it 'setup explicit config accordingly' do
+    task.config(:foo, bar: 'baz')
+    expect(task.command.config_store[:foo]).to eq(bar: 'baz')
+  end
+
+  it 'has empty config by default' do
+    expect(task.command.config_store).to be_empty
+  end
+
+  it 'specifies the list of configs copied correctly' do
+    task.pass_configs :foo, :bar, :baz
+    expect(task.command.pass_configs).to eq([:foo, :bar, :baz])
+    expect(task.command.config_store).to be_empty
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd-blender
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -255,6 +255,7 @@ files:
 - lib/blender/cli.rb
 - lib/blender/discovery.rb
 - lib/blender/drivers/base.rb
+- lib/blender/drivers/blend.rb
 - lib/blender/drivers/compound.rb
 - lib/blender/drivers/ruby.rb
 - lib/blender/drivers/scp.rb
@@ -279,6 +280,7 @@ files:
 - lib/blender/scheduling_strategies/per_host.rb
 - lib/blender/scheduling_strategies/per_task.rb
 - lib/blender/tasks/base.rb
+- lib/blender/tasks/blend.rb
 - lib/blender/tasks/ruby.rb
 - lib/blender/tasks/scp.rb
 - lib/blender/tasks/shell_out.rb
@@ -290,6 +292,7 @@ files:
 - lib/blender/version.rb
 - spec/blender/blender_rspec.rb
 - spec/blender/discovery_spec.rb
+- spec/blender/drivers/blend_spec.rb
 - spec/blender/drivers/scp_spec.rb
 - spec/blender/drivers/ssh_multi_spec.rb
 - spec/blender/drivers/ssh_spec.rb
@@ -300,6 +303,7 @@ files:
 - spec/blender/scheduled_job_spec.rb
 - spec/blender/scheduler_spec.rb
 - spec/blender/scheduling_strategies/default_spec.rb
+- spec/blender/tasks/blend_spec.rb
 - spec/blender/tasks/scp_spec.rb
 - spec/blender/utils/refinements_spec.rb
 - spec/blender/utils/thread_pool_spec.rb
@@ -333,6 +337,7 @@ summary: A modular orchestration engine
 test_files:
 - spec/blender/blender_rspec.rb
 - spec/blender/discovery_spec.rb
+- spec/blender/drivers/blend_spec.rb
 - spec/blender/drivers/scp_spec.rb
 - spec/blender/drivers/ssh_multi_spec.rb
 - spec/blender/drivers/ssh_spec.rb
@@ -343,6 +348,7 @@ test_files:
 - spec/blender/scheduled_job_spec.rb
 - spec/blender/scheduler_spec.rb
 - spec/blender/scheduling_strategies/default_spec.rb
+- spec/blender/tasks/blend_spec.rb
 - spec/blender/tasks/scp_spec.rb
 - spec/blender/utils/refinements_spec.rb
 - spec/blender/utils/thread_pool_spec.rb