ecogem 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c69f65814563d1d16699d4e04047ef40918b430
-  data.tar.gz: fcc25d9a359070b667dd122526fdcd3080335a2c
+  metadata.gz: d7904ba539f80c558e94a230fba0c11577aa531f
+  data.tar.gz: a3014fc9609014738ae0a090232c202ed09b70ba
 SHA512:
-  metadata.gz: acb46bf2546e1be3f5fd94b04f5b4fc83ec1b133d302d2f00de36aa2a301b9dfd0480489b77ca7b3aafea4267e30555851012e35c4f72109a61dab215412e15d
-  data.tar.gz: 6ac7d3d72a02854577cc1b3aca78c8233a85563cd9607d762f2e37e35444bde90345988820d524e0148620db15ddac4565ce83c01160df703d31659d28e61cb3
+  metadata.gz: c4d7e7a2d73218b41f6e8dd471cabd60c71cd42552e5e713e6a190f01ab37de2f9c03527f81778931ee76c687b320fc7eb4f5815ce59d0d93edc256bdd493dec
+  data.tar.gz: a5ebb52222cd9b17cb5a44a85a369de808264031f67047b791366026e53f4231cbd8675deed643f5a6e260dd2bdbe1c016ab1a4232a91087674f3e4d4c782088

data/lib/ecogem.rb

@@ -3,7 +3,7 @@ require_relative 'ecogem/version'
 Object.autoload :Bundler, 'bundler' unless Object.const_defined?(:Bundler, false)
 
 module Ecogem
-  %w[cli config env gemfile git gitsfile util workspace].each do |name|
+  %w[cli config env gemfile git gitsfile path util workspace].each do |name|
     pascal = name.split(/_/).map{|i| i[0].upcase + i[1..-1]}.join('')
     autoload pascal, ::File.expand_path("../ecogem/#{name}", __FILE__)
   end

data/lib/ecogem/gemfile.rb

@@ -10,7 +10,7 @@ module Ecogem
     end
 
     def dir
-      @dir ||= ::File.dirname(@pah)
+      @dir ||= ::File.dirname(@path)
     end
 
     private def dependencies
@@ -18,19 +18,27 @@ module Ecogem
     end
 
     private def extracted_dependencies
-      @extracted_dependencies ||= extract_dependencies([], [], false)
+      @extracted_dependencies ||= extract_dependencies([], [], [], false)
     end
 
-    protected def extract_dependencies(into, gits, git_only)
+    protected def extract_dependencies(into, gits, paths, subfile)
       dependencies.each do |d|
         if d.source.git?
-          unless gits.include?(d.source.git.key)
-            gits << d.source.git.key
-            d.source.git.gemfile.extract_dependencies into, gits, true if d.source.git.gemfile
+          unless gits.include?(d.source.git_source.key)
+            gits << d.source.git_source.key
+            d.source.git_source.gemfile.extract_dependencies into, gits, paths, true if d.source.git_source.gemfile
           end
           into << d
+        elsif d.source.path?
+          unless subfile
+            unless paths.include?(d.source.path)
+              paths << d.source.path
+              d.source.path_source.gemfile.extract_dependencies into, gits, paths, true if d.source.path_source.gemfile
+            end
+            into << d
+          end
         else
-          into << d unless git_only
+          into << d unless subfile
         end
       end
       into
@@ -51,7 +59,7 @@ module Ecogem
     end
 
     def write(dir = nil, name = nil)
-      dir ||= ::File.dirname(@path)
+      dir ||= self.dir
       name ||= 'Gemfile'
       path = "#{dir}/#{name}"
       ::File.write "#{dir}/#{name}", code
@@ -77,11 +85,13 @@ module Ecogem
         pid = ::Process.fork do
           params = ::Marshal.load(in_r)
 
-          dsl = ::Bundler::Dsl.new
-          dsl.eval_gemfile(params[:path])
-          result = ::Ecogem::Gemfile::Marshal.new(dsl).to_data
+          ::Dir.chdir(::File.dirname(params[:path])) do
+            dsl = ::Bundler::Dsl.new
+            dsl.eval_gemfile(params[:path])
+            result = ::Ecogem::Gemfile::Marshal.new(dsl).to_data
+            ::Marshal.dump(result, out_w)
+          end
 
-          ::Marshal.dump(result, out_w)
           ::Process.exit!
         end
         ::Process.waitpid(pid)

data/lib/ecogem/gemfile/dependency.rb

@@ -1,6 +1,8 @@
 module Ecogem
   class Gemfile
     class Dependency
+      attr_reader :gemfile
+      
       def initialize(gemfile, data)
         @gemfile = gemfile
         @data = data

data/lib/ecogem/gemfile/source.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pathname'
 
 module Ecogem
   class Gemfile
@@ -27,7 +28,11 @@ module Ecogem
       end
 
       def path
-        @data.options['path']
+        @path ||= ::File.expand_path(@data.options['path'].to_s, @dependency.gemfile.dir)
+      end
+
+      def relative_path
+        @relative_path ||= ::Pathname.new(path).relative_path_from(::Pathname.new(@dependency.gemfile.dir)).to_s
       end
 
       def source
@@ -38,16 +43,20 @@ module Ecogem
         @data.ref
       end
 
-      def git
-        @git ||= ::Ecogem::Git.new(git_uri, ref)
+      def git_source
+        @git_source ||= ::Ecogem::Git.new(git_uri, ref)
+      end
+
+      def path_source
+        @path_source ||= ::Ecogem::Path.new(path)
       end
 
       def code
         @code ||= begin
           if git?
-            "path: Ecogem.git_path(#{git.key.inspect})"
+            "path: Ecogem.git_path(#{git_source.key.inspect})"
           elsif path?
-            "path: #{path.to_s.inspect}"
+            "path: #{relative_path.inspect}"
           elsif source?
             "source: #{source.inspect}"
           end

data/lib/ecogem/path.rb

@@ -0,0 +1,19 @@
+module Ecogem
+  class Path
+    attr_reader :dir
+
+    def initialize(dir)
+      @dir = dir
+    end
+
+    private def gemfile_path
+      @gemfile_path ||= ::File.expand_path("#{dir}/Ecogemfile")
+    end
+
+    def gemfile
+      @gemfile ||= begin
+        ::Ecogem::Gemfile.new(gemfile_path) if ::File.file?(gemfile_path)
+      end
+    end
+  end
+end

data/lib/ecogem/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecogem
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mosop
@@ -70,6 +70,7 @@ files:
 - lib/ecogem/gitsfile.rb
 - lib/ecogem/gitsfile/entries.rb
 - lib/ecogem/gitsfile/entries/keys.rb
+- lib/ecogem/path.rb
 - lib/ecogem/util.rb
 - lib/ecogem/util/config.rb
 - lib/ecogem/util/config/entry.rb