librarianp 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5a06c0a6a47dda122deace8d00c4c84d7954c0
-  data.tar.gz: 7dda5da1818865763613e09a2ccb3a1e306028df
+  metadata.gz: a318f3a8c81d302b411ab7c49a30516b919052d0
+  data.tar.gz: a6f81353d1114c4be9c0e800855c4111f45c5ad1
 SHA512:
-  metadata.gz: ba9235a2eb1b29099b8c9e5b1bcacb0f49f71f2317f636de7985a6261a57596e966050692089c4072d459492a2df59ab1f3eb614d3cb22e66349133c04d755c0
-  data.tar.gz: 2746710feb6e2eb489f922e5d3069ac2494096d686cb3f67ffd20e66461573b386c552bd7c8fae5cb2f1ed911ea0d97374b7799e3ca8fdca39fa423126fd99c9
+  metadata.gz: b8d8828d8a3691916a68ce07b538630d5aa84e87fda4bd49e9c177ea2dc882594acb240387720ae1c9a9ee92baf5b829c5e468eb815cfc32783f25803e531f07
+  data.tar.gz: c4ae9428382e90ae828e839a731848bc3b0277f9f590f321aee0c717412c7f2938aba9001e3b851a346f495dad88cbf38f6b29cac2801bd328b945bd60b47323

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lib/librarian/action/resolve.rb

@@ -23,14 +23,14 @@ module Librarian
           manifests = changes.analyze
         end
 
-        dupes = spec.dependencies.group_by{ |e| e.name }.select { |k, v| v.size > 1 }
-        dupes = Hash[dupes] if dupes.is_a? Array # Ruby 1.8 support
-        unless dupes.empty?
-          raise Error, "Duplicated dependencies: #{dupes.values.flatten.map {|d| {d.name => d.source.to_s} }}"
+        spec.dependencies, duplicated = Dependency.remove_duplicate_dependencies(spec.dependencies)
+        duplicated.each do |name, dependencies_same_name|
+          environment.logger.info { "Dependency '#{name}' duplicated for module #{name}, merging: #{dependencies_same_name.map{|d| d.to_s}}" }
         end
 
         resolution = resolver.resolve(spec, manifests)
         persist_resolution(resolution)
+        resolution
       end
 
     private

data/lib/librarian/dependency.rb

@@ -185,6 +185,32 @@ module Librarian
       !consistent_with?(other)
     end
 
+    class << self
+      # 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})
+        dependencies.last.class.new(dependencies.last.name, requirement, dependencies.last.source)
+      end
+
+      # Avoid duplicated dependencies with different sources or requirements
+      # Return [merged dependnecies, duplicates as a map by name]
+      def remove_duplicate_dependencies(dependencies)
+        uniq = []
+        duplicated = {}
+        dependencies_by_name = dependencies.group_by{|d| d.name}
+        dependencies_by_name.map do |name, dependencies_same_name|
+          if dependencies_same_name.size > 1
+            duplicated[name] = dependencies_same_name
+            uniq << merge_dependencies(dependencies_same_name)
+          else
+            uniq << dependencies_same_name.first
+          end
+        end
+          [uniq, duplicated]
+      end
+    end
+
   private
 
     def assert_name_valid!(name)

data/lib/librarian/environment.rb

@@ -71,7 +71,7 @@ module Librarian
     end
 
     def specfile
-      Specfile.new(self, specfile_path)
+      @specfile ||= Specfile.new(self, specfile_path)
     end
 
     def adapter_module

data/lib/librarian/manifest.rb

@@ -94,31 +94,10 @@ module Librarian
     end
 
     def fetch_dependencies!
-      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})
-      dependencies.first.class.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
+      dependencies, duplicated = Dependency.remove_duplicate_dependencies(source.fetch_dependencies(name, version, extra))
+      duplicated.each do |name, dependencies_same_name|
+        environment.logger.info { "Dependency '#{name}' duplicated for module #{module_name}, merging: #{dependencies_same_name.map{|d| d.to_s}}" }
       end
-      uniq
     end
 
     def _normalize_version(version)

data/lib/librarian/mock/environment.rb

@@ -1,13 +1,15 @@
 require "librarian/environment"
+require "librarian/ui"
 require "librarian/mock/dsl"
 require "librarian/mock/version"
+require 'thor'
 
 module Librarian
   module Mock
     class Environment < Environment
 
-      def install_path
-        nil
+      def ui
+        Librarian::UI::Shell.new(Thor::Shell::Basic.new)
       end
 
       def registry(options = nil, &block)

data/lib/librarian/source/git/repository.rb

@@ -107,7 +107,7 @@ module Librarian
             reference = "#{remote}/#{reference}"
           end
 
-          command = %W(rev-list #{reference} -1)
+          command = %W(rev-parse #{reference}^{commit} --quiet)
           run!(command, :chdir => true).strip
         end
 

data/lib/librarian/spec.rb

@@ -2,7 +2,6 @@ module Librarian
   class Spec
 
     attr_accessor :sources, :dependencies, :exclusions
-    private :sources=, :dependencies=, :exclusions=
 
     def initialize(sources, dependencies, exclusions = [])
       self.sources = sources

data/lib/librarian/specfile.rb

@@ -12,7 +12,7 @@ module Librarian
     end
 
     def read(precache_sources = [])
-      environment.dsl(path, precache_sources)
+      @spec ||= environment.dsl(path, precache_sources)
     end
 
   end

data/librarian.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: librarianp 0.5.1 ruby lib
+# stub: librarianp 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "librarianp"
-  s.version = "0.5.1"
+  s.version = "0.6.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-03-02"
+  s.date = "2015-03-06"
   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/pre_release_version.rb", "lib/librarian/manifest/version.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/action/resolve_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"]

data/spec/unit/action/resolve_spec.rb

@@ -1,27 +1,44 @@
 require "librarian/error"
+require "librarian/logger"
 require "librarian/action/resolve"
+require "librarian/mock/environment"
 require "librarian/mock/source"
 
 module Librarian
   describe Action::Resolve do
 
     let(:options) { {} }
-    let(:spec) { double() }
-    let(:env) { double(:specfile => double(:read => spec)) }
+    let(:spec) { Spec.new([], dependencies, []) }
+    let(:env) { Librarian::Mock::Environment.new }
     let(:action) { described_class.new(env, options) }
+    let(:source1) { Librarian::Mock::Source::Mock.new(env, "source1", {}) }
+    let(:source2) { Librarian::Mock::Source::Mock.new(env, "source2", {}) }
+
+    before do
+      env.stub(:specfile => double(:read => spec))
+    end
 
     describe "#run" do
 
       describe "behavior" do
 
-        describe "fail with duplicated dependencies" do
+        describe "merge duplicated dependencies" do
           let(:options) { {:force => true} }
-          let(:dependency) { Dependency.new('dependency_name', '1.0.0', nil ) }
-          let(:dependencies) { [ dependency, dependency ] }
-          let(:spec) { double(:dependencies => dependencies) }
+          let(:dependency1) { Dependency.new('dependency_name', '1.0.0', source1) }
+          let(:dependency2) { Dependency.new('dependency_name', '1.0.0', source2) }
+          let(:dependencies) { [ dependency1, dependency2 ] }
+          let(:manifest) do
+            m = Manifest.new(source1, dependency1.name)
+            m.version = '1.0.0'
+            m.dependencies = []
+            m
+          end
 
-          it "should fail with duplicated dependencies" do
-            expect { action.run }.to raise_error(Error, /^Duplicated dependencies: /)
+          it "should merge duplicated dependencies" do
+            Dependency.any_instance.stub(:manifests => [manifest])
+            action.stub(:persist_resolution)
+            resolution = action.run
+            expect(resolution.dependencies).to eq([dependency2])
           end
 
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarianp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jay Feldblum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor