librarian-puppet 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4916fdcbc9dcfa3dcd3ce80abf048d41ba1a29
-  data.tar.gz: 2de58a47da5361bb2f149c05ffd2b298f08c4fb9
+  metadata.gz: 0a7c6bf3dfb88d0d44e3c718e302167e04508fc2
+  data.tar.gz: d5affa81eab4acc5aff6b93ee39bfbe3e97a2e85
 SHA512:
-  metadata.gz: 33e658e4b1a2513faf6bc4b3b9c3d0fa408b00e500735ee54d14f03578350f15dd829d54538ee4597d724b8645713c131c54f93bc601828e104a22886e9c0924
-  data.tar.gz: f1cfaacbdff4df3e3842611a49eb359f27281845f064fac2208772613000d488c1b59250295d9165b55558c34233cedd8263aab0edfef60fa182c3e46972f566
+  metadata.gz: d4de7b61cffafdc51b4e46bcf7c42fd88da267620804ce52f6c55e85724e0993f71756720530ce47a7535122f13158cc5baba38485f9ccd5dc8c0c138bacb437
+  data.tar.gz: 743f2f84ad57d0041656e28824e59e906fdc5ab717d866ca09f151c1f1ca22fadf45acb49317f0c48bd69ac28196d71d5858aa271672fcef7491f856ffa89b95

data/README.md

@@ -13,6 +13,7 @@ Git repositories or just a path.
 * Forge modules can be installed from [Puppetlabs Forge](https://forge.puppetlabs.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/)
 * Git modules can be installed from a branch, tag or specific commit, optionally using a path inside the repository
 * Modules can be installed from GitHub using tarballs, without needing Git installed
+* Modules can be installed from a filesystem path
 * Module dependencies are resolved transitively without needing to list all the modules explicitly
 
 
@@ -69,6 +70,10 @@ as if the Puppetfile contained
     mod 'puppetlabs-apache', '0.6.0',
       :github_tarball => 'puppetlabs/puppetlabs-apache'
 
+    mod 'acme-mymodule', :path => './some_folder'
+
+    exclusion 'acme-bad_module'
+
 
 ### Recursive module dependency resolution
 
@@ -134,6 +139,21 @@ module subdirectory.
 Our puppet infrastructure repository depends on the `apt` module, which we have
 stored as a directory under our `puppet-modules` git repos.
 
+    mod 'puppetlabs-apache', '0.6.0',
+      :github_tarball => 'puppetlabs/puppetlabs-apache'
+
+Our puppet infrastructure repository depends on the `puppetlabs-apache` module,
+to be downloaded from GitHub tarball.
+
+    mod 'acme-mymodule', :path => './some_folder'
+
+Our puppet infrastructure repository depends on the `acme-mymodule` module,
+which is already in the filesystem.
+
+    exclusion 'acme-bad_module'
+
+Exclude the module `acme-bad_module` from resolution and installation.
+
 ## How to Use
 
 Install librarian-puppet:

data/lib/librarian/puppet/action.rb

@@ -1 +1,2 @@
 require "librarian/puppet/action/install"
+require "librarian/puppet/action/resolve"

data/lib/librarian/puppet/action/resolve.rb

@@ -0,0 +1,19 @@
+module Librarian
+  module Puppet
+    module Action
+      class Resolve < Librarian::Action::Resolve
+        include Librarian::Puppet::Util
+
+        def run
+          super
+          manifests = environment.lock.manifests.select{ |m| m.name }
+          dupes = manifests.group_by{ |m| module_name(m.name) }.select { |k, v| v.size > 1 }
+          dupes.each do |k,v|
+            warn("Dependency on module '#{k}' is fullfilled by multiple modules and only one will be used: #{v.map{|m|m.name}}")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/librarian/puppet/cli.rb

@@ -7,6 +7,7 @@ require 'librarian/puppet/action'
 module Librarian
   module Puppet
     class Cli < Librarian::Cli
+      include Librarian::Puppet::Util
 
       module Particularity
         def root_module
@@ -69,6 +70,12 @@ module Librarian
         install!
       end
 
+      # only used to replace / to - in the module names
+      def update(*names)
+        warn("Usage of module/name is deprecated, use module-name") if names.any? {|n| n.include?("/")}
+        super(*names.map{|n| normalize_name(n)})
+      end
+
       desc "package", "Cache the puppet modules in vendor/puppet/cache."
       option "quiet", :type => :boolean, :default => false
       option "verbose", :type => :boolean, :default => false
@@ -93,6 +100,9 @@ module Librarian
       def install!(options = { })
         Action::Install.new(environment, options).run
       end
+      def resolve!(options = { })
+        Action::Resolve.new(environment, options).run
+      end
     end
   end
 end

data/lib/librarian/puppet/dependency.rb

@@ -0,0 +1,18 @@
+module Librarian
+  module Puppet
+
+    class Dependency < Librarian::Dependency
+
+      include Librarian::Puppet::Util
+
+      def initialize(name, requirement, source)
+        # Issue #235 fail if forge source is not defined
+        raise Error, "forge entry is not defined in Puppetfile" if source.instance_of?(Array) && source.empty?
+
+        super(normalize_name(name), requirement, source)
+      end
+
+    end
+
+  end
+end

data/lib/librarian/puppet/dsl.rb

@@ -1,6 +1,7 @@
 require 'librarian/dsl'
 require 'librarian/dsl/target'
 require 'librarian/puppet/source'
+require 'librarian/puppet/dependency'
 
 module Librarian
   module Puppet
@@ -15,32 +16,25 @@ module Librarian
       source :path => Source::Path
       source :github_tarball => Source::GitHubTarball
 
-      # copied from Librarian::Dsl to use our own Receiver
-      def run(specfile = nil, sources = [])
-        specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
-
-        if specfile.kind_of?(Pathname) and !File.exists?(specfile)
-          debug { "Specfile not found, using defaults: #{specfile}" }
-          specfile = Proc.new do
-            forge FORGE_URL
-            metadata
-          end
+      def default_specfile
+        Proc.new do
+          forge FORGE_URL
+          metadata
         end
+      end
 
-        Target.new(self).tap do |target|
-          target.precache_sources(sources)
-          debug_named_source_cache("Pre-Cached Sources", target)
-
-          specfile ||= Proc.new if block_given?
-          receiver = Receiver.new(target)
-          receiver.run(specfile)
+      def self.dependency_type
+        Librarian::Puppet::Dependency
+      end
 
-          # save the default forge defined
-          default_forge = target.sources.select {|s| s.is_a? Librarian::Puppet::Source::Forge}.first
-          Librarian::Puppet::Source::Forge.default = default_forge || Librarian::Puppet::Source::Forge.from_lock_options(environment, :remote => FORGE_URL)
+      def post_process_target(target)
+        # save the default forge defined
+        default_forge = target.sources.select {|s| s.is_a? Librarian::Puppet::Source::Forge}.first
+        Librarian::Puppet::Source::Forge.default = default_forge || Librarian::Puppet::Source::Forge.from_lock_options(environment, :remote => FORGE_URL)
+      end
 
-          debug_named_source_cache("Post-Cached Sources", target)
-        end.to_spec
+      def receiver(target)
+        Receiver.new(target)
       end
 
       class Receiver < Librarian::Dsl::Receiver

data/lib/librarian/puppet/environment.rb

@@ -1,7 +1,7 @@
 require "librarian/environment"
 require "librarian/puppet/dsl"
 require "librarian/puppet/source"
-require "librarian/puppet/lockfile/parser"
+require "librarian/puppet/lockfile"
 
 module Librarian
   module Puppet
@@ -11,6 +11,14 @@ module Librarian
         "puppet"
       end
 
+      def lockfile
+        Lockfile.new(self, lockfile_path)
+      end
+
+      def ephemeral_lockfile
+        Lockfile.new(self, nil)
+      end
+
       def tmp_path
         part = config_db["tmp"] || ".tmp"
         project_path.join(part)

data/lib/librarian/puppet/extension.rb

@@ -6,224 +6,4 @@ module Librarian
     extend self
     extend Librarian
   end
-
-  class Dependency
-    include Librarian::Puppet::Util
-
-    def initialize(name, requirement, source)
-      assert_name_valid! name
-
-      # Issue #235 fail if forge source is not defined
-      raise Error, "forge entry is not defined in Puppetfile" if source.instance_of?(Array) && source.empty?
-
-      # let's settle on provider-module syntax instead of provider/module
-      self.name = normalize_name(name)
-      self.requirement = Requirement.new(requirement)
-      self.source = source
-
-      @manifests = nil
-    end
-
-    class Requirement
-      def initialize(*args)
-        args = initialize_normalize_args(args)
-        self.backing = Gem::Requirement.create(puppet_to_gem_versions(args))
-      end
-
-      def puppet_to_gem_versions(args)
-        args.map do |arg|
-          case arg
-          when Array
-            arg.map { |v| Librarian::Puppet::Requirement.new(v).gem_requirement }
-          when String
-            Librarian::Puppet::Requirement.new(arg).gem_requirement
-          else
-            # Gem::Requirement, convert to string (ie. =1.0) so we can concat later
-            # Gem::Requirements can not be concatenated
-            arg.requirements.map{|x,y| "#{x}#{y}"}
-          end
-        end.flatten
-      end
-    end
-
-    alias :eql? :==
-
-    def hash
-      self.to_s.hash
-    end
-  end
-
-  # Fixes for librarian not yet released in their gem
-  module Mock
-    module Source
-      class Mock
-        alias :eql? :==
-
-        def hash
-          self.to_s.hash
-        end
-      end
-    end
-  end
-  module Source
-    class Git
-      alias :eql? :==
-
-      def hash
-        self.to_s.hash
-      end
-    end
-
-    class Path
-      alias :eql? :==
-
-      def hash
-        self.to_s.hash
-      end
-    end
-  end
-
-  class ManifestSet
-    include Librarian::Puppet::Util
-
-    private
-
-    # Check if module doesn't exist and fail fast
-    def dependencies_of(names)
-      names = Array === names ? names.dup : names.to_a
-      assert_strings!(names)
-
-      deps = Set.new
-      until names.empty?
-        name = normalize_name(names.shift)
-        next if deps.include?(name)
-
-        deps << name
-        raise(Error, "Unable to find module #{name}. Your Puppetfile may be out of sync with the lock, try running 'librarian-puppet install' first") if index[name].nil?
-        names.concat index[name].dependencies.map(&:name)
-      end
-      deps.to_a
-    end
-  end
-
-  class Manifest
-    class PreReleaseVersion
-
-      # Compares pre-release component ids using Semver 2.0.0 spec
-      def self.compare_components(this_id,other_id)
-        case # Strings have higher precedence than numbers
-          when (this_id.is_a?(Integer) and other_id.is_a?(String))
-            -1
-          when (this_id.is_a?(String) and other_id.is_a?(Integer))
-            1
-          else
-            this_id <=> other_id
-        end
-      end
-
-      # Parses pre-release components `a.b.c` into an array ``[a,b,c]`
-      # Converts numeric components into +Integer+
-      def self.parse(prerelease)
-        if prerelease.nil?
-          []
-        else
-          prerelease.split('.').collect do |id|
-            id = Integer(id) if /^[0-9]+$/ =~ id
-            id
-          end
-        end
-      end
-
-      include Comparable
-
-      attr_reader :components
-
-      def initialize(prerelease)
-        @prerelease = prerelease
-        @components = PreReleaseVersion.parse(prerelease)
-      end
-
-      def to_s
-        @prerelease
-      end
-
-      def <=>(other)
-        # null-fill zip array to prevent loss of components
-        z = Array.new([components.length,other.components.length])
-
-        # Compare each component against the other
-        comp = z.zip(components,other.components).collect do |ids|
-          case # All components being equal, the version with more of them takes precedence
-            when ids[1].nil? # Self has less elements, other wins
-              -1
-            when ids[2].nil? # Other has less elements, self wins
-              1
-            else
-              PreReleaseVersion.compare_components(ids[1],ids[2])
-          end
-        end
-        # Chose the first non-zero comparison or return 0
-        comp.delete_if {|c| c == 0}[0] || 0
-      end
-    end
-    class Version
-      @@SEMANTIC_VERSION_PATTERN = /^([0-9]+\.[0-9]+(?:\.[0-9]+)?)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/
-      def self.parse_semver(version_string)
-        parsed = @@SEMANTIC_VERSION_PATTERN.match(version_string.strip)
-        if parsed
-          {
-            :full_version => parsed[0],
-            :version => parsed[1],
-            :prerelease => (PreReleaseVersion.new(parsed[2]) if parsed[2]),
-            :build => parsed[3]
-          }
-        end
-      end
-
-      attr_reader :prerelease
-
-      def initialize(*args)
-        args = initialize_normalize_args(args)
-        semver = Version.parse_semver(*args)
-        if semver
-          self.backing  = Gem::Version.new(semver[:version])
-          @prerelease   = semver[:prerelease]
-          @full_version = semver[:full_version]
-        else
-          self.backing  = Gem::Version.new(*args)
-          @full_version = to_gem_version.to_s
-        end
-      end
-
-      def <=>(other)
-        cmp = to_gem_version <=> other.to_gem_version
-
-        # Should compare pre-release versions?
-        if cmp == 0 and not (prerelease.nil? and other.prerelease.nil?)
-          case # Versions without prerelease take precedence
-            when (prerelease.nil? and not other.prerelease.nil?)
-              1
-            when (not prerelease.nil? and other.prerelease.nil?)
-              -1
-            else
-              prerelease <=> other.prerelease
-          end
-        else
-          cmp
-        end
-      end
-
-      def to_s
-        @full_version
-      end
-    end
-  end
-
-  class Logger
-    def warn(string = nil, &block)
-      return unless ui
-
-      ui.warn(string || yield)
-    end
-  end
 end

data/lib/librarian/puppet/lockfile.rb

@@ -0,0 +1,39 @@
+# Extend Lockfile to normalize module names from acme/mod to acme-mod
+module Librarian
+  module Puppet
+    class Lockfile < Librarian::Lockfile
+
+      # Extend the parser to normalize module names in old .lock files, converting / to -
+      class Parser < Librarian::Lockfile::Parser
+
+        include Librarian::Puppet::Util
+
+        def extract_and_parse_sources(lines)
+          sources = super
+          sources.each do |source|
+            source[:manifests] = Hash[source[:manifests].map do |name,manifest|
+              [normalize_name(name), manifest]
+            end]
+          end
+          sources
+        end
+
+        def extract_and_parse_dependencies(lines, manifests_index)
+          # when looking up in manifests_index normalize the name beforehand
+          class << manifests_index
+            include Librarian::Puppet::Util
+            alias_method :old_lookup, :[]
+            define_method(:[]) { |k| self.old_lookup(normalize_name(k)) }
+          end
+          super(lines, manifests_index)
+        end
+
+      end
+
+      def load(string)
+        Parser.new(environment).parse(string)
+      end
+
+    end
+  end
+end

data/lib/librarian/puppet/source.rb

@@ -1,4 +1,3 @@
-require 'librarian/puppet/requirement'
 require 'librarian/puppet/source/path'
 require 'librarian/puppet/source/git'
 require 'librarian/puppet/source/forge'

data/lib/librarian/puppet/source/forge.rb

@@ -143,7 +143,7 @@ module Librarian
 
         def fetch_dependencies(name, version, version_uri)
           repo(name).dependencies(version).map do |k, v|
-            v = Requirement.new(v).gem_requirement
+            v = Librarian::Dependency::Requirement.new(v).to_gem_requirement
             Dependency.new(k, v, nil)
           end
         end

data/lib/librarian/puppet/source/forge/repo_v1.rb

@@ -33,30 +33,9 @@ module Librarian
 
         private
 
-          # Issue #223 dependencies may be duplicated
-          # and convert organization/modulename to organization-modulename
-          def clear_duplicated_dependencies(data)
+          # convert organization/modulename to organization-modulename
+          def normalize_dependencies(data)
             return nil if data.nil?
-            data.each do |m,versions|
-              versions.each do |v|
-                if v["dependencies"] and !v["dependencies"].empty?
-                  # convert organization/modulename to organization-modulename
-                  v["dependencies"].each {|d| d[0] = normalize_name(d[0])}
-
-                  dependency_names = v["dependencies"].map {|d| d[0]}
-                  duplicated = dependency_names.select{ |e| dependency_names.count(e) > 1 }
-                  unless duplicated.empty?
-                    duplicated.uniq.each do |module_duplicated|
-                      to_remove = []
-                      v["dependencies"].each_index{|i| to_remove << i if module_duplicated == v["dependencies"][i][0]}
-                      warn { "Module #{m}@#{v["version"]} contains duplicated dependencies for #{module_duplicated}, ignoring all but the first of #{to_remove.map {|i| v["dependencies"][i]}}" }
-                      to_remove.slice(1..-1).reverse.each {|i| v["dependencies"].delete_at(i) }
-                      v["dependencies"] = v["dependencies"] - to_remove.slice(1..-1)
-                    end
-                  end
-                end
-              end
-            end
             # convert organization/modulename to organization-modulename
             data.keys.each do |m|
               if m =~ %r{.*/.*}
@@ -71,7 +50,7 @@ module Librarian
           def api_data(module_name)
             return @api_data[module_name] if @api_data
             # call API and cache data
-            @api_data = clear_duplicated_dependencies(api_call(module_name))
+            @api_data = normalize_dependencies(api_call(module_name))
             if @api_data.nil?
               raise Error, "Unable to find module '#{name}' on #{source}"
             end
@@ -83,7 +62,7 @@ module Librarian
             # if we already got all the versions, find in cached data
             return @api_data[module_name].detect{|x| x['version'] == version.to_s} if @api_data
             # otherwise call the api for this version if not cached already
-            @api_version_data[version] = clear_duplicated_dependencies(api_call(name, version)) if @api_version_data[version].nil?
+            @api_version_data[version] = normalize_dependencies(api_call(name, version)) if @api_version_data[version].nil?
             @api_version_data[version]
           end
 

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

@@ -43,12 +43,9 @@ module Librarian
           end
 
           parsed_metadata['dependencies'].each do |d|
-            gem_requirement = Requirement.new(d['version_requirement']).gem_requirement
+            gem_requirement = Librarian::Dependency::Requirement.new(d['version_requirement']).to_gem_requirement
             new_dependency = Dependency.new(d['name'], gem_requirement, forge_source)
-            # Avoid duplicated dependencies with different sources
-            unless dependencies.find { |spec_dependency| spec_dependency.name == new_dependency.name && spec_dependency.requirement == new_dependency.requirement }
-              dependencies << new_dependency
-            end
+            dependencies << new_dependency
           end
 
           dependencies

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: librarian
+  name: librarianp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
@@ -184,12 +184,13 @@ files:
 - lib/librarian/puppet.rb
 - lib/librarian/puppet/action.rb
 - lib/librarian/puppet/action/install.rb
+- lib/librarian/puppet/action/resolve.rb
 - lib/librarian/puppet/cli.rb
+- lib/librarian/puppet/dependency.rb
 - lib/librarian/puppet/dsl.rb
 - lib/librarian/puppet/environment.rb
 - lib/librarian/puppet/extension.rb
-- lib/librarian/puppet/lockfile/parser.rb
-- lib/librarian/puppet/requirement.rb
+- lib/librarian/puppet/lockfile.rb
 - lib/librarian/puppet/source.rb
 - lib/librarian/puppet/source/forge.rb
 - lib/librarian/puppet/source/forge/repo.rb
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules

data/lib/librarian/puppet/lockfile/parser.rb

@@ -1,55 +0,0 @@
-require 'librarian/manifest'
-require 'librarian/dependency'
-require 'librarian/manifest_set'
-
-module Librarian
-  class Lockfile
-    class Parser
-      include Librarian::Puppet::Util
-
-      def parse(string)
-        string = string.dup
-        source_type_names_map = Hash[dsl_class.source_types.map{|t| [t[1].lock_name, t[1]]}]
-        source_type_names = dsl_class.source_types.map{|t| t[1].lock_name}
-        lines = string.split(/(\r|\n|\r\n)+/).select{|l| l =~ /\S/}
-        sources = []
-        while source_type_names.include?(lines.first)
-          source = {}
-          source_type_name = lines.shift
-          source[:type] = source_type_names_map[source_type_name]
-          options = {}
-          while lines.first =~ /^ {2}([\w\-\/]+):\s+(.+)$/
-            lines.shift
-            options[$1.to_sym] = $2
-          end
-          source[:options] = options
-          lines.shift # specs
-          manifests = {}
-          while lines.first =~ /^ {4}([\w\-\/]+) \((.*)\)$/ # This change allows forward slash
-            lines.shift
-            name, version = normalize_name($1), $2
-            manifests[name] = {:version => version, :dependencies => {}}
-            while lines.first =~ /^ {6}([\w\-\/]+) \((.*)\)$/
-              lines.shift
-              manifests[name][:dependencies][$1] = $2.split(/,\s*/)
-            end
-          end
-          source[:manifests] = manifests
-          sources << source
-        end
-        manifests = compile(sources)
-        manifests_index = Hash[manifests.map{|m| [m.name, m]}]
-        raise StandardError, "Expected DEPENDENCIES topic!" unless lines.shift == "DEPENDENCIES"
-        dependencies = []
-        while lines.first =~ /^ {2}([\w\-\/]+)(?: \((.*)\))?$/ # This change allows forward slash
-          lines.shift
-          name, requirement = normalize_name($1), $2.split(/,\s*/)
-          dependencies << Dependency.new(name, requirement, manifests_index[name].source)
-        end
-
-        Resolution.new(dependencies, manifests)
-      end
-
-    end
-  end
-end

data/lib/librarian/puppet/requirement.rb

@@ -1,35 +0,0 @@
-module Librarian
-  module Puppet
-    class Requirement
-      attr_reader :requirement
-
-      def initialize(requirement)
-        @requirement = requirement || ">=0"
-      end
-
-      def gem_requirement
-        if range_requirement?
-          [@range_match[1], @range_match[2]]
-        elsif pessimistic_requirement?
-          "~> #{@pessimistic_match[1]}.0"
-        else
-          requirement
-        end
-      end
-
-      def to_s
-        gem_requirement.to_s
-      end
-
-      private
-
-      def range_requirement?
-        @range_match ||= requirement.match(/(>=? ?\d+(?:\.\d+){0,2}) (<=? ?\d+(?:\.\d+){0,2})/)
-      end
-
-      def pessimistic_requirement?
-        @pessimistic_match ||= requirement.match(/(\d+(?:\.\d+)?)\.x/)
-      end
-    end
-  end
-end