envandle 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff69392778f46788da2d586a57395dd909d84936
-  data.tar.gz: 601ea8bffd72c9460f953b6356702cda831f1ec3
+  metadata.gz: ac9db50e7977e1c07ba3f2a2f882d2dd00fa41e7
+  data.tar.gz: b570ef35b12e02cb3a47993a8676710563c32ef9
 SHA512:
-  metadata.gz: 70fe6bade653580f5351ebd44ab4bb8ddd476dcd2ccd0a3f85efc05c0f5ef95894d98eb3990c973f6a9d397ea122db4d0559221f13ed739560677c5a194461e6
-  data.tar.gz: 1794974ec6611b2e511e599939da7c9c03a7cea7064f241f45a08b8f1a281587bf90c2034f0eb858e8ceb0026a6a622e7a3171aa6fdc4c7db747d3c71d05ef38
+  metadata.gz: 802b941c80adf4b48a74c5ede5fb4e41f2f5da36c364518df007a0b286f3ae49ff95f87aa91e71cdcef6931c5ed0bf5644035e18f5d5b8ae7ded5e67efbd0600
+  data.tar.gz: 5c2185eecac33db45da7fefa71399ca0866372b810c50024a0ae63213d63d4bbcf836c55095bad39d086a7af118753464eef067f23c2e77b84a37ed99fd16a2e

data/README.md

@@ -20,7 +20,7 @@ require "envandle"
 binding.envandle do
   source "https://rubygems.org"
 
-  bundle.gem "mygem", "~> 1.0"
+  gem "mygem", "~> 1.0"
 end
 ```
 
@@ -163,3 +163,29 @@ is evaluated as:
 gem "a", path: "/path/to/a"
 gem "b", path: "/path/to/b"
 ```
+
+## install-envandle
+
+The install-envandle command just installs Envandle itself with the `bundle install` command. It's useful for successfully loading Envandle in your Gemfile with the Bundler's --path option.
+
+```
+$ install-envandle -h
+install-envandle [OPTIONS]
+
+Installs Envandle using Bundler.
+
+Options:
+  --envandle-source      gem source (default: https://rubygems.org)
+  --envandle-bundle-bin  command path (default: bundle)
+
+Additionally, you can specify all of the bundle-install's options.
+```
+
+### Usage Example
+
+```sh
+$ gem install bundler
+$ gem install envandle
+$ install-envandle --path vendor/bundle
+$ bundle install
+```

data/exe/install-envandle

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "envandle"
+require "tempfile"
+
+gem_source = "https://rubygems.org"
+bundle_bin = "bundle"
+
+args = []
+argv = ARGV.dup
+while arg = argv.shift
+  if arg.start_with?("--gemfile")
+    abort "--gemfile option not allowed."
+  end
+  case arg
+  when "--envandle-source"
+    gem_source = argv.shift
+  when "--envandle-bundle-bin"
+    bundle_bin = argv.shift
+  when "-h", "--help"
+    print <<-EOS
+install-envandle [OPTIONS]
+
+Installs Envandle using Bundler.
+
+Options:
+  --envandle-source      gem source (default: https://rubygems.org)
+  --envandle-bundle-bin  command path (default: bundle)
+
+Additionally, you can specify all of the bundle-install's options.
+EOS
+    exit
+  else
+    args << arg
+  end
+end
+
+abort "Invalid option: --envandle-source" unless gem_source
+abort "Invalid option: --bundle-bin" unless bundle_bin
+
+gemfile = Tempfile.new("install_envandle-Gemfile-", Dir.pwd)
+gemfile << <<-EOS
+source #{gem_source.inspect}
+gem "envandle", "#{Envandle::VERSION}"
+EOS
+gemfile.close
+code = system(bundle_bin, "install", "--gemfile", gemfile.path, *args) ? 0 : 1
+File.delete "#{gemfile.path}.lock"
+exit code

data/lib/envandle/as_reference.rb

@@ -2,11 +2,7 @@ module Envandle
   module AsReference
     def self.extended(mod)
       mod.class_eval do
-        attr_reader :group, :name
-
-        def key
-          @key ||= ::Envandle.reference_key(group, name)
-        end
+        attr_reader :name
       end
     end
   end

data/lib/envandle/binding.rb

@@ -1,5 +1,3 @@
-require "envandle/lib"
-
 class Binding
   def envandle(&block)
     ::Envandle::Elements::Gemfile.new(::Envandle.loc.file, self).draw &block

data/lib/envandle/elements/gem_block.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class GemBlock < IllegalElement
+    def type
+      "gem with block"
+    end
+  end
+end

data/lib/envandle/elements/gemfile.rb

@@ -33,6 +33,9 @@ module Envandle
         children.each do |child|
           child.exec receiver
         end
+        references.left.each do |k, v|
+          v.to_executable_argset(Argset.new(nil)).send_to receiver
+        end
       end
 
       def dir
@@ -51,6 +54,10 @@ module Envandle
         @references ||= ReferenceCache.new(self)
       end
 
+      def gem_keys
+        @gem_keys ||= {}
+      end
+
       def gemspecs
         @gemspecs ||= GemspecCache.new(File.join(config_dir, "cache", "gemspecs"))
       end

data/lib/envandle/elements/gemspec_block.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class GemspecBlock < IllegalElement
+    def type
+      "gemspec with block"
+    end
+  end
+end

data/lib/envandle/elements/git_source.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class GitSource < IllegalElement
+    def type
+      "git_source without block"
+    end
+  end
+end

data/lib/envandle/elements/group.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class Group < IllegalElement
+    def type
+      "group without block"
+    end
+  end
+end

data/lib/envandle/elements/source_block.rb

@@ -0,0 +1,7 @@
+module Envandle
+  class SourceBlock < UnsupportedElement
+    def type
+      "source with block"
+    end
+  end
+end

data/lib/envandle/elements.rb

@@ -1,10 +1,17 @@
-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"
+module Envandle
+  module Elements
+    autoload :GemBlock, "envandle/elements/gem_block"
+    autoload :Gem, "envandle/elements/gem"
+    autoload :Gemfile, "envandle/elements/gemfile"
+    autoload :GemspecBlock, "envandle/elements/gemspec_block"
+    autoload :Gemspec, "envandle/elements/gemspec"
+    autoload :GitSourceBlock, "envandle/elements/git_source_block"
+    autoload :GitSource, "envandle/elements/git_source"
+    autoload :GroupBlock, "envandle/elements/group_block"
+    autoload :Group, "envandle/elements/group"
+    autoload :IllegalElement, "envandle/elements/illegal_element"
+    autoload :SourceBlock, "envandle/elements/source_block"
+    autoload :Source, "envandle/elements/source"
+    autoload :UnsupportedElement, "envandle/elements/unsupported_element"
+  end
+end

data/lib/envandle/gemspec_cache.rb

@@ -47,7 +47,7 @@ module Envandle
     class Reserved
       def initialize(cache_path)
         @cache_path = cache_path
-        @path = Dir.mktmpdir(nil, cache_path)
+        @path = Envandle.tmpdir(nil, cache_path)
       end
 
       attr_reader :path

data/lib/envandle/git_branch_reference.rb

@@ -2,9 +2,8 @@ module Envandle
   class GitBranchReference
     extend AsGitReference
 
-    def initialize(context, group, name, url, ref)
+    def initialize(context, name, url, ref)
       @context = context
-      @group = group
       @name = name
       @url = url
       @ref = ref
@@ -13,16 +12,16 @@ module Envandle
     def spec
       @spec ||= begin
         cache = @context.gemfile.gemspecs
-        shas = Envandle.git_init(nil, @url) do |dir|
-          Envandle.git_ls_remote_sha(dir, "refs/heads/#{@ref}")
+        shas = Envandle::GitUtil.init(nil, @url) do |dir|
+          Envandle::GitUtil.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")
+          Envandle::GitUtil.init reserve.path, @url
+          sha = Envandle::GitUtil.pull(reserve.path, @ref, "master")
           reserve.url = cache_url
           reserve.save
           reserve.path
@@ -34,6 +33,7 @@ module Envandle
     def to_executable_argset(base)
       args = base.dup
       args.clear_reference
+      args.args[0] = @name
       args.options[:git] = @url
       args.options[:branch] = @ref
       Argset.new(:gem, *args.args_and_options)

data/lib/envandle/git_util.rb

@@ -0,0 +1,53 @@
+module Envandle
+  module GitUtil
+    BIN = `which git`.chomp
+
+    def self.raise_if_no_git_installed
+      raise "No git installed." if BIN.empty?
+    end
+
+    def self.init(dir, url, &block)
+      unless dir
+        Envandle.tmpdir do |tmpdir|
+          init tmpdir, url, &block
+        end
+      else
+        raise_if_no_git_installed
+        Dir.chdir(dir) do
+          Envandle.sh "#{BIN} init"
+          Envandle.sh "#{BIN} remote add origin #{url}"
+          yield dir if block_given?
+        end
+      end
+    end
+
+    def self.ls_remote_sha(dir, q)
+      Dir.chdir(dir) do
+        data = Envandle.sh("#{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.pull(dir, ref, branch)
+      Dir.chdir(dir) do
+        Envandle.sh "#{BIN} checkout -b #{branch}"
+        Envandle.sh "#{BIN} pull origin #{ref}:#{branch}"
+        sha = Envandle.sh("#{BIN} rev-parse HEAD").chomp
+        if block_given?
+          yield sha
+        else
+          sha
+        end
+      end
+    end
+  end
+end

data/lib/envandle/helper.rb

@@ -19,4 +19,15 @@ module Envandle
       name
     end
   end
+
+  def self.sh(cmd)
+    output, error, status = Open3.capture3(cmd)
+    raise "Command error: #{cmd}" unless status.success?
+    output
+  end
+
+  def self.tmpdir(*args, &block)
+    require "tmpdir"
+    Dir.mktmpdir *args, &block
+  end
 end

data/lib/envandle/path_reference.rb

@@ -2,9 +2,8 @@ module Envandle
   class PathReference
     extend AsReference
 
-    def initialize(context, group, name, path)
+    def initialize(context, name, path)
       @context = context
-      @group = group
       @name = name
       @path = path
     end
@@ -16,6 +15,7 @@ module Envandle
     def to_executable_argset(base)
       args = base.dup
       args.clear_reference
+      args.args[0] = @name
       args.options[:path] = @path
       Argset.new(:gem, *args.args_and_options)
     end

data/lib/envandle/reference_cache.rb

@@ -4,12 +4,11 @@ module Envandle
       @context = context
     end
 
-    def find(group, name)
-      key = Envandle.reference_key(group, name)
-      paths[key] ||
-      git_branches[key] ||
-      paths[name] ||
-      git_branches[name]
+    def use(name)
+      if ref = all[name]
+        left.delete name
+        ref
+      end
     end
 
     def paths
@@ -20,23 +19,28 @@ module Envandle
       @git_branches ||= parse(:git, GitBranchReference, "ENVANDLE_GEM_GIT_BRANCH")
     end
 
+    def all
+      @all ||= git_branches.merge(paths)
+    end
+
+    def left
+      @left ||= all.dup
+    end
+
     def parse(key, klass, env)
       {}.tap do |h|
         (ENV[env].to_s).split(";").each do |i|
           if v = __send__("parse_#{key}", klass, env, i)
-            h[v.key] = v if v
+            h[v.name] = v if v
           end
         end
       end
     end
 
-    def parse_group_and_name(env, v)
-      name, group = v.to_s.strip.split("@")
-      name = name.to_s.strip
-      group = group.to_s.strip if group
-      raise "No gem name (#{env}): #{ENV[env]}" if name.empty?
-      raise "No group name (#{env}): #{ENV[env]}" if group && group.empty?
-      [group, name]
+    def parse_name(env, v)
+      v = v.to_s.strip
+      raise "No gem name (#{env}): #{ENV[env]}" if v.empty?
+      v
     end
 
     def parse_path(klass, env, v)
@@ -46,30 +50,30 @@ 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(@context, *parse_group_and_name(env, name), path)
+      klass.new(@context, parse_name(env, name), path)
     end
 
     def parse_git(klass, env, v)
       v = v.to_s.strip
       return if v.empty?
       a = v.split(":")
-      name = a[0].to_s.strip
+      name = a[0]
       path = a[1..-1].join(":").to_s.strip
       url_and_ref = path.split('#')
       url = url_and_ref[0].to_s.strip
       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(@context, *parse_group_and_name(env, name), url, ref)
+      klass.new(@context, parse_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)
+      if ref = use(name)
         ref.spec.runtime_dependencies.each do |i|
-          if ref2 = find(nil, i.name)
+          if ref2 = use(i.name)
             extract_executable_argsets base, nil, i.name, argsets, found
           end
         end

data/lib/envandle/version.rb

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

data/lib/envandle.rb

@@ -1 +1,25 @@
+autoload :FileUtils, "fileutils" unless Object::const_defined?(:FileUtils) && !Object::autoload?(:FileUtils)
+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)
+require "envandle/version"
+require "envandle/exceptions"
+require "envandle/helper"
 require "envandle/binding"
+
+module Envandle
+  autoload :Argset, "envandle/argset"
+  autoload :AsContext, "envandle/as_context"
+  autoload :AsDsl, "envandle/as_dsl"
+  autoload :AsGitReference, "envandle/as_git_reference"
+  autoload :AsReference, "envandle/as_reference"
+  autoload :Element, "envandle/element"
+  autoload :Elements, "envandle/elements"
+  autoload :GemspecCache, "envandle/gemspec_cache"
+  autoload :Gemspec, "envandle/gemspec"
+  autoload :GitBranchReference, "envandle/git_branch_reference"
+  autoload :GitUtil, "envandle/git_util"
+  autoload :Location, "envandle/location"
+  autoload :PathReference, "envandle/path_reference"
+  autoload :ReferenceCache, "envandle/reference_cache"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envandle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - mosop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,8 @@ dependencies:
         version: '3.5'
 description: 
 email: 
-executables: []
+executables:
+- install-envandle
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,6 +68,7 @@ files:
 - bin/console
 - bin/setup
 - envandle.gemspec
+- exe/install-envandle
 - lib/envandle.rb
 - lib/envandle/argset.rb
 - lib/envandle/as_context.rb
@@ -74,28 +76,30 @@ files:
 - lib/envandle/as_git_reference.rb
 - lib/envandle/as_reference.rb
 - lib/envandle/binding.rb
+- lib/envandle/element.rb
 - lib/envandle/elements.rb
-- lib/envandle/elements/element.rb
 - lib/envandle/elements/gem.rb
+- lib/envandle/elements/gem_block.rb
 - lib/envandle/elements/gemfile.rb
 - lib/envandle/elements/gemspec.rb
+- lib/envandle/elements/gemspec_block.rb
+- lib/envandle/elements/git_source.rb
 - lib/envandle/elements/git_source_block.rb
+- lib/envandle/elements/group.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/source_block.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/git_util.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
 - lib/envandle/version.rb
 homepage: https://github.com/mosop/envandle
 licenses: []

data/lib/envandle/elements/illegals_and_unsupporteds.rb

@@ -1,31 +0,0 @@
-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/git.rb

@@ -1,51 +0,0 @@
-module Envandle
-  GIT_BIN = `which git`.chomp
-
-  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
-end

data/lib/envandle/lib.rb

@@ -1,21 +0,0 @@
-require "open3"
-require "thread"
-require "tmpdir"
-require "yaml"
-require "envandle/version"
-require "envandle/helper"
-require "envandle/exceptions"
-require "envandle/as_context"
-require "envandle/as_dsl"
-require "envandle/as_git_reference"
-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/path_reference"
-require "envandle/shell"
-require "envandle/reference_cache"

data/lib/envandle/shell.rb

@@ -1,8 +0,0 @@
-module Envandle
-  def self.sh(cmd)
-    # output, status = Open3.capture2(cmd)
-    output, error, status = Open3.capture3(cmd)
-    raise "Command error: #{cmd}" unless status.success?
-    output
-  end
-end