envandle 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb2aa848fd91ea33e9faa83759f13952ff3550f
-  data.tar.gz: 31d4cdcd8e59edba4f8d573561544b8f2f81ad2c
+  metadata.gz: d329ce5df2ca681f51283c395f2be9526c66c3e1
+  data.tar.gz: eb443817b65eb96d575792cb395a319b2b865306
 SHA512:
-  metadata.gz: 704299adeb30ec58b93e7cedcb1c7b37fd4188136cf803b2d551dafc4faeb60777dad760f4fffbf1749ba031f2e6536cee090c9be593cddf64052c2fe437f2f5
-  data.tar.gz: 68800f876f4fda6588fd5a8b0d13ab940ee4b161f404ed189a5b3ba1e70bb88aee7e874c0c9daed91a3fd43c20c5dc83f27778d64eaba4c9819b155465af22f1
+  metadata.gz: c746e1b72f84fafe984f7a33e88a36f30d3d1c18da38d4d2171e3f826ca0a553d8813eb86a1d5b33f593a464455b831fccacb344ecfca520116647ab4a21fb02
+  data.tar.gz: cce9a7b1dcd22f0f7ec4f9a95c25617a4c0aca9448043cd0f3c9d529f07f99d40dddca494ff2f188b569da09a427a8e8ecce00a806965cd49db6f18931981624

data/README.md

@@ -118,9 +118,17 @@ is evaluated as:
 gem "mygem", "~> 1.0"
 ```
 
+### Setting Git Commit IDs
+
+You can specify the gem method's `git` and `ref` options by setting the ENVANDLE_GEM_GIT_REF variable.
+
+```ruby
+ENV["ENVANDLE_GEM_GIT_REF"] = "mygem:https://github.com/mosop/mygem.git#aed3d9b9965b6938cca7490e98423cf9b5908b09"
+```
+
 ### Specifying Gemspecs
 
-As well as the regular Gemfile, you can also specify a gemspec not a single gem.
+You can also specify a gemspec not a single gem.
 
 For example, if your gem's name is "mygem", the gemspec refers the a, b and c gems and the c's version requirement is "~> 1.0",
 

data/lib/envandle.rb

@@ -19,6 +19,7 @@ module Envandle
   autoload :GemspecCache, "envandle/gemspec_cache"
   autoload :Gemspec, "envandle/gemspec"
   autoload :GitBranchReference, "envandle/git_branch_reference"
+  autoload :GitRefReference, "envandle/git_ref_reference"
   autoload :GitUtil, "envandle/git_util"
   autoload :History, "envandle/history"
   autoload :IllegalElement, "envandle/illegal_element"

data/lib/envandle/gemspec_cache.rb

@@ -7,6 +7,8 @@ module Envandle
       FileUtils.mkdir_p @path
     end
 
+    attr_reader :path
+
     def with_file
       path = File.join(@path, "list")
       @@mutex.synchronize do

data/lib/envandle/git_ref_reference.rb

@@ -0,0 +1,37 @@
+module Envandle
+  class GitRefReference
+    extend AsGitReference
+
+    def initialize(context, name, url, ref)
+      @context = context
+      @name = name
+      @url = url
+      @ref = ref
+    end
+
+    def spec
+      @spec ||= begin
+        cache = @context.gemfile.gemspecs
+        cache_url = "#{@url}##{@ref}"
+        dir = cache.find(cache_url) || begin
+          reserve = cache.reserve
+          Envandle::GitUtil.init reserve.path, @url
+          sha = Envandle::GitUtil.pull_sha(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.args[0] = @name
+      args.options[:git] = @url
+      args.options[:ref] = @ref
+      Argset.new(:gem, *args.args_and_options)
+    end
+  end
+end

data/lib/envandle/git_util.rb

@@ -49,5 +49,13 @@ module Envandle
         end
       end
     end
+
+    def self.pull_sha(dir, ref, branch)
+      Dir.chdir(dir) do
+        Envandle.sh "#{BIN} checkout -b #{branch}"
+        Envandle.sh "#{BIN} fetch origin"
+        Envandle.sh "#{BIN} reset --hard #{ref}"
+      end
+    end
   end
 end

data/lib/envandle/reference_cache.rb

@@ -19,8 +19,12 @@ module Envandle
       @git_branches ||= parse(:git, GitBranchReference, "ENVANDLE_GEM_GIT_BRANCH")
     end
 
+    def git_refs
+      @git_refs ||= parse(:git, GitRefReference, "ENVANDLE_GEM_GIT_REF")
+    end
+
     def all
-      @all ||= git_branches.merge(paths)
+      @all ||= git_branches.merge(git_refs.merge(paths))
     end
 
     def left

data/lib/envandle/version.rb

@@ -1,3 +1,3 @@
 module Envandle
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envandle
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - mosop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - lib/envandle/gemspec.rb
 - lib/envandle/gemspec_cache.rb
 - lib/envandle/git_branch_reference.rb
+- lib/envandle/git_ref_reference.rb
 - lib/envandle/git_util.rb
 - lib/envandle/helper.rb
 - lib/envandle/history.rb