ecogem 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7904ba539f80c558e94a230fba0c11577aa531f
-  data.tar.gz: a3014fc9609014738ae0a090232c202ed09b70ba
+  metadata.gz: dde01569da57740cc428ec27076bf5aeb8f87e28
+  data.tar.gz: 52ec03ce86fb0c0c19f078720d0ad5fe2324ae3c
 SHA512:
-  metadata.gz: c4d7e7a2d73218b41f6e8dd471cabd60c71cd42552e5e713e6a190f01ab37de2f9c03527f81778931ee76c687b320fc7eb4f5815ce59d0d93edc256bdd493dec
-  data.tar.gz: a5ebb52222cd9b17cb5a44a85a369de808264031f67047b791366026e53f4231cbd8675deed643f5a6e260dd2bdbe1c016ab1a4232a91087674f3e4d4c782088
+  metadata.gz: 5835ff92f8b18f1e44406c0855ffd771c171551cd52f8ed081a0fc9ca7047474427bff66aa6b29770a710965a5b484310a1c2d0d94ec6c4c0ec8d434c2986e53
+  data.tar.gz: b03ec18354de43495fd83eea7b361a1f44b3e38d18c8f4d3121b05723dd4a093ba40f6f73de606b8c5714df17b209fbbee2ce463eae2844b35d2bb7459b12778

data/README.md

@@ -1,6 +1,6 @@
 # Ecogem
 
-Supplements Bundler for installing private gems.
+Supplements Bundler for installing private gems. https://rubygems.org/gems/ecogem
 
 ## Preface
 
@@ -102,7 +102,7 @@ Then `ecogem install` will:
     gem 'rake' # from rubygems.org
     ```
 
-1. fetch gem-a's Ecogemfile
+1. fetch the gem-a repo and parse gem-a's Ecogemfile
 
     gem-a's Ecogemfile: 
 
@@ -112,7 +112,7 @@ Then `ecogem install` will:
     gemspec
     ```
 
-1. fetch gem-b's Ecogemfile
+1. fetch the gem-b repo and parse gem-b's Ecogemfile
 
     gem-b's Ecogemfile:
 
@@ -130,13 +130,34 @@ Then `ecogem install` will:
 
     source "https://rubygems.org/"
 
-    gem 'gem-b', path: Ecogem.git_path("git@github.com:me/gem-b.git master")
-    gem 'gem-a', path: Ecogem.git_path("git@github.com:me/gem-a.git master")
-    gem 'rake'
+    gem "gem-b", path: Ecogem.git_path("git@github.com:me/gem-b.git master")
+    gem "gem-a", path: Ecogem.git_path("git@github.com:me/gem-a.git master")
+    gem "rake"
     ```
 
 1. and finally execute `bundle install` with the new Gemfile
 
+## Configuration File
+
+Ecogem reads your configuration file and configures its runtime environment.
+
+The location of file is `~/.ecogem/config`. ~ is the current user's home directory.
+
+## Multiple SSH Keys for Fetching Repositories
+
+Ecogem supports multiple SSH keys for fetching repositories, described at [this gist](https://gist.github.com/jexchan/2351996
+).
+
+Write your uri aliases in your config like:
+
+```yaml
+git_sources:
+- uri: git@github.com:username/my.git
+  uri_alias: git@github.com-username:username/my.git
+```
+
+Then Ecogem converts the uri to the uri_alias.
+
 ## Contributing
 
 1. Fork it ( https://github.com/moso2p/ecogem/fork )

data/lib/ecogem.rb

@@ -19,7 +19,6 @@ module Ecogem
   def self.new_workspace(args, options = {}, &block)
     Workspace.new(args, options) do |ws|
       begin
-        ::Thread.current[:ecogem_workspaces] ||= []
         workspaces << ws
         break block.call(ws)
       ensure

data/lib/ecogem/gemfile.rb

@@ -44,6 +44,31 @@ module Ecogem
       into
     end
 
+    private def extracted_dependencies_by_names
+      @extracted_dependencies_by_names ||= begin
+        h = {}
+        extracted_dependencies.each do |d|
+          h[d.name] ||= []
+          h[d.name] << d
+        end
+        h
+      end
+    end
+
+    private def exported_dependencies
+      @exported_dependencies ||= begin
+        a = []
+        extracted_dependencies.each do |d|
+          if d.source.git?
+            ds = extracted_dependencies_by_names[d.name]
+            next if ds.find{|i| i.source.path?}
+          end
+          a << d
+        end
+        a
+      end
+    end
+
     private def sources
       @sources ||= data.sources.instance_variable_get(:@rubygems_aggregate).remotes.map{|i| i.to_s}
     end
@@ -53,7 +78,7 @@ module Ecogem
         a = []
         a << 'require "ecogem"'
         a << sources.reverse.map{|i| "source #{i.inspect}"}.join("\n")
-        a << extracted_dependencies.map{|i| i.code}.uniq.join("\n")
+        a << exported_dependencies.map{|i| i.code}.uniq.join("\n")
         a.join("\n\n")
       end
     end
@@ -85,7 +110,8 @@ module Ecogem
         pid = ::Process.fork do
           params = ::Marshal.load(in_r)
 
-          ::Dir.chdir(::File.dirname(params[:path])) do
+          ::Dir.chdir(::File.dirname(params[:path])) do |dir|
+            ENV['BUNDLE_GEMFILE'] = params[:path]
             dsl = ::Bundler::Dsl.new
             dsl.eval_gemfile(params[:path])
             result = ::Ecogem::Gemfile::Marshal.new(dsl).to_data

data/lib/ecogem/version.rb

@@ -1,3 +1,3 @@
 module Ecogem
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecogem
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - mosop