qb 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ce3a1d5168ba8aec1bc3e1cb73209783beb9c6
-  data.tar.gz: aa44fb6b19b18cea732f00b12a89f8bcf4d6b75b
+  metadata.gz: 1706ebb9f7e4d7c134e7f67a9754c0ecf4ae9fe1
+  data.tar.gz: 7d3191db5b5966d3979b4b6218de8ae6ea6ac6ef
 SHA512:
-  metadata.gz: 613e599ba5fa99df858ec08d8acfaa1c681f514cd618431272fe04d1fbbc86d964e5992c882fdf22f462474487b9a358ebdcbd22de33fd95ea7aea63257310d0
-  data.tar.gz: c396091700eab1d9b7f56c3f88f8eb8ebf75bf28760381f41b808e3b5d9f1b1ab14ef95294c2a329aa03f6e490c16528b82836f2c7bffdd695aaca767700ba75
+  metadata.gz: fda2a8f6ee9d7f9d19d7f67d73f140facabea56ea3e43ce32185b5076f108e8ac08e0704eff5123717a5adb9d6a09896b46a2c835d57a18db5a1fdfe40da3fa1
+  data.tar.gz: d8b507b8d96d3ec41b4642f399ea18ff0d2c8ec11eb8ff5387ea5742aaaccef0cb8a3757d4d2040b975bb0027bc9c19d6b8d1c57a4066fba5a786260ae3a8317

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/qb/util/bundler.rb

@@ -83,4 +83,42 @@ module QB::Util::Bundler
     end # ::Bundler.with_clean_env
   end # .with_clean_env
   
+  
+  def self.unbundle! &block
+    if $qb_replaced_env_vars.nil? || $qb_replaced_env_vars.empty?
+      if block
+        return block.call
+      else
+        return
+      end
+    end
+    
+    $qb_replaced_env_vars.each do |key, (original, replacement)|
+      ENV[key] = original
+    end
+    
+    $qb_replaced_env_vars = {}
+    
+    if block
+      block.call.tap { rebundle! }
+    end
+  end
+  
+  
+  def self.rebundle!
+    return if $qb_replaced_env_vars.nil?
+    
+    unless $qb_replaced_env_vars.empty?
+      raise "Looks like you're already unbundled: #{ $qb_replaced_env_vars }"
+    end
+    
+    ENV.each do |k, v|
+      if k.start_with? 'QB_BUNDLER_ENV_'
+        key = k.sub 'QB_BUNDLER_ENV_', ''
+        $qb_replaced_env_vars[key] = [ENV[key], v]
+        ENV[key] = v
+      end
+    end
+  end
+  
 end # module QB::Util::Bundler

data/library/stream

@@ -56,7 +56,7 @@ class Stream < QB::Ansible::Module
       END
     end
     
-    qb_unbundle! { cmd.stream! }
+    QB::Util::Bundler.unbundle! { cmd.stream! }
     
     changed!
   end

data/load/rebundle.rb

@@ -9,31 +9,13 @@
 $qb_replaced_env_vars = {}
 
 
-def qb_rebundle!
-  ENV.each do |k, v|
-    if k.start_with? 'QB_BUNDLER_ENV_'
-      key = k.sub 'QB_BUNDLER_ENV_', ''
-      $qb_replaced_env_vars[key] = [ENV[key], v]
-      ENV[key] = v
-    end
+ENV.each do |k, v|
+  if k.start_with? 'QB_BUNDLER_ENV_'
+    key = k.sub 'QB_BUNDLER_ENV_', ''
+    $qb_replaced_env_vars[key] = [ENV[key], v]
+    ENV[key] = v
   end
 end
 
 
-def qb_unbundle! &block
-  $qb_replaced_env_vars.each do |key, (original, replacement)|
-    ENV[key] = original
-  end
-  
-  $qb_replaced_env_vars = {}
-  
-  if block
-    block.call.tap { qb_rebundle! }
-  end
-end
-
-
-qb_rebundle!
-
-
 require 'bundler/setup'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - nrser