envandle 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca4f6faadb9b5212f25212d23ab42ab36d9e1c5
-  data.tar.gz: 00da2b9a9de635373d09654e47f52c391b28b6ba
+  metadata.gz: ff69392778f46788da2d586a57395dd909d84936
+  data.tar.gz: 601ea8bffd72c9460f953b6356702cda831f1ec3
 SHA512:
-  metadata.gz: 98977a5f9a1f7b29e0b1222693cf6f04cb8ea409ab1c31aa3ac67bf7fed328cda2b6818f31c6690ce62395f937c76754ecce5388d0514b1804c851639b4c50ab
-  data.tar.gz: 2f70f6b8b345f854c8fffe4791ba47e56b432d7602136c1f91c4cb523dc9d702db1ffd03be287b8fa67d1f451b5f03f50801389ff7915a7aa9870df2f547bdcf
+  metadata.gz: 70fe6bade653580f5351ebd44ab4bb8ddd476dcd2ccd0a3f85efc05c0f5ef95894d98eb3990c973f6a9d397ea122db4d0559221f13ed739560677c5a194461e6
+  data.tar.gz: 1794974ec6611b2e511e599939da7c9c03a7cea7064f241f45a08b8f1a281587bf90c2034f0eb858e8ceb0026a6a622e7a3171aa6fdc4c7db747d3c71d05ef38

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.3.3
 before_install: gem install bundler -v 1.13.6

data/README.md

@@ -2,6 +2,8 @@
 
 A rubygem for enabling Gemfiles to specify gem locations from environment variables.
 
+[![Build Status](https://travis-ci.org/mosop/envandle.svg?branch=master)](https://travis-ci.org/mosop/envandle)
+
 ## Installation
 
 ```sh
@@ -10,14 +12,14 @@ $ gem install envandle
 
 ## Usage
 
-Write a Gemfile.
+Enclose your Gemfile's code with an envandle block.
 
 ```ruby
 require "envandle"
 
-source "https://rubygems.org"
+binding.envandle do
+  source "https://rubygems.org"
 
-binding.envandle do |bundle|
   bundle.gem "mygem", "~> 1.0"
 end
 ```
@@ -45,8 +47,10 @@ For example,
 ```ruby
 ENV["ENVANDLE_GEM_PATH"] = "mygem:/path/to/mygem"
 
-binding.envandle do |bundle|
-  bundle.gem "mygem", "~> 1.0"
+binding.envandle do
+  source "https://rubygems.org"
+
+  gem "mygem", "~> 1.0"
 end
 ```
 
@@ -61,8 +65,10 @@ If the variable is not set,
 ```ruby
 ENV["ENVANDLE_GEM_PATH"] = ""
 
-binding.envandle do |bundle|
-  bundle.gem "mygem", "~> 1.0"
+binding.envandle do
+  source "https://rubygems.org"
+
+  gem "mygem", "~> 1.0"
 end
 ```
 
@@ -81,8 +87,10 @@ For example,
 ```ruby
 ENV["ENVANDLE_GEM_GIT_BRANCH"] = "mygem:https://github.com/mosop/mygem.git#edge"
 
-binding.envandle do |bundle|
-  bundle.gem "mygem", "~> 1.0"
+envandle do
+  source "https://rubygems.org"
+
+  gem "mygem", "~> 1.0"
 end
 ```
 
@@ -97,8 +105,10 @@ If the variable is not set,
 ```ruby
 ENV["ENVANDLE_GEM_GIT_BRANCH"] = ""
 
-binding.envandle do |bundle|
-  bundle.gem "mygem", "~> 1.0"
+binding.envandle do
+  source "https://rubygems.org"
+
+  gem "mygem", "~> 1.0"
 end
 ```
 
@@ -117,8 +127,10 @@ For example, if your gem's name is "mygem", the gemspec refers the a, b and c ge
 ```ruby
 ENV["ENVANDLE_GEM_PATH"] = "a:/path/to/a;b:/path/to/b"
 
-binding.envandle do |bundle|
-  bundle.gemspec
+binding.envandle do
+  source "https://rubygems.org"
+
+  gemspec
 end
 ```
 
@@ -138,8 +150,10 @@ For example, if a Gemfile refers the gem a that depends on the gem b, Envandle a
 ```ruby
 ENV["ENVANDLE_GEM_PATH"] = "a:/path/to/a;b:/path/to/b"
 
-binding.envandle do |bundle|
-  bundle.gem "a", "~> 1.0"
+binding.envandle do
+  source "https://rubygems.org"
+
+  gem "a", "~> 1.0"
 end
 ```
 

data/lib/envandle/argset.rb

@@ -0,0 +1,61 @@
+module Envandle
+  class Argset
+    def initialize(context, *args, &block)
+      @context = context
+      @args = args
+      h = Envandle.options!(args)
+      @options = {}
+      h.each do |k, v|
+        @options[k.to_s.to_sym] = v
+      end
+      @block = block
+    end
+
+    attr_reader :args, :options, :block
+
+    def dup
+      Argset.new(@context, *@args.dup, @options.dup, &@block)
+    end
+
+    def clear_reference
+      @args = [@args[0]]
+      @options.delete :path
+      @options.delete :git
+      @options.delete :github
+      @options.delete :ref
+      @options.delete :branch
+      @options.delete :tag
+    end
+
+    def args_and_options
+      @args_and_options ||= begin
+        if @options.empty?
+          [*@args]
+        else
+          [*@args, @options]
+        end
+      end
+    end
+
+    def to_s
+      a = [@context, *args_and_options]
+      a << @block if @block
+      a.to_s
+    end
+
+    def send_to(o)
+      o.__send__ @context, *args_and_options, &@block
+    end
+
+    def contextual_groups
+      @contextual_groups ||= get_contexutual_groups
+    end
+
+    def get_contexutual_groups
+      if option = @options[:groups] || @options[:group]
+        return option.is_a?(Array) ? option : [option]
+      end
+      @context.groups_or_default
+    end
+  end
+end

data/lib/envandle/as_context.rb

@@ -0,0 +1,16 @@
+module Envandle
+  module AsContext
+    def self.extended(mod)
+      mod.class_eval do
+        def gemfile
+          @context.gemfile
+        end
+
+        def groups_or_default
+          a = groups
+          a.empty? ? [nil] : a
+        end
+      end
+    end
+  end
+end

data/lib/envandle/as_dsl.rb

@@ -0,0 +1,23 @@
+module Envandle
+  module AsDsl
+    def self.extended(mod)
+      mod.class_eval do
+        def initialize(e)
+          @element = e
+        end
+      end
+    end
+
+    def dsl_method(name)
+      name = name.to_s
+      class_name = Envandle.pascal(name)
+      block_class_name = "#{class_name}Block"
+      define_method name do |*args, &block|
+        klass = ::Envandle::Elements.const_get(block ? block_class_name : class_name)
+        o = klass.new(::Envandle.loc, @element, *args, &block)
+        @element << o
+        o.draw
+      end
+    end
+  end
+end

data/lib/envandle/as_reference.rb

@@ -5,7 +5,7 @@ module Envandle
         attr_reader :group, :name
 
         def key
-          @key ||= ReferenceCache.key(group, name)
+          @key ||= ::Envandle.reference_key(group, name)
         end
       end
     end

data/lib/envandle/binding.rb

@@ -1,12 +1,7 @@
 require "envandle/lib"
 
 class Binding
-  def envandle
-    /^(.+?):(\d+)(?::in `(.*)')?/ =~ caller(1, 1).first
-    yield ::Envandle::BundleDsl.new(::Envandle::Gemfile.new($1, self))
-  end
-
-  def gem(*args)
-    receiver.__send__ :gem, *args
+  def envandle(&block)
+    ::Envandle::Elements::Gemfile.new(::Envandle.loc.file, self).draw &block
   end
 end

data/lib/envandle/elements/element.rb

@@ -0,0 +1,61 @@
+module Envandle
+  class Element
+    def initialize(loc, context, *args, &block)
+      @loc = loc
+      @context = context
+      @args = Argset.new(self, *args, &block)
+    end
+
+    def parse_string_value(v, type)
+      if v
+        v = v.to_s.strip
+        Envandle.arg! @loc, type if v.empty?
+        v
+      end
+    end
+
+    def parse_string_option(name, type)
+      parse_string_value(@args.options[name], type)
+    end
+
+    def gemfile
+      @context.gemfile
+    end
+
+    def groups_or_default
+      @context.groups_or_default
+    end
+
+    def dsl
+      self.class::Dsl.new(self)
+    end
+
+    def draw(&block)
+      block ||= @args.block
+      dsl.instance_exec &block if block
+    end
+
+    def children
+      @children ||= []
+    end
+
+    def children_by_type(type = nil)
+      if type
+        (@children_by_type ||= {})[type] ||= []
+      else
+        @children_by_type ||= {}
+      end
+    end
+
+    def <<(child)
+      children << child
+      children_by_type(child.type) << child
+    end
+
+    def exec(context)
+      executable_argsets.each do |i|
+        i.send_to context
+      end
+    end
+  end
+end

data/lib/envandle/elements/gem.rb

@@ -0,0 +1,30 @@
+module Envandle
+  module Elements
+    class Gem < Element
+      def initialize(*)
+        super
+        @name = parse_string_value(@args.args[0].to_s, "gem name")
+      end
+
+      def type
+        :gem
+      end
+
+      def extract_executable_argsets(a, cache)
+        found = false
+        @args.contextual_groups.each do |group|
+          if gemfile.references.extract_executable_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, {}
+        end
+      end
+    end
+  end
+end

data/lib/envandle/elements/gemfile.rb

@@ -0,0 +1,71 @@
+module Envandle
+  module Elements
+    class Gemfile < Element
+      extend AsContext
+
+      class Dsl
+        extend AsDsl
+
+        dsl_method :source
+        dsl_method :group
+        dsl_method :gem
+        dsl_method :gemspec
+        dsl_method :git_source
+      end
+
+      def initialize(file, binding, config_dir = nil)
+        super Location.new(file, 1), nil
+        @binding = binding
+        @config_dir = config_dir
+      end
+
+      def binding_receiver
+        @binding.receiver
+      end
+
+      def draw(&block)
+        super
+        exec
+      end
+
+      def exec
+        receiver = @binding.receiver
+        children.each do |child|
+          child.exec receiver
+        end
+      end
+
+      def dir
+        @dir ||= File.dirname(@loc.file)
+      end
+
+      def config_dir
+        @config_dir ||= File.join(dir, ".envandle")
+      end
+
+      def gemfile
+        self
+      end
+
+      def references
+        @references ||= ReferenceCache.new(self)
+      end
+
+      def gemspecs
+        @gemspecs ||= GemspecCache.new(File.join(config_dir, "cache", "gemspecs"))
+      end
+
+      def sources
+        children_by_type(:source)
+      end
+
+      def source_urls
+        sources.map{|i| i.url}
+      end
+
+      def groups
+        []
+      end
+    end
+  end
+end

data/lib/envandle/elements/gemspec.rb

@@ -0,0 +1,37 @@
+module Envandle
+  module Elements
+    class Gemspec < Element
+      extend AsContext
+
+      def initialize(*)
+        super
+        dev_group = parse_string_option(:development_group, "gemspec's development group") || :development
+        @development_group = dev_group ? dev_group.to_s.to_sym : :development
+        @name = parse_string_option(:name, "gemspec's name")
+        @path = parse_string_option(:path, "gemspec's path")
+      end
+
+      def type
+        :gemspec
+      end
+
+      def executable_argsets
+        @executable_argsets ||= begin
+          [].tap do |a|
+            path = @path || ::Envandle::Gemspec.find_file(gemfile.dir, name: @name)
+            spec = ::Envandle::Gemspec.new(path)
+            a << Argset.new(:gem, spec.name, path: ".")
+            found = {}
+            spec.dependencies.each do |i|
+              group = i.type == :development ? @development_group : nil
+              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
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/envandle/elements/git_source_block.rb

@@ -0,0 +1,18 @@
+module Envandle
+  module Elements
+    class GitSourceBlock < Element
+      def draw
+      end
+
+      def type
+        :git_source_block
+      end
+
+      def executable_argsets
+        @executable_argsets ||= [].tap do |a|
+          a << Argset.new(:git_source, *@args.args_and_options, &@args.block)
+        end
+      end
+    end
+  end
+end

data/lib/envandle/elements/group_block.rb

@@ -0,0 +1,36 @@
+module Envandle
+  module Elements
+    class GroupBlock < Element
+      extend AsContext
+
+      class Dsl
+        extend AsDsl
+
+        dsl_method :gem
+      end
+
+      def initialize(*)
+        super
+        Envandle.arg! @loc, "No group names." if @args.args.empty?
+      end
+
+      def type
+        :group_block
+      end
+
+      def groups
+        @groups ||= @args.args.dup
+      end
+
+      def executable_argsets
+        @executable_argsets ||= [].tap do |a|
+          a << Argset.new(:group, *@args.args_and_options) do
+            children.each do |child|
+              child.exec gemfile.binding_receiver
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/envandle/elements/illegal_element.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class IllegalElement
+    def initialize(loc, *)
+      Envandle.legal! loc, type
+    end
+  end
+end

data/lib/envandle/elements/illegals_and_unsupporteds.rb

@@ -0,0 +1,31 @@
+module Envandle
+  class GemBlock < IllegalElement
+    def type
+      "gem with block"
+    end
+  end
+
+  class GemspecBlock < IllegalElement
+    def type
+      "gemspec with block"
+    end
+  end
+
+  class GitSource < IllegalElement
+    def type
+      "git_source without block"
+    end
+  end
+
+  class Group < IllegalElement
+    def type
+      "group without block"
+    end
+  end
+
+  class SourceBlock < UnsupportedElement
+    def type
+      "source with block"
+    end
+  end
+end

data/lib/envandle/elements/source.rb

@@ -0,0 +1,15 @@
+module Envandle
+  module Elements
+    class Source < Element
+      def type
+        :source
+      end
+
+      def executable_argsets
+        @executable_argsets ||= [].tap do |a|
+          a << Argset.new(:source, *@args.args_and_options)
+        end
+      end
+    end
+  end
+end

data/lib/envandle/elements/unsupported_element.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class UnsupportedElement
+    def initialize(loc, *)
+      Envandle.support! loc, type
+    end
+  end
+end

data/lib/envandle/elements.rb

@@ -0,0 +1,10 @@
+require "envandle/elements/element"
+require "envandle/elements/illegal_element"
+require "envandle/elements/unsupported_element"
+require "envandle/elements/gem"
+require "envandle/elements/gemfile"
+require "envandle/elements/gemspec"
+require "envandle/elements/git_source_block"
+require "envandle/elements/group_block"
+require "envandle/elements/illegals_and_unsupporteds"
+require "envandle/elements/source"

data/lib/envandle/exceptions.rb

@@ -0,0 +1,13 @@
+module Envandle
+  def self.arg!(loc, type)
+    raise ArgumentError.new("Missing argument: #{type} (#{loc})")
+  end
+
+  def self.legal!(loc, type)
+    raise ArgumentError.new("Illegal element: #{type} (#{loc})")
+  end
+
+  def self.support!(loc, type)
+    raise NotImplementedError.new("Unsupported element: #{type} (#{loc})")
+  end
+end

data/lib/envandle/gemspec_cache.rb

@@ -0,0 +1,64 @@
+module Envandle
+  class GemspecCache
+    @@mutex = Mutex.new
+
+    def initialize(path)
+      @path = path
+      FileUtils.mkdir_p @path
+    end
+
+    def with_file
+      path = File.join(@path, "list")
+      @@mutex.synchronize do
+        File.open(path, File::RDWR | File::CREAT) do |f|
+          f.flock File::LOCK_EX
+          yield f
+        end
+      end
+    end
+
+    def append(url, dir)
+      with_file do |f|
+        data = YAML.load(f.read) || {}
+        data[url] = dir
+        f.rewind
+        f.write data.to_yaml
+        f.flush
+        f.truncate f.pos
+      end
+    end
+
+    def load
+      with_file do |f|
+        YAML.load(f.read) || {}
+      end
+    end
+
+    def find(url)
+      if dir = load[url]
+        File.join(@path, dir)
+      end
+    end
+
+    def reserve
+      Reserved.new(@path)
+    end
+
+    class Reserved
+      def initialize(cache_path)
+        @cache_path = cache_path
+        @path = Dir.mktmpdir(nil, cache_path)
+      end
+
+      attr_reader :path
+
+      def url=(v)
+        @url = v
+      end
+
+      def save
+        GemspecCache.new(@cache_path).append @url, @path[(@cache_path.size+1)..-1]
+      end
+    end
+  end
+end

data/lib/envandle/git.rb

@@ -1,15 +1,50 @@
 module Envandle
-  GIT = `which git`.chomp
+  GIT_BIN = `which git`.chomp
 
-  def self.git_pull(url, ref, branch)
-    raise "No git installed." if GIT.empty?
-    Dir.mktmpdir do |tmp|
-      Dir.chdir(tmp) do
-        sh "#{GIT} init"
-        sh "#{GIT} remote add origin #{url}"
-        sh "#{GIT} checkout -b #{branch}"
-        sh "#{GIT} pull origin #{ref}:#{branch}"
-        yield tmp
+  def self.raise_if_no_git_installed
+    raise "No git installed." if GIT_BIN.empty?
+  end
+
+  def self.git_init(dir, url, &block)
+    unless dir
+      Dir.mktmpdir do |tmpdir|
+        git_init tmpdir, url, &block
+      end
+    else
+      raise_if_no_git_installed
+      Dir.chdir(dir) do
+        sh "#{GIT_BIN} init"
+        sh "#{GIT_BIN} remote add origin #{url}"
+        yield dir if block_given?
+      end
+    end
+  end
+
+  def self.git_ls_remote_sha(dir, q)
+    Dir.chdir(dir) do
+      data = sh("#{GIT_BIN} ls-remote origin #{q}").chomp
+      data = if data.empty?
+        []
+      else
+        data.split("\n").map{|i| i.split(/\s+/)[0] }
+      end
+      if block_given?
+        yield data
+      else
+        data
+      end
+    end
+  end
+
+  def self.git_pull(dir, ref, branch)
+    Dir.chdir(dir) do
+      sh "#{GIT_BIN} checkout -b #{branch}"
+      sh "#{GIT_BIN} pull origin #{ref}:#{branch}"
+      sha = sh("#{GIT_BIN} rev-parse HEAD").chomp
+      if block_given?
+        yield sha
+      else
+        sha
       end
     end
   end

data/lib/envandle/git_branch_reference.rb

@@ -2,21 +2,41 @@ module Envandle
   class GitBranchReference
     extend AsGitReference
 
-    def initialize(group, name, url, ref)
+    def initialize(context, group, name, url, ref)
+      @context = context
       @group = group
       @name = name
       @url = url
       @ref = ref
     end
 
-    def to_gem(args, options)
-      Gem.new(@group, @name, [], {git: @url, branch: @ref})
-    end
-
     def spec
-      Envandle.git_pull(@url, @ref, @ref) do |dir|
+      @spec ||= begin
+        cache = @context.gemfile.gemspecs
+        shas = Envandle.git_init(nil, @url) do |dir|
+          Envandle.git_ls_remote_sha(dir, "refs/heads/#{@ref}")
+        end
+        sha = shas[0]
+        cache_url = "#{@url}##{sha}"
+        raise "Can't get a git commit. (url: #{@url}, branch: #{@ref})" unless sha
+        dir = cache.find(cache_url) || begin
+          reserve = cache.reserve
+          Envandle.git_init reserve.path, @url
+          sha = Envandle.git_pull(reserve.path, @ref, "master")
+          reserve.url = cache_url
+          reserve.save
+          reserve.path
+        end
         Gemspec.new(File.join(dir, "#{@name}.gemspec"))
       end
     end
+
+    def to_executable_argset(base)
+      args = base.dup
+      args.clear_reference
+      args.options[:git] = @url
+      args.options[:branch] = @ref
+      Argset.new(:gem, *args.args_and_options)
+    end
   end
 end

data/lib/envandle/helper.rb

@@ -0,0 +1,22 @@
+module Envandle
+  def self.options!(args)
+    args.last.is_a?(Hash) ? args.pop : {}
+  end
+
+  def self.loc(level = 2)
+    /^(.+?):(\d+)(?::in `(.*)')?/ =~ caller(level, 1).first
+    Location.new($1, $2.to_i)
+  end
+
+  def self.pascal(s)
+    s.split("_").map{|i| i.capitalize}.join("")
+  end
+
+  def self.reference_key(group, name)
+    if group
+      "#{name}@#{group}"
+    else
+      name
+    end
+  end
+end

data/lib/envandle/lib.rb

@@ -1,14 +1,21 @@
+require "open3"
+require "thread"
 require "tmpdir"
+require "yaml"
 require "envandle/version"
-require "envandle/as_reference"
+require "envandle/helper"
+require "envandle/exceptions"
+require "envandle/as_context"
+require "envandle/as_dsl"
 require "envandle/as_git_reference"
-require "envandle/bundle_dsl"
-require "envandle/gem"
-require "envandle/gemfile"
+require "envandle/as_reference"
+require "envandle/argset"
+require "envandle/elements"
+require "envandle/location"
 require "envandle/gemspec"
+require "envandle/gemspec_cache"
 require "envandle/git"
 require "envandle/git_branch_reference"
-require "envandle/group_dsl"
 require "envandle/path_reference"
 require "envandle/shell"
 require "envandle/reference_cache"

data/lib/envandle/location.rb

@@ -0,0 +1,12 @@
+class Location
+  def initialize(file, line)
+    @file = file
+    @line = line
+  end
+
+  attr_reader :file, :line
+
+  def to_s
+    "#{@file}:#{@line}"
+  end
+end

data/lib/envandle/path_reference.rb

@@ -2,18 +2,22 @@ module Envandle
   class PathReference
     extend AsReference
 
-    def initialize(group, name, path)
+    def initialize(context, group, name, path)
+      @context = context
       @group = group
       @name = name
       @path = path
     end
 
-    def to_gem(args, options)
-      Gem.new(@group, @name, [], {path: @path})
-    end
-
     def spec
       @spec ||= Gemspec.new(Gemspec.find_file(@path, name: @name))
     end
+
+    def to_executable_argset(base)
+      args = base.dup
+      args.clear_reference
+      args.options[:path] = @path
+      Argset.new(:gem, *args.args_and_options)
+    end
   end
 end

data/lib/envandle/reference_cache.rb

@@ -1,14 +1,11 @@
 module Envandle
   class ReferenceCache
-    def self.key(group, name)
-      if group
-        "#{name}@#{group}"
-      else
-        name
-      end
+    def initialize(context)
+      @context = context
     end
 
-    def find(key, name)
+    def find(group, name)
+      key = Envandle.reference_key(group, name)
       paths[key] ||
       git_branches[key] ||
       paths[name] ||
@@ -49,7 +46,7 @@ module Envandle
       name = a[0].to_s.strip
       path = a[1..-1].join(":").to_s.strip
       raise "No gem path (#{env}): #{ENV[env]}" if path.empty?
-      klass.new(*parse_group_and_name(env, name), path)
+      klass.new(@context, *parse_group_and_name(env, name), path)
     end
 
     def parse_git(klass, env, v)
@@ -63,7 +60,26 @@ module Envandle
       ref = url_and_ref[1].to_s.strip
       raise "No gem git url (#{env}): #{ENV[env]}" if url.empty?
       raise "No gem git ref/branch/tag (#{env}): #{ENV[env]}" if ref.empty?
-      klass.new(*parse_group_and_name(env, name), url, ref)
+      klass.new(@context, *parse_group_and_name(env, name), url, ref)
+    end
+
+    def extract_executable_argsets(base, group, name, argsets, found = {})
+      key = Envandle.reference_key(group, name)
+      return true if found.key?(key)
+      found[key] = true
+      if ref = find(group, name)
+        ref.spec.runtime_dependencies.each do |i|
+          if ref2 = find(nil, i.name)
+            extract_executable_argsets base, nil, i.name, argsets, found
+          end
+        end
+        args = base.dup
+        args.args[0] = name
+        argsets << ref.to_executable_argset(args)
+        true
+      else
+        false
+      end
     end
   end
 end

data/lib/envandle/shell.rb

@@ -1,6 +1,8 @@
 module Envandle
   def self.sh(cmd)
-    system cmd, out: "/dev/null", err: "/dev/null"
-    raise "Command error: #{cmd}" unless $?.success?
+    # output, status = Open3.capture2(cmd)
+    output, error, status = Open3.capture3(cmd)
+    raise "Command error: #{cmd}" unless status.success?
+    output
   end
 end

data/lib/envandle/version.rb

@@ -1,3 +1,3 @@
 module Envandle
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envandle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - mosop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,17 +68,31 @@ files:
 - bin/setup
 - envandle.gemspec
 - lib/envandle.rb
+- lib/envandle/argset.rb
+- lib/envandle/as_context.rb
+- lib/envandle/as_dsl.rb
 - lib/envandle/as_git_reference.rb
 - lib/envandle/as_reference.rb
 - lib/envandle/binding.rb
-- lib/envandle/bundle_dsl.rb
-- lib/envandle/gem.rb
-- lib/envandle/gemfile.rb
+- lib/envandle/elements.rb
+- lib/envandle/elements/element.rb
+- lib/envandle/elements/gem.rb
+- lib/envandle/elements/gemfile.rb
+- lib/envandle/elements/gemspec.rb
+- lib/envandle/elements/git_source_block.rb
+- lib/envandle/elements/group_block.rb
+- lib/envandle/elements/illegal_element.rb
+- lib/envandle/elements/illegals_and_unsupporteds.rb
+- lib/envandle/elements/source.rb
+- lib/envandle/elements/unsupported_element.rb
+- lib/envandle/exceptions.rb
 - lib/envandle/gemspec.rb
+- lib/envandle/gemspec_cache.rb
 - lib/envandle/git.rb
 - lib/envandle/git_branch_reference.rb
-- lib/envandle/group_dsl.rb
+- lib/envandle/helper.rb
 - lib/envandle/lib.rb
+- lib/envandle/location.rb
 - lib/envandle/path_reference.rb
 - lib/envandle/reference_cache.rb
 - lib/envandle/shell.rb
@@ -103,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A library for enabling Gemfiles to specify gem locations from environment

data/lib/envandle/bundle_dsl.rb

@@ -1,31 +0,0 @@
-module Envandle
-  class BundleDsl
-    def initialize(gemfile)
-      @gemfile = gemfile
-    end
-
-    def gem(*args)
-      @gemfile.gem nil, *args
-    end
-
-    def group(name)
-      yield GroupDsl.new(@gemfile, name)
-    end
-
-    def gemspec(development_group: "development", path: nil, name: nil)
-      development_group = development_group.to_s.strip
-      raise "No gemspec's development group." if development_group.empty?
-      name = name.to_s.strip if name
-      raise "No gemspec's name." if name && name.empty
-      path ||= Gemspec.find_file(@gemfile.dir, name: name)
-      path = path.to_s.strip
-      raise "No gemspec's path." if path.empty?
-      spec = Gemspec.new(path)
-      @gemfile.gem nil, spec.name, path: "."
-      spec.dependencies.each do |i|
-        group = i.type == :development ? development_group : nil
-        @gemfile.gem group, i.name, *i.requirements_list
-      end
-    end
-  end
-end

data/lib/envandle/gem.rb

@@ -1,20 +0,0 @@
-module Envandle
-  class Gem
-    def initialize(group, name, args, options)
-      @group = group
-      @name = name
-      @args = args
-      @options = options
-    end
-
-    def args
-      h = @group ? {group: @group} : {}
-      h.merge! @options
-      if h.empty?
-        [@name, *@args]
-      else
-        [@name, *@args, h]
-      end
-    end
-  end
-end

data/lib/envandle/gemfile.rb

@@ -1,48 +0,0 @@
-module Envandle
-  class Gemfile
-    def initialize(path, binding)
-      @path = path
-      @binding = binding
-    end
-
-    def dir
-      @dir ||= File.dirname(@path)
-    end
-
-    def gems
-      @gems ||= {}
-    end
-
-    def references
-      @references ||= ReferenceCache.new
-    end
-
-    def append(group, name, args, options)
-      key = ReferenceCache.key(group, name)
-      gems[key] || begin
-        if ref = references.find(key, name)
-          gem = ref.to_gem(args, options)
-          gems[key] = gem
-          ref.spec.runtime_dependencies.each do |i|
-            append nil, i.name, [], {}
-          end
-          @binding.gem *gem.args
-        else
-          gems[key] = gem = Gem.new(group, name, args, options)
-          @binding.gem *gem.args
-        end
-      end
-    end
-
-    def gem(group, *args)
-      h = args.last.is_a?(Hash) ? args.pop : {}
-      options = {}
-      h.each do |k, v|
-        options[k.to_s.to_sym] = v
-      end
-      name = args.shift.to_s.strip
-      raise "No gem name." if name.empty?
-      append group, name, args, options
-    end
-  end
-end

data/lib/envandle/group_dsl.rb

@@ -1,14 +0,0 @@
-module Envandle
-  class GroupDsl
-    def initialize(world, name)
-      @world = world
-      name = name.to_s.strip
-      raise "No group name." if name.empty?
-      @name = name
-    end
-
-    def gem(*args)
-      world.gem @name, *args
-    end
-  end
-end