pd-blender 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a647ec91e708fdc7ffa2d7275fa03d7ce99a236
-  data.tar.gz: aecd89dd6ce1a6a2473da673717521217fb8a0d6
+  metadata.gz: 184f4e1009b13d2f60b78a000f41a8216b5a9c8e
+  data.tar.gz: ef34cccbaca40a15a455e83b91a910cbe725e39e
 SHA512:
-  metadata.gz: 4886449ccf296a01d265b24352d22bbfacbf1e096c058cdb2969c38221e18b96264e4190902daa5fd158d622b5e54b106cd8285de73edd2a16c5d8dfab4752e0
-  data.tar.gz: 99949f26259eb2bbeacadf3747d443b6a855f6e4f7792fbe53f3943c8db953670f63b296001ee21c81ce0fd0bb5c1edc63b22f2ad48c04ca0d9ef3c0da06fa97
+  metadata.gz: 5b4c27d394fbb4a9dff23af968a1e37781b85707e38df77b0cee6b41635543d09708f361c2f8508a55f89d7a0357cce9124292fd57df1d30d494272dc5e7fc10
+  data.tar.gz: 099a03a58909a2e0b93aa37c88521017ef789721d283d1c7edb0049b5e239b32d38aced5335b93685fdb0ac1121db46f78bd85ae36ea3ce81e0fa91032d0f47b

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in blender.gemspec
 gemspec
-
-gem 'ruby-prof'

data/blender.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'net-ssh-multi'
   spec.add_dependency 'net-scp'
   spec.add_dependency 'rufus-scheduler'
+  spec.add_dependency 'thread_safe'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/blender.rb

@@ -20,7 +20,6 @@ require 'blender/scheduler'
 require 'blender/log'
 require 'blender/drivers/shellout'
 require 'json'
-require 'blender/configuration'
 
 # Top level module that holds all blender related libraries under this namespace
 module Blender
@@ -35,7 +34,7 @@ module Blender
   def self.blend(name, options = {})
     config_file = options.delete(:config_file)
     scheduler = Scheduler.new(name, [], options)
-    configure(config_file) if config_file
+    configure(scheduler, config_file) if config_file
     if block_given?
       yield scheduler
     else
@@ -45,7 +44,7 @@ module Blender
     scheduler
   end
 
-  def self.configure(file)
+  def self.configure(scheduler, file)
     data = JSON.parse(File.read(file))
 
     Blender::Log.level = data['log_level'].to_sym if data['log_level']
@@ -58,7 +57,7 @@ module Blender
     end
     if data['scheduler']
       data['scheduler'].each do |key, value|
-        Blender::Configuration[key.to_sym] = value
+        scheduler.update_config(key.to_sym, value)
       end
     end
   end

data/lib/blender/cli.rb

@@ -55,8 +55,7 @@ module Blender
       banner: 'Quiet mode. Disable printing running job details'
 
     def from_file(*args)
-      Configuration[:noop] = options[:noop]
-      Configuration[:arguments] = args
+      noop_mode = options[:noop]
       des = File.read(options[:file])
       $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(options[:file]), 'lib')))
       scheduler_options = {
@@ -64,6 +63,8 @@ module Blender
         no_doc: options[:quiet]
       }
       Blender.blend(options[:file], scheduler_options) do |sch|
+        sch.update_config(:noop, noop_mode)
+        sch.update_config(:arguments, args)
         sch.instance_eval(des, __FILE__, __LINE__)
       end
     end

data/lib/blender/discovery.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'blender/utils/refinements'
-require 'blender/configuration'
 
 module Blender
   module Discovery
@@ -24,7 +23,7 @@ module Blender
 
     def build_discovery(type, opts = {})
       disco_klass = Blender::Discovery.const_get(camelcase(type.to_s).to_sym)
-      disco_opts = Blender::Configuration[type].merge(opts)
+      disco_opts = blender_config(type).merge(opts)
       disco_klass.new(symbolize(disco_opts))
     end
 

data/lib/blender/handlers/doc.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'blender/utils/ui'
-require 'blender/configuration'
 
 module Blender
   module Handlers
@@ -32,7 +31,9 @@ module Blender
         @task_id = 0
         @job_id = 1
         ui.puts_green("Run[#{scheduler.name}] started")
-        ui.puts_green('Running in No-Op mode, driver execution will be skipped') if Configuration[:noop]
+        if scheduler.blender_config(:noop)
+          ui.puts_green('Running in No-Op mode, driver execution will be skipped')
+        end
       end
 
       def run_finished(scheduler)

data/lib/blender/job.rb

@@ -17,7 +17,6 @@
 
 require 'blender/exceptions'
 require 'blender/log'
-require 'blender/configuration'
 
 module Blender
   # A job represent encapsulates an array of tasks to be performed
@@ -40,7 +39,7 @@ module Blender
     end
 
     def run
-      driver.execute(tasks, hosts) unless Configuration[:noop]
+      driver.execute(tasks, hosts)
     end
 
     def to_s

data/lib/blender/rspec.rb

@@ -52,10 +52,10 @@ module Blender
     end
 
     def noop_scheduler_from_file(file)
-      Blender::Configuration[:noop] = true
       des = File.read(file)
       $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(file), 'lib')))
       Blender.blend(file) do |sch|
+        sch.update_config(:noop, true)
         sch.lock_options(nil)
         sch.instance_eval(des, __FILE__, __LINE__)
       end

data/lib/blender/scheduler.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'blender/log'
-require 'blender/configuration'
 require 'blender/utils/thread_pool'
 require 'blender/exceptions'
 require 'blender/scheduling_strategies/default'
@@ -27,6 +26,7 @@ require 'blender/scheduler/dsl'
 require 'blender/event_dispatcher'
 require 'blender/handlers/doc'
 require 'blender/tasks/base'
+require 'thread_safe'
 
 module Blender
   class Scheduler
@@ -38,10 +38,17 @@ module Blender
     attr_reader :events, :tasks
     attr_reader :lock_properties
 
-    def initialize(name, tasks = [], options = {})
+    # options
+    #   noop: true/false - No-Op mode, dont invoke job.run
+    #   arguments: array or any stock data
+    #   rest everything gets merged as metadata
+    def initialize(name, tasks = ThreadSafe::Array.new, options = {})
       @name = name
       @tasks = tasks
       @events = Blender::EventDispatcher.new
+      @config = ThreadSafe::Hash.new{ ThreadSafe::Hash.new }
+      @config[:noop] = options[:noop] || false
+      @config[:arguments] = options[:arguments] || []
       unless options.delete(:no_doc)
         events.register(Blender::Handlers::Doc.new)
       end
@@ -92,7 +99,9 @@ module Blender
     def run_job(job)
       events.job_started(job)
       Log.debug("Running job #{job.name}")
-      job.run
+      unless blender_config(:noop)
+        job.run
+      end
       events.job_finished(job)
     rescue StandardError => e
       events.job_failed(job, e)
@@ -103,13 +112,22 @@ module Blender
       end
     end
 
+    def blender_config(key)
+      @config[key]
+    end
+
+    def update_config(key, value)
+      @config[key] = value
+      @config
+    end
+
     def default_metadata
-      {
-       ignore_failure: false,
-       concurrency: 0,
-       handlers: [],
-       members: []
-      }
+      temp = ThreadSafe::Hash.new
+      temp[:ignore_failure] = false
+      temp[:concurrency] = 0
+      temp[:handlers] = ThreadSafe::Array.new
+      temp[:members] = ThreadSafe::Array.new
+      temp
     end
   end
 end

data/lib/blender/scheduler/dsl.rb

@@ -40,7 +40,7 @@ module Blender
     include Blender::Discovery
 
     def config(type, opts = {})
-      blender_config(type).merge!(opts)
+      update_config(type, opts)
     end
 
     alias :init :config
@@ -176,11 +176,5 @@ module Blender
     end
 
     alias_method :task, :shell_task
-
-    private
-
-    def blender_config(key)
-      Blender::Configuration[key]
-    end
   end
 end

data/lib/blender/scheduling_strategies/default.rb

@@ -26,7 +26,7 @@ module Blender
         job_id = 0
         jobs = pairs.map do |task, host|
           Log.debug("Creating job (#{host}|#{task.name})")
-          job_id += 1
+          job_id = job_id + 1
           Job.new(job_id, task.driver, [task], [host])
         end
         Log.debug("Total jobs : #{jobs.size}")

data/lib/blender/scheduling_strategies/per_host.rb

@@ -26,8 +26,9 @@ module Blender
         if hosts_list.size != 1
           raise UnsupportedFeature, 'PerHost strategy does not support scheduling tasks with different memebers'
         end
-        job_id = 1
+        job_id = 0
         jobs = hosts_list.first.map do |host|
+          job_id = job_id + 1
           Job.new(job_id, Blender::Driver::Compound.new, tasks, [host])
         end
         Log.debug("Total jobs : #{jobs.size}")

data/lib/blender/version.rb

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

data/spec/blender/lock_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe Blender::Lock do
   context 'File based locking' do
-    it 'should not allow two blender run with same lockfile to run at the same time' do
+    it 'not allow two blender run with same lockfile to run at the same time', fork: true do
       pid1 = fork do
-        Blender.blend('test-1') do |sched|
+        STDOUT.reopen(File::NULL)
+        STDERR.reopen(File::NULL)
+        Blender.blend('test-1', no_doc: true) do |sched|
           sched.lock_options('flock')
           sched.members(['localhost'])
           sched.ruby_task('date') do
@@ -17,8 +19,9 @@ describe Blender::Lock do
       end
 
       pid2 = fork do
+        STDOUT.reopen(File::NULL)
         STDERR.reopen(File::NULL)
-        Blender.blend('test-1') do |sched|
+        Blender.blend('test-1', no_doc: true) do |sched|
           sched.lock_options('flock')
           sched.members(['localhost'])
           sched.ruby_task('date') do
@@ -35,7 +38,7 @@ describe Blender::Lock do
       expect(status2.last.exitstatus).to_not eq(0)
     end
 
-    it 'should allow two blender run with different lock file to run at the same time' do
+    it 'allow two blender run with different lock file to run at the same time', fork: true do
       pid1 = fork do
         Blender.blend('test-1') do |sched|
           sched.lock_options('flock')
@@ -50,7 +53,7 @@ describe Blender::Lock do
       end
 
       pid2 = fork do
-        Blender.blend('test-2') do |sched|
+        Blender.blend('test-2', no_doc: true) do |sched|
           sched.lock_options('flock')
           sched.members(['localhost'])
           sched.ruby_task('date') do
@@ -66,7 +69,7 @@ describe Blender::Lock do
       expect(status2.last.exitstatus).to eq(0)
     end
 
-    it 'should raise lock acquisition error when times out' do
+    it 'raise lock acquisition error when times out', fork: true do
       pid1 = fork do
         Blender.blend('test-1') do |sched|
           sched.lock_options('flock')
@@ -98,7 +101,7 @@ describe Blender::Lock do
       expect(status2.last.exitstatus).to_not eq(0)
     end
 
-    it 'should not raise lock acquisition error when  able to acquire lock within timeout period' do
+    it 'not raise lock acquisition error when  able to acquire lock within timeout period', fork: true do
       pid1 = fork do
         Blender.blend('test-1') do |sched|
           sched.lock_options('flock')

data/spec/blender/scheduler_spec.rb

@@ -29,13 +29,13 @@ describe Blender::Scheduler do
       before do
         scheduler.task('whoa')
       end
-      it 'should belong to base class' do
+      it 'belong to base class' do
         expect(task).to be_kind_of(Blender::Task::Base)
       end
-      it 'should use shellout driver' do
+      it 'use shellout driver' do
         expect(task.driver).to be_kind_of(Blender::Driver::ShellOut)
       end
-      it 'should contain only one task' do
+      it 'contain only one task' do
         expect(scheduler.tasks.size).to eq(1)
       end
     end
@@ -46,21 +46,21 @@ describe Blender::Scheduler do
           execute('ls -l')
         end
       end
-      it 'should have correct hosts list' do
+      it 'have correct hosts list' do
         expect(task.hosts).to eq(['a'])
       end
-      it 'should have correct command' do
+      it 'have correct command' do
         expect(task.command).to eq('ls -l')
       end
-      it 'should use ssh task subclass' do
+      it 'use ssh task subclass' do
         expect(task).to be_kind_of(Blender::Task::Ssh)
       end
-      it 'should use the ssh driver' do
+      it 'use the ssh driver' do
         expect(task.driver).to be_kind_of(Blender::Driver::Ssh)
       end
     end
     describe '#on' do
-      it 'should invoke custom block on specific events' do
+      it 'invoke custom block on specific events', fork: true do
         test = 1
         Blender.blend('do it') do |sched|
           sched.on :run_finished do |x|

data/spec/blender/scheduling_strategies/default_spec.rb

@@ -49,6 +49,11 @@ describe Blender::SchedulingStrategy do
     it 'all jobs should have all task' do
       expect(jobs.map(&:tasks).map(&:size).uniq).to eq([tasks.size])
     end
+    it 'assigns correct job id' do
+      hosts.size.times do |n|
+        expect(jobs[n].id).to eq(n+1)
+      end
+    end
   end
   describe Blender::SchedulingStrategy::PerTask do
     before do

data/spec/blender_spec.rb

@@ -20,12 +20,12 @@ require 'blender/cli'
 
 describe Blender do
   describe '#blend' do
-    it 'should invoke a local command is no block is given' do
+    it 'invoke a local command is no block is given' do
       cmd = double(Mixlib::ShellOut, exitstatus: 0).as_null_object
       expect(Mixlib::ShellOut).to receive(:new).with('foo', {}).and_return(cmd)
       described_class.blend('foo')
     end
-    it 'should yield a scheduler object when block passed' do
+    it 'yield a scheduler object when block passed' do
       x = 1
       described_class.blend('test') do |sched|
         sched.ruby_task 'foo' do
@@ -35,11 +35,11 @@ describe Blender do
       expect(x).to eq(100)
     end
     context 'CLI' do
-      it 'should store additional arguments in config' do
-        Blender::CLI.start(%w{-f spec/data/example.rb -x -y -z})
-        expect(Blender::Configuration[:arguments]).to eq(%w{-x -y -z})
+      it 'store additional arguments in config', fork: true do
+        sched = Blender::CLI.start(%w{-q -f spec/data/example.rb -x -y -z})
+        expect(sched.blender_config(:arguments)).to eq(%w{-x -y -z})
       end
-      it 'should store additional arguments in config' do
+      it 'store additional arguments in config', fork: true do
         expect(Blender::Handlers::Doc).to_not receive(:new)
         Blender::CLI.start(%w{-q -f spec/data/example.rb})
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd-blender
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +253,6 @@ files:
 - blender.gemspec
 - lib/blender.rb
 - lib/blender/cli.rb
-- lib/blender/configuration.rb
 - lib/blender/discovery.rb
 - lib/blender/drivers/base.rb
 - lib/blender/drivers/compound.rb
@@ -276,7 +289,6 @@ files:
 - lib/blender/utils/ui.rb
 - lib/blender/version.rb
 - spec/blender/blender_rspec.rb
-- spec/blender/config_spec.rb
 - spec/blender/discovery_spec.rb
 - spec/blender/drivers/scp_spec.rb
 - spec/blender/drivers/ssh_multi_spec.rb
@@ -320,7 +332,6 @@ specification_version: 4
 summary: A modular orchestration engine
 test_files:
 - spec/blender/blender_rspec.rb
-- spec/blender/config_spec.rb
 - spec/blender/discovery_spec.rb
 - spec/blender/drivers/scp_spec.rb
 - spec/blender/drivers/ssh_multi_spec.rb

data/lib/blender/configuration.rb

@@ -1,56 +0,0 @@
-#
-# 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 'singleton'
-require 'thread'
-
-module Blender
-  class Configuration
-    include Singleton
-
-    attr_reader :data, :mutex
-
-    def initialize
-      @mutex = Mutex.new
-      reset!
-    end
-
-    def self.[]=(key, value)
-      instance.mutex.synchronize do
-        instance.data[key] = value
-      end
-    end
-
-    def self.[](key)
-      instance.mutex.synchronize do
-        instance.data[key]
-      end
-    end
-
-    def self.reset!
-      instance.mutex.synchronize do
-        instance.reset!
-      end
-    end
-
-    def reset!
-      @data = Hash.new{|h, k| h[k] = Hash.new}
-      @data[:noop] = false
-      @data[:arguments] = []
-    end
-  end
-end

data/spec/blender/config_spec.rb

@@ -1,34 +0,0 @@
-#
-# 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 'spec_helper'
-
-describe Blender::Configuration do
-  it 'should populate argments and noop key' do
-    expect(Blender::Configuration[:noop]).to be(false)
-    expect(Blender::Configuration[:argments]).to be_empty
-  end
-  it 'should set configs globally' do
-    Blender::Configuration[:x] = 1
-    expect(Blender::Configuration[:x]).to eq(1)
-  end
-  it 'should reset config' do
-    Blender::Configuration[:x] = 1
-    Blender::Configuration.reset!
-    expect(Blender::Configuration[:x]).to be_empty
-  end
-end