librarianp 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0b480a24c69d616894564789dedde87e711120
-  data.tar.gz: c59aea592433b7cae32f3f4a4b8cfbe5e40aa463
+  metadata.gz: 04a1e4db0787f3a2fd35ed107c2b56d4d4ad6a6b
+  data.tar.gz: 2818792e819ffa97695db3845a5cf49d5a523530
 SHA512:
-  metadata.gz: 6f1ee150fb236d72793ba05c4d2dba4cfe29364e862e9a8189c2641477a5935610103fcd2f88fd17fe07e00446c34fec9704f486a10490b8e76ea3dd9a1db84e
-  data.tar.gz: c15fc1536c848418fe5aade277508341345abf5dbf36bb752d9af6f3ff9227c25eded6ff4b7c7e1a4cb45acb404eff08fcd5aef4a74baa47e2bb25730b596ec6
+  metadata.gz: 1c5819c7a0a6313718d33d812bf635244135e835599822014e6d93c167cc449a43609484c275257e6f150d24fff45a84ec6bd34fdb17c34e3e6b5c450caae7be
+  data.tar.gz: 2ca7a08199372c51f33be95176edfe1adf391858066671f78a31da1db987b15b43ca17f00660b2c55439d6429221aaace6ce9384042365dd956556e52a3e7c33

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.4.0
+
+* Resolve iteratively instead of recursively
+* Fail if there are duplicated dependencies in spec file
+* Merge duplicated dependencies and warn the user
+
 ## 0.3.0
 
 * Allow customizing default specfile and receiver downstream

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    librarianp (0.3.0)
+    librarianp (0.4.0)
       thor (~> 0.15)
 
 GEM

data/README.md

@@ -1,6 +1,8 @@
 Librarian [![Build Status](https://secure.travis-ci.org/carlossg/librarian.png)](http://travis-ci.org/carlossg/librarian) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/carlossg/librarian)
 =========
 
+This is a forked version published as `librarianp` with improvements in order to support `librarian-puppet`.
+
 Librarian is a framework for writing bundlers, which are tools that resolve,
 fetch, install, and isolate a project's dependencies, in Ruby.
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/librarian/action/resolve.rb

@@ -23,6 +23,11 @@ module Librarian
           manifests = changes.analyze
         end
 
+        dupes = spec.dependencies.group_by{ |e| e.name }.select { |k, v| v.size > 1 }
+        unless dupes.empty?
+          raise Error, "Duplicated dependencies: #{dupes.values.flatten.map {|d| {d.name => d.source.to_s} }}"
+        end
+
         resolution = resolver.resolve(spec, manifests)
         persist_resolution(resolution)
       end

data/lib/librarian/dependency.rb

@@ -171,6 +171,12 @@ module Librarian
       self.source       == other.source
     end
 
+    alias :eql? :==
+
+    def hash
+      self.to_s.hash
+    end
+
     def consistent_with?(other)
       name != other.name || requirement.consistent_with?(other.requirement)
     end

data/lib/librarian/manifest.rb

@@ -219,7 +219,31 @@ module Librarian
     end
 
     def fetch_dependencies!
-      source.fetch_dependencies(name, version, extra)
+      remove_duplicate_dependencies(name, source.fetch_dependencies(name, version, extra))
+    end
+
+    # merge dependencies with the same name into one
+    # with the source of the first one and merged requirements
+    def merge_dependencies(dependencies)
+      requirement = Dependency::Requirement.new(*dependencies.map{|d| d.requirement})
+      Dependency.new(dependencies.first.name, requirement, dependencies.first.source)
+    end
+
+    # Avoid duplicated dependencies with different sources or requirements
+    def remove_duplicate_dependencies(module_name, dependencies)
+      uniq = []
+      dependencies_by_name = dependencies.group_by{|d| d.name}
+      dependencies_by_name.map do |name, dependencies_same_name|
+        if dependencies_same_name.size > 1
+          environment.logger.warn { "Dependency '#{name}' duplicated for module #{module_name}, trying to merge: #{dependencies_same_name.map{|d| d.to_s}}" }
+          merged = merge_dependencies(dependencies_same_name)
+          environment.logger.warn { "Dependency '#{name}' merged as #{merged}" }
+          uniq << merged
+        else
+          uniq << dependencies_same_name.first
+        end
+      end
+      uniq
     end
 
     def _normalize_version(version)

data/lib/librarian/resolver/implementation.rb

@@ -47,27 +47,31 @@ module Librarian
         manifests = index_by(manifests, &:name) if manifests.kind_of?(Array)
         queue = spec.dependencies + sourced_dependencies_for_manifests(manifests)
         state = State.new(manifests.dup, [], queue)
-        recursive_resolve(state)
+        do_resolve(state)
       end
 
     private
 
-      def recursive_resolve(state)
-        shift_resolved_enqueued_dependencies(state) or return
-        state.queue.empty? and return state.manifests
+      def do_resolve(state)
+        stack = [state]
+        while !stack.empty? do
+          state = stack.pop
+          shift_resolved_enqueued_dependencies(state) or return
+          state.queue.empty? and return state.manifests
 
-        state.dependencies << state.queue.shift
-        dependency = state.dependencies.last
+          state.dependencies << state.queue.shift
+          dependency = state.dependencies.last
 
-        resolving_dependency_map_find_manifests(dependency) do |manifest|
-          check_manifest(state, manifest) or next
-          check_manifest_for_cycles(state, manifest) or next unless cyclic
+          resolving_dependency_map_find_manifests(dependency) do |manifest|
+            check_manifest(state, manifest) or next
+            check_manifest_for_cycles(state, manifest) or next unless cyclic
 
-          m = state.manifests.merge(dependency.name => manifest)
-          a = sourced_dependencies_for_manifest(manifest)
-          s = State.new(m, state.dependencies.dup, state.queue + a)
+            m = state.manifests.merge(dependency.name => manifest)
+            a = sourced_dependencies_for_manifest(manifest)
+            s = State.new(m, state.dependencies.dup, state.queue + a)
 
-          recursive_resolve(s)
+            stack.push(s)
+          end
         end
       end
 

data/librarian.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: librarianp 0.3.0 ruby lib
+# stub: librarianp 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "librarianp"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jay Feldblum", "Carlos Sanchez"]
-  s.date = "2015-02-25"
+  s.date = "2015-02-26"
   s.description = "A Framework for Bundlers, used by librarian-puppet."
   s.email = ["y_feldblum@yahoo.com", "carlos@apache.org"]
   s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE.txt", "README.md", "Rakefile", "VERSION", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/algorithms.rb", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/environment/runtime_cache.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/linter/source_linter.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/mock/version.rb", "lib/librarian/posix.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/rspec/support/cli_macro.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/cli_spec.rb", "spec/functional/posix_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/functional/source/git_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_macro.rb", "spec/support/project_path_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/algorithms_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency/requirement_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment/runtime_cache_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest/version_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/environment_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarianp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jay Feldblum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -241,4 +241,3 @@ test_files:
 - spec/unit/resolver_spec.rb
 - spec/unit/source/git_spec.rb
 - spec/unit/spec_change_set_spec.rb
-has_rdoc: