envandle 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac9db50e7977e1c07ba3f2a2f882d2dd00fa41e7
-  data.tar.gz: b570ef35b12e02cb3a47993a8676710563c32ef9
+  metadata.gz: 0ba6b7a03fbf1cc046052c324154724a5ceb40d0
+  data.tar.gz: 169f79ad81e4fc3c8b8aae3460a6f6c7c5ef87f7
 SHA512:
-  metadata.gz: 802b941c80adf4b48a74c5ede5fb4e41f2f5da36c364518df007a0b286f3ae49ff95f87aa91e71cdcef6931c5ed0bf5644035e18f5d5b8ae7ded5e67efbd0600
-  data.tar.gz: 5c2185eecac33db45da7fefa71399ca0866372b810c50024a0ae63213d63d4bbcf836c55095bad39d086a7af118753464eef067f23c2e77b84a37ed99fd16a2e
+  metadata.gz: 642dae47bcd9b8a9acf5d91738804f26011e5d392013e16c0a82f57e1174021e6f31ace53d8e5ffc54435237ba167b28ad8d42551b7c0b525047e360e8d9e860
+  data.tar.gz: 594124734d8e3e917fc2888800e2bcbda79afcf9db326bfd3eda22b2c6934aae074733316f38d7e87f34a813d537893bb4340edd8b3e766c031f582027960036

data/lib/envandle/element.rb

@@ -52,10 +52,20 @@ module Envandle
       children_by_type(child.type) << child
     end
 
-    def exec(context)
-      executable_argsets.each do |i|
-        i.send_to context
+    def send_to_bundler(receiver)
+      bundler_argsets.each do |i|
+        i.send_to receiver
       end
     end
+
+    def send_to_history(receiver)
+      history_argsets.each do |i|
+        i.send_to receiver
+      end
+    end
+
+    def history_argsets
+      bundler_argsets
+    end
   end
 end

data/lib/envandle/elements/gem.rb

@@ -10,19 +10,19 @@ module Envandle
         :gem
       end
 
-      def extract_executable_argsets(a, cache)
+      def extract_bundler_argsets(a, cache)
         found = false
         @args.contextual_groups.each do |group|
-          if gemfile.references.extract_executable_argsets(@args, group, @name, a, cache)
+          if gemfile.references.extract_bundler_argsets(@args, group, @name, a, cache)
             found = true
           end
         end
         a << Argset.new(:gem, *@args.args_and_options) unless found
       end
 
-      def executable_argsets
-        @executable_argsets ||= [].tap do |a|
-          extract_executable_argsets a, {}
+      def bundler_argsets
+        @bundler_argsets ||= [].tap do |a|
+          extract_bundler_argsets a, {}
         end
       end
     end

data/lib/envandle/elements/gemfile.rb

@@ -13,25 +13,54 @@ module Envandle
         dsl_method :git_source
       end
 
+      DUMP = ENV["ENVANDLE_DUMP"].to_s
+
       def initialize(file, binding, config_dir = nil)
         super Location.new(file, 1), nil
-        @binding = binding
+        @bundler_binding = dumps? ? History.new : binding
         @config_dir = config_dir
       end
 
-      def binding_receiver
-        @binding.receiver
+      def bundler_receiver
+        @bundler_binding.receiver
+      end
+
+      def history
+        @history ||= History.new
       end
 
       def draw(&block)
         super
         exec
+        dump if dumps?
+      end
+
+      def dumps?
+        !DUMP.empty?
+      end
+
+      def dump
+        dump_file do |f|
+          f << JSON.pretty_generate(history.argsets)
+        end
+      end
+
+      def dump_file(&block)
+        case DUMP
+        when "1"
+          yield $stdout
+        when "2"
+          yield $stderr
+        else
+          File.open DUMP, "w", &block
+        end
       end
 
       def exec
-        receiver = @binding.receiver
+        receiver = bundler_receiver
         children.each do |child|
-          child.exec receiver
+          child.send_to_bundler receiver
+          child.send_to_history history
         end
         references.left.each do |k, v|
           v.to_executable_argset(Argset.new(nil)).send_to receiver

data/lib/envandle/elements/gemspec.rb

@@ -15,8 +15,8 @@ module Envandle
         :gemspec
       end
 
-      def executable_argsets
-        @executable_argsets ||= begin
+      def bundler_argsets
+        @bundler_argsets ||= begin
           [].tap do |a|
             path = @path || ::Envandle::Gemspec.find_file(gemfile.dir, name: @name)
             spec = ::Envandle::Gemspec.new(path)
@@ -27,7 +27,7 @@ module Envandle
               argset = Argset.new(nil, i.name, *i.requirements_list)
               argset.options[:group] = group if group
               gem = Gem.new(@loc, @context, *argset.args_and_options)
-              gem.extract_executable_argsets a, found
+              gem.extract_bundler_argsets a, found
             end
           end
         end

data/lib/envandle/elements/git_source_block.rb

@@ -8,11 +8,17 @@ module Envandle
         :git_source_block
       end
 
-      def executable_argsets
-        @executable_argsets ||= [].tap do |a|
+      def bundler_argsets
+        @bundler_argsets ||= [].tap do |a|
           a << Argset.new(:git_source, *@args.args_and_options, &@args.block)
         end
       end
+
+      def history_argsets
+        @history_argsets ||= [].tap do |a|
+          a << Argset.new(:git_source, *@args.args_and_options, @args.block.class.name)
+        end
+      end
     end
   end
 end

data/lib/envandle/elements/group_block.rb

@@ -22,11 +22,22 @@ module Envandle
         @groups ||= @args.args.dup
       end
 
-      def executable_argsets
-        @executable_argsets ||= [].tap do |a|
+      def bundler_argsets
+        @bundler_argsets ||= [].tap do |a|
           a << Argset.new(:group, *@args.args_and_options) do
+            receiver = gemfile.bundler_receiver
             children.each do |child|
-              child.exec gemfile.binding_receiver
+              child.send_to_bundler receiver
+            end
+          end
+        end
+      end
+
+      def history_argsets
+        @history_argsets ||= [].tap do |a|
+          a << Argset.new(:group, *@args.args_and_options) do |history|
+            children.each do |child|
+              child.send_to_history history
             end
           end
         end

data/lib/envandle/elements/source.rb

@@ -5,8 +5,8 @@ module Envandle
         :source
       end
 
-      def executable_argsets
-        @executable_argsets ||= [].tap do |a|
+      def bundler_argsets
+        @bundler_argsets ||= [].tap do |a|
           a << Argset.new(:source, *@args.args_and_options)
         end
       end

data/lib/envandle/history.rb

@@ -0,0 +1,29 @@
+module Envandle
+  class History
+    def receiver
+      self
+    end
+
+    def argsets
+      @argsets ||= []
+    end
+
+    def method_missing(name, *args, &block)
+      add_argset name, *args, &block
+    end
+
+    def add_argset(name, *args, &block)
+      a = [name, *args]
+      argsets << a
+      if block
+        h = History.new
+        block.call h
+        a << h.argsets
+      end
+    end
+
+    def gem(*args)
+      add_argset :gem, *args
+    end
+  end
+end

data/lib/envandle/reference_cache.rb

@@ -67,14 +67,14 @@ module Envandle
       klass.new(@context, parse_name(env, name), url, ref)
     end
 
-    def extract_executable_argsets(base, group, name, argsets, found = {})
+    def extract_bundler_argsets(base, group, name, argsets, found = {})
       key = Envandle.reference_key(group, name)
       return true if found.key?(key)
       found[key] = true
       if ref = use(name)
         ref.spec.runtime_dependencies.each do |i|
           if ref2 = use(i.name)
-            extract_executable_argsets base, nil, i.name, argsets, found
+            extract_bundler_argsets base, nil, i.name, argsets, found
           end
         end
         args = base.dup

data/lib/envandle/version.rb

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

data/lib/envandle.rb

@@ -2,6 +2,7 @@ autoload :FileUtils, "fileutils" unless Object::const_defined?(:FileUtils) && !O
 autoload :Mutex, "thread" unless Object::const_defined?(:Mutex) && !Object::autoload?(:Mutex)
 autoload :Open3, "open3" unless Object::const_defined?(:Open3) && !Object::autoload?(:Open3)
 autoload :YAML, "yaml" unless Object::const_defined?(:YAML) && !Object::autoload?(:YAML)
+autoload :JSON, "json" unless Object::const_defined?(:JSON) && !Object::autoload?(:JSON)
 require "envandle/version"
 require "envandle/exceptions"
 require "envandle/helper"
@@ -19,6 +20,7 @@ module Envandle
   autoload :Gemspec, "envandle/gemspec"
   autoload :GitBranchReference, "envandle/git_branch_reference"
   autoload :GitUtil, "envandle/git_util"
+  autoload :History, "envandle/history"
   autoload :Location, "envandle/location"
   autoload :PathReference, "envandle/path_reference"
   autoload :ReferenceCache, "envandle/reference_cache"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envandle
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - mosop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/envandle/git_branch_reference.rb
 - lib/envandle/git_util.rb
 - lib/envandle/helper.rb
+- lib/envandle/history.rb
 - lib/envandle/location.rb
 - lib/envandle/path_reference.rb
 - lib/envandle/reference_cache.rb