dream-ops 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635291c5f60c092e9a6aadccbbb94b9c406f44aa
-  data.tar.gz: b53af42711e3c850419e528221e568bf14c136b7
+  metadata.gz: 27d08df0920a99854a22195056728c0532fc10fa
+  data.tar.gz: 7f00fa02c6681181ce6bff20e4e49ce8cbb58312
 SHA512:
-  metadata.gz: dec24a3be06450e6b4aadd9907d65e5f3020681680337bf8c8e119e76ce1e39049fdfb22dc712195135d0a60b992aa365ad1652a9e99e1268efc44e1a681e1ad
-  data.tar.gz: 52451f10fd6658f6b443ad632c60285c24be4b28d3117fafa45bc617638e40eeaa8e603d3543b4a9a53c737c8a95ff9ff65d6607983f4b50aa5d3e8abdb4c69f
+  metadata.gz: 29d9d09a2e49a281b95f4331a92f3f0edd2348945f8c0ee80ba2042c4bf145add1e57291a71a6df5dbf6c5ef7dcdfad99c6d6ca227fdd4df1de0cfbb5060891d
+  data.tar.gz: 68b9ff0471cb4327abef80661686d3dd5cc011f216d613db66653c1ccf4eebadbeef94b32bf3301965e13dcd3a50889ea10f18df370a08620bbe49d282518ff8

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.6.1]
+
+### Fixes
+- Now using thread-safe enum to avoid `FiberError`
+
 ## [0.6.0]
 
 ### Added

data/lib/dream-ops/deployment/base.rb

@@ -1,14 +1,16 @@
-require "dream-ops/utils/zip"
+require 'dream-ops/utils/zip'
+require 'dream-ops/utils/threaded_enum'
 require 'fileutils'
 
 module DreamOps
   class BaseDeployer
-    @@spinner = Enumerator.new do |e|
+
+    @@spinner = ThreadedEnum.new do |e|
       loop do
-        e.yield '|'
-        e.yield '/'
-        e.yield '-'
-        e.yield '\\'
+        e << '|'
+        e << '/'
+        e << '-'
+        e << '\\'
       end
     end
 

data/lib/dream-ops/utils/threaded_enum.rb

@@ -0,0 +1,81 @@
+# Credit: https://github.com/bittrance/rxruby/blob/master/lib/rx/concurrency/threaded_enumerator.rb
+#
+# ThreadedEnum can be used across threads unlike Ruby's default Enumerator
+# that will throw FiberError if the enumerator is used from more than one
+# thread.
+class ThreadedEnum
+  ERROR = Object.new
+  DONE = Object.new
+
+  if RUBY_ENGINE == 'jruby'
+    def self.new(*args, &block)
+      Enumerator.new(*args, &block)
+    end
+  end
+
+  # ThreadedEnum helper class
+  class Yielder
+    def initialize(queue, gate, condition)
+      @queue = queue
+      @gate = gate
+      @condition = condition
+    end
+
+    def <<(e)
+      @queue << e
+      @gate.synchronize do
+        @condition.wait @gate while @queue.size > 0
+      end
+    end
+  end
+
+  # The enumerator can be created with either an enumerable or a block that
+  # receives a yielder object, but not both. Note that the block or enumerable
+  # will be iterated immediately once making it possible to prepare the iterator
+  # e.g. when reading from a file or a socket.
+  def initialize(source_or_size_hint = nil, &block)
+    raise TypeError, 'Size hinting not supported' if source_or_size_hint && block_given?
+    @condition = ConditionVariable.new
+    @gate = Mutex.new
+    @queue = Queue.new
+    @done = false
+    setup_yielder(source_or_size_hint, &block)
+  end
+
+  # Receive the next item from the enumerator or any exception thrown from the
+  # enumerator.
+  def next
+    raise StopIteration if @done
+    @gate.synchronize do
+      @condition.signal
+    end
+    payload, type = @queue.pop
+    case type
+    when DONE
+      @done = true
+      raise StopIteration
+    when ERROR
+      @done = true
+      raise payload
+    end
+    payload
+  end
+
+  private
+
+  def setup_yielder(source, &block)
+    yielder = Yielder.new(@queue, @gate, @condition)
+    Thread.new do
+      begin
+        if source
+          source.each { |e| yielder << e }
+        else
+          block.call yielder
+        end
+      rescue => e
+        yielder << [e, ERROR]
+      end
+      yielder << [nil, DONE]
+    end
+  end
+end

data/lib/dream-ops/version.rb

@@ -1,3 +1,3 @@
 module DreamOps
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dream-ops
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chris Allen
@@ -157,6 +157,7 @@ files:
 - lib/dream-ops/logger.rb
 - lib/dream-ops/mixin/logging.rb
 - lib/dream-ops/shell.rb
+- lib/dream-ops/utils/threaded_enum.rb
 - lib/dream-ops/utils/zip.rb
 - lib/dream-ops/version.rb
 homepage: https://github.com/chris-allen/dream-ops