librarian-puppet 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96c873a7d7d2b15106cc615a9b6ddafa733e99d2
-  data.tar.gz: 84c48adf82430977b0f9c46a352ab5c2a08435cd
+  metadata.gz: 83e9713858b646cdf2e4a3bc35a7a4b10d381aed
+  data.tar.gz: ea2912415c6e31b96d0b466e4d3cf7d646a37955
 SHA512:
-  metadata.gz: c3610a75017822faeb6b0d27462b60a0f456e3085ef22faa50d126d7e451b633eee60b42435c56b1f4c026aa5dadbdfbab98cc047d50a1b8a09185f5d8f31f04
-  data.tar.gz: 8397daa45bc55835f4f3203385ef95734221162ce2be47d2b3057e2fa547ff24dc732b0ff8fc8a154441220330eeabb39439120db99553481650533fd18db22a
+  metadata.gz: e03c1bf94ab9f59051f16a69aa9a17233a40b73c377e23501ffab3e4921694416ebdf152bca5a06912d0c2e388fcd54879471131e4c96f66f35470b59121194c
+  data.tar.gz: 0adb68c0f41531740e2e52a604f788b96f0eb55477e6d0a973ab39900849f09d3b81637675bac04bbcc14e6c719ca712d3ad89c77e269381748eaf60a72edad6

data/README.md

@@ -7,13 +7,12 @@
 Librarian-puppet is a bundler for your puppet infrastructure.  You can use
 librarian-puppet to manage the puppet modules your infrastructure depends on,
 whether the modules come from the [Puppet Forge](https://forge.puppetlabs.com/),
-Git repositories or just a path.
+Git repositories or a just a path.
 
 * Librarian-puppet can reuse the dependencies listed in your `Modulefile` or `metadata.json`
 * 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
 
 
@@ -70,10 +69,6 @@ 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
 
@@ -139,21 +134,6 @@ 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,2 +1 @@
 require "librarian/puppet/action/install"
-require "librarian/puppet/action/resolve"

data/lib/librarian/puppet/cli.rb

@@ -7,7 +7,6 @@ require 'librarian/puppet/action'
 module Librarian
   module Puppet
     class Cli < Librarian::Cli
-      include Librarian::Puppet::Util
 
       module Particularity
         def root_module
@@ -70,12 +69,6 @@ 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
@@ -100,9 +93,6 @@ 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/dsl.rb

@@ -1,14 +1,11 @@
 require 'librarian/dsl'
 require 'librarian/dsl/target'
 require 'librarian/puppet/source'
-require 'librarian/puppet/dependency'
 
 module Librarian
   module Puppet
     class Dsl < Librarian::Dsl
 
-      FORGE_URL = "http://forge.puppetlabs.com"
-
       dependency :mod
 
       source :forge => Source::Forge
@@ -16,25 +13,28 @@ module Librarian
       source :path => Source::Path
       source :github_tarball => Source::GitHubTarball
 
-      def default_specfile
-        Proc.new do
-          forge FORGE_URL
-          metadata
+      # 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 "https://forgeapi.puppetlabs.com"
+            metadata
+          end
         end
-      end
 
-      def self.dependency_type
-        Librarian::Puppet::Dependency
-      end
+        Target.new(self).tap do |target|
+          target.precache_sources(sources)
+          debug_named_source_cache("Pre-Cached Sources", target)
 
-      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
+          specfile ||= Proc.new if block_given?
+          receiver = Receiver.new(target)
+          receiver.run(specfile)
 
-      def receiver(target)
-        Receiver.new(target)
+          debug_named_source_cache("Post-Cached Sources", target)
+        end.to_spec
       end
 
       class Receiver < Librarian::Dsl::Receiver
@@ -70,12 +70,7 @@ module Librarian
               raise Error, msg
             end
           end
-          begin
-            json = JSON.parse(File.read(f))
-          rescue JSON::ParserError => e
-            raise Error, "Unable to parse json file #{f}: #{e}"
-          end
-          dependencyList = json['dependencies']
+          dependencyList = JSON.parse(File.read(f))['dependencies']
           dependencyList.each do |d|
             mod(d['name'], d['version_requirement'])
           end

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"
+require "librarian/puppet/lockfile/parser"
 
 module Librarian
   module Puppet
@@ -11,14 +11,6 @@ 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,4 +6,224 @@ 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/parser.rb

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,35 @@
+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

data/lib/librarian/puppet/source.rb

@@ -1,3 +1,4 @@
+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

@@ -1,7 +1,7 @@
 require 'uri'
 require 'librarian/puppet/util'
 require 'librarian/puppet/source/forge/repo_v1'
-# require 'librarian/puppet/source/forge/repo_v3'
+require 'librarian/puppet/source/forge/repo_v3'
 
 module Librarian
   module Puppet
@@ -12,14 +12,6 @@ module Librarian
         class << self
           LOCK_NAME = 'FORGE'
 
-          def default=(source)
-            @@default = source
-          end
-
-          def default
-            @@default
-          end
-
           def lock_name
             LOCK_NAME
           end
@@ -61,10 +53,10 @@ module Librarian
         def initialize(environment, uri, options = {})
           self.environment = environment
 
-          # if uri =~ %r{^http(s)?://forge\.puppetlabs\.com}
-          #   uri = "https://forgeapi.puppetlabs.com"
-          #   warn { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
-          # end
+          if uri =~ %r{^http(s)?://forge\.puppetlabs\.com}
+            uri = "https://forgeapi.puppetlabs.com"
+            warn { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
+          end
 
           @uri = URI::parse(uri)
           @cache_path = nil
@@ -143,7 +135,7 @@ module Librarian
 
         def fetch_dependencies(name, version, version_uri)
           repo(name).dependencies(version).map do |k, v|
-            v = Librarian::Dependency::Requirement.new(v).to_gem_requirement
+            v = Requirement.new(v).gem_requirement
             Dependency.new(k, v, nil)
           end
         end
@@ -159,11 +151,11 @@ module Librarian
 
           unless @repo[name]
             # if we are using the official Forge then use API v3, otherwise stick to v1 for now
-            # if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
-            #   @repo[name] = RepoV3.new(self, name)
-            # else
+            if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
+              @repo[name] = RepoV3.new(self, name)
+            else
               @repo[name] = RepoV1.new(self, name)
-            # end
+            end
           end
           @repo[name]
         end

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

@@ -33,9 +33,30 @@ module Librarian
 
         private
 
-          # convert organization/modulename to organization-modulename
-          def normalize_dependencies(data)
+          # Issue #223 dependencies may be duplicated
+          # and convert organization/modulename to organization-modulename
+          def clear_duplicated_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{.*/.*}
@@ -50,7 +71,7 @@ module Librarian
           def api_data(module_name)
             return @api_data[module_name] if @api_data
             # call API and cache data
-            @api_data = normalize_dependencies(api_call(module_name))
+            @api_data = clear_duplicated_dependencies(api_call(module_name))
             if @api_data.nil?
               raise Error, "Unable to find module '#{name}' on #{source}"
             end
@@ -62,7 +83,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] = normalize_dependencies(api_call(name, version)) if @api_version_data[version].nil?
+            @api_version_data[version] = clear_duplicated_dependencies(api_call(name, version)) if @api_version_data[version].nil?
             @api_version_data[version]
           end
 

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

@@ -43,16 +43,19 @@ module Librarian
           end
 
           parsed_metadata['dependencies'].each do |d|
-            gem_requirement = Librarian::Dependency::Requirement.new(d['version_requirement']).to_gem_requirement
+            gem_requirement = Requirement.new(d['version_requirement']).gem_requirement
             new_dependency = Dependency.new(d['name'], gem_requirement, forge_source)
-            dependencies << new_dependency
+            # 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
           end
 
           dependencies
         end
 
         def forge_source
-          Forge.default
+          Forge.from_lock_options(environment, :remote => "https://forgeapi.puppetlabs.com")
         end
 
         private
@@ -102,11 +105,7 @@ module Librarian
         def parsed_metadata
           if @metadata.nil?
             @metadata = if metadata?
-              begin
-                JSON.parse(File.read(metadata))
-              rescue JSON::ParserError => e
-                raise Error, "Unable to parse json file #{metadata}: #{e}"
-              end
+              JSON.parse(File.read(metadata))
             elsif modulefile?
               # translate Modulefile to metadata.json
               evaluated = evaluate_modulefile(modulefile)
@@ -160,8 +159,8 @@ module Librarian
           return true if path.join('manifests').exist?
           return true if path.join('lib').join('puppet').exist?
           return true if path.join('lib').join('facter').exist?
-          debug { "Could not find manifests, lib/puppet or lib/facter under #{path}, maybe it is not a puppet module" }
-          true
+          debug { "Could not find manifests, lib/puppet or lib/facter under #{path}, assuming is not a puppet module" }
+          false
         end
       end
     end

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
-forge "https://forge.puppetlabs.com"
+forge "https://forgeapi.puppetlabs.com"
 
 # use dependencies defined in metadata.json
 metadata

data/lib/librarian/puppet/util.rb

@@ -30,7 +30,7 @@ module Librarian
         else
           begin
             FileUtils.cp_r(src, dest, :preserve => true)
-          rescue Errno::ENOENT, Errno::EACCES
+          rescue Errno::ENOENT
             debug { "Failed to copy from #{src} to #{dest} preserving file types, trying again without preserving them" }
             FileUtils.rm_rf(dest)
             FileUtils.cp_r(src, dest)

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.5.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: librarianp
+  name: librarian
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 description: |-
@@ -177,20 +177,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - LICENSE
 - README.md
 - bin/librarian-puppet
 - 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.rb
+- lib/librarian/puppet/lockfile/parser.rb
+- lib/librarian/puppet/requirement.rb
 - lib/librarian/puppet/source.rb
 - lib/librarian/puppet/source/forge.rb
 - lib/librarian/puppet/source/forge/repo.rb
@@ -215,17 +214,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules

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

@@ -1,19 +0,0 @@
-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/dependency.rb

@@ -1,18 +0,0 @@
-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/lockfile.rb

@@ -1,39 +0,0 @@
-# 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