librarian 0.0.2 → 0.0.3

data/lib/librarian/chef/source/local.rb

@@ -18,8 +18,7 @@ module Librarian
 
             def manifest?(dependency, path)
               path = Pathname.new(path)
-              manifest_path = manifest_path(path)
-              manifest_path && check_manifest(dependency, manifest_path)
+              !!manifest_path(path)
             end
 
             def check_manifest(dependency, manifest_path)

data/lib/librarian/dependency.rb

@@ -1,11 +1,15 @@
 require 'rubygems'
 
+require 'librarian/helpers/debug'
+
 module Librarian
   class Dependency
 
     class Requirement < Gem::Requirement
     end
 
+    include Helpers::Debug
+
     attr_reader :name, :requirement, :source
 
     def initialize(name, requirement, source)
@@ -40,5 +44,11 @@ module Librarian
       self.source       == other.source
     end
 
+  private
+
+    def root_module
+      source.root_module
+    end
+
   end
 end

data/lib/librarian/source/git.rb

@@ -39,7 +39,7 @@ module Librarian
       end
 
       def to_s
-        "#{uri}##{ref}"
+        path ? "#{uri}##{ref}(#{path})" : "#{uri}##{ref}"
       end
 
       def ==(other)
@@ -90,17 +90,7 @@ module Librarian
       end
 
       def filesystem_path
-        @filesystem_path ||= repository.path
-      end
-
-      # Override Local#manifest_search_paths
-      def manifest_search_paths(dependency)
-        if path.nil?
-          paths = [filesystem_path, filesystem_path.join(dependency.name)]
-          paths.select{|s| s.exist?}
-        else
-          [filesystem_path.join(path)]
-        end
+        @filesystem_path ||= path ? repository.path.join(path) : repository.path
       end
 
     end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-23 00:00:00.000000000Z
+date: 2011-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &11791400 !ruby/object:Gem::Requirement
+  requirement: &14553540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11791400
+  version_requirements: *14553540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11789160 !ruby/object:Gem::Requirement
+  requirement: &14551080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11789160
+  version_requirements: *14551080
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &11462680 !ruby/object:Gem::Requirement
+  requirement: &14238840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11462680
+  version_requirements: *14238840
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &11460640 !ruby/object:Gem::Requirement
+  requirement: &14237000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11460640
+  version_requirements: *14237000
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &11459060 !ruby/object:Gem::Requirement
+  requirement: &14235300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11459060
+  version_requirements: *14235300
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &11456440 !ruby/object:Gem::Requirement
+  requirement: &14233080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *11456440
+  version_requirements: *14233080
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 695538775137796306
+      hash: 434978619910249069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 695538775137796306
+      hash: 434978619910249069
 requirements: []
 rubyforge_project: librarian
 rubygems_version: 1.7.1