hem 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f764801c437a78d0186b4c5b634af0c71ed7565c
-  data.tar.gz: 824894ad4866d571d1a583808fa0d4ae8f333295
+  metadata.gz: 9ce0720a2204325f9c039e61d06f4f22beab37db
+  data.tar.gz: 619aad110e585018fad30f2e54f22473aca10e7d
 SHA512:
-  metadata.gz: 994361f227e85f0d8a5c1311dd7a842e325b2b278815978a32a92f9b5a6e940dae1e51cba29a84aa35cfb017db6d9e75a68ee19610e76701823b39ab6d7616f2
-  data.tar.gz: 114d008a8a15e7d960db1fae784376b32eb9f47e7572af59aff020c7dca7c6cfa0cedee949168b072326121f2d55eebc29f2cbea8d1603c1962a28477080deef
+  metadata.gz: 859e56bd09b826fc401ca9024cd5deb29dec7da0a0c5064df4457804ffee772b36d3c769828fb056434228f7937028e3dd402dddaaedd65f2af99b6a3dfb4769
+  data.tar.gz: 182c906fede71dd021565ef39b83937fee8f4a6da160bb1660bde2ef1020458ffaff3121905f2fc71fc0f1ddf3eb2f001d66c630b2cb53e10fa15a8d7a905847

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hem (1.1.0)
+    hem (1.1.2)
       aws-sdk (~> 2.3.8)
       deepstruct (~> 0.0.7)
       highline (~> 1.7.3)
@@ -17,12 +17,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.3.8)
-      aws-sdk-resources (= 2.3.8)
-    aws-sdk-core (2.3.8)
+    aws-sdk (2.3.13)
+      aws-sdk-resources (= 2.3.13)
+    aws-sdk-core (2.3.13)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.8)
-      aws-sdk-core (= 2.3.8)
+    aws-sdk-resources (2.3.13)
+      aws-sdk-core (= 2.3.13)
     blockenspiel (0.5.0)
     coderay (1.1.1)
     deepstruct (0.0.7)
@@ -55,4 +55,4 @@ DEPENDENCIES
   hem!
 
 BUNDLED WITH
-   1.12.4
+   1.12.5

data/lib/hem/plugins.rb

@@ -8,6 +8,7 @@ module Hem
     def initialize(path, gemfile, lockfile = nil)
       @is_setup = false
       @gemfile = gemfile
+      @definitionBlocks = []
       if lockfile.nil?
         @lockfile = "#{gemfile}.lock"
       else
@@ -21,11 +22,6 @@ module Hem
       end
 
       Bundler.root path
-      @builder = Class.new(Bundler::Dsl) do
-        define_method(:gemfile_root) do
-          Bundler.root
-        end
-      end.new
       @definition = nil
     end
 
@@ -42,7 +38,7 @@ module Hem
 
     def define(&block)
       raise Hem::PluginsAlreadySetupError if @is_setup
-      @builder.instance_eval &block
+      @definitionBlocks << block
 
       self
     end
@@ -110,8 +106,18 @@ module Hem
       @definition = nil if unlock
       return @definition unless @definition.nil?
 
+      builder = Class.new(Bundler::Dsl) do
+        define_method(:gemfile_root) do
+          Bundler.root
+        end
+      end.new
+
+      @definitionBlocks.each do |block|
+        builder.instance_eval &block
+      end
+
       unlock = {} if unlock.nil?
-      @definition = @builder.to_definition(@lockfile, unlock)
+      @definition = builder.to_definition(@lockfile, unlock)
       @definition.validate_ruby!
 
       @definition

data/lib/hem/setup.rb

@@ -1,6 +1,13 @@
-require 'bundler'
+if defined?(Bundler)
+  Bundler.with_clean_env do
+    exec [$PROGRAM_NAME,$PROGRAM_NAME], *ARGV
+  end
+end
+
 require_relative 'version'
 require_relative 'plugins'
 
-$:.push File.expand_path(File.join("..", ".."), __FILE__)
+gem 'hem', Hem::VERSION unless ENV['HEM_OMNIBUS']
+
+require 'bundler'
 require 'hem'

data/lib/hem/version.rb

@@ -1,5 +1,5 @@
 module Hem
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   class << self
     def require_version *requirements

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hem
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mike Simons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk